eoss-mobiles 0.3.76 → 0.3.78

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.3.76",
+  "version": "0.3.78",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/flow/src/components/Handle.vue

@@ -14,6 +14,8 @@
       @closePop="showFreeStart = false"
       @success="handleSuccess"
       :opinion="form.opinion"
+      :hideMessage="hideMessage"
+      :flowLabelConfig="flowLabelConfig"
       :copy-history="freeStartFlowParams.pendedHistoryHandle"
       :formType="processFormType"
       :orgId="orgId"
@@ -262,12 +264,14 @@
                     !isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1
                   "
                   :selectDisabled="isCurrentNodeForbiddenChangeCandidate == 1"
-                  placeholder="请选择下步办理人"
+                  :placeholder="`请选择${
+                    flowLabelConfig.nextUser || '下步办理人'
+                  }`"
                   :param="{
                     pid: pid,
                     onlyMyOrg: onlyMyOrg
                   }"
-                  label="下步办理人"
+                  :label="`${flowLabelConfig.nextUser || '下步办理人'}`"
                   @change="disposeAppUser($event, 'nextUserSelectList')"
                 />
               </div>
@@ -308,6 +312,7 @@
                   @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
                 />
               </div>
+              <!-- :nextUserList="nextUserList" -->
               <!-- 外单位 -->
               <!-- v-if="isHideOtherOrg" -->
               <div class="item" v-if="isHideOtherOrg">
@@ -536,6 +541,8 @@
               ref="processSetting"
               :processDefinitionId="taskExamineInfo.processDefinitionId"
               :nodeId="form.nextNodeId"
+              :hideMessage="hideMessage"
+              :flowLabelConfig="flowLabelConfig"
               :taskId="processObj.taskExamine.taskId"
               :pendingId="pendingId"
               :businessId="taskExamineInfo.businessId"
@@ -561,7 +568,7 @@
             </div>
 
             <!-- 通知方式 -->
-            <div class="item-msg item-msg2">
+            <div class="item-msg item-msg2" v-if="!hideMessage">
               <Message
                 ref="message"
                 :code="msgCode"
@@ -593,6 +600,8 @@
       v-else
       :pendingId="pendingId"
       :before-submit="beforeSubmit"
+      :hideMessage="hideMessage"
+      :flowLabelConfig="flowLabelConfig"
       @close="handleFlow = true"
     />
     <em-popup class="em-flow-popup" v-model="showDefList">
@@ -689,6 +698,14 @@ export default {
     selectorParams: {
       type: Object,
       default: () => {}
+    },
+    flowLabelConfig: {
+      type: Object,
+      default: () => ({})
+    },
+    hideMessage: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -1143,7 +1160,7 @@ export default {
         this.form.isAddSign != '1' &&
         !this.isReject
       ) {
-        this.$toast('请选择办理人');
+        this.$toast(`请选择${this.flowLabelConfig.nextUser || '办理人'}`);
         return;
       }
       // if (this.form.isAddSign == '1' && !this.form.addSignUserId) {
@@ -1742,6 +1759,7 @@ export default {
             that.form.isSerialSubmit = taskExamine.isSerialSubmit;
             that.form.notificationMsg = defaultNotificationMessage;
             defaultNotificationType &&
+              !that.hideMessage &&
               (that.defaultNotificationType =
                 defaultNotificationType.split(','));
             that.nodeInfoMapInfo = nodeInfoMap;

package/packages/flow/src/components/Reject.vue

@@ -27,7 +27,7 @@
           </em-input>
         </div>
         <Message
-        v-if="rejectObj && rejectObj.length != 0"
+        v-if="rejectObj && rejectObj.length != 0 && !hideMessage"
           ref="message"
           :code="msgCode"
           :baseUrl="baseUrl"
@@ -72,6 +72,10 @@ export default {
     userId: {
       type: String,
       default: ''
+    },
+    hideMessage: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -245,7 +249,10 @@ export default {
           }
           this.processObj = res.data;
           this.form.notificationMsg = defaultNotificationMessage;
-          this.defaultNotificationType = defaultNotificationType.split(',');
+          if(!this.hideMessage) {
+            this.defaultNotificationType = defaultNotificationType.split(',');
+          }
+             
           let list = [];
           if (rejectTaskNodes) {
             for (let i in rejectTaskNodes) {

package/packages/flow/src/components/StartFlow.vue

@@ -120,7 +120,7 @@
               :objType="objType"
               :nextUserList="nextUserList"
               @change="handleChange($event, 'nextUserSelectList')"
-              label="办理人"
+              :label="`${flowLabelConfig.nextUser|| '办理人'}`"
             />
           </div>
           <div class="item" v-if="enableCustomLimitTimeSetting">
@@ -194,6 +194,7 @@
           />
           <!-- 通知方式 -->
           <Message
+            v-if="!hideMessage"
             ref="message"
             :code="msgCode"
             :readOnlyNotificationType="readOnlyNotificationType"
@@ -302,7 +303,15 @@ export default {
     selectorParams: {
       type: Object,
       default: () => {}
-    }
+    },
+    flowLabelConfig: {
+      type: Object,
+      default: () => ({})
+    },
+    hideMessage: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     return {
@@ -454,7 +463,7 @@ export default {
         return;
       }
       if (!this.form.nextUserId && this.isNextUser) {
-        this.$toast('请选择办理人');
+        this.$toast(`请选择${this.flowLabelConfig.nextUser || '办理人'}`);
         return;
       }
       if (!this.form.nextNodeId) {
@@ -547,9 +556,12 @@ export default {
         info.businessId = this.businessId; //this.businessId
       }
       if (this.beforeSubmit) {
-        this.beforeSubmit(info);
+        this.beforeSubmit(info,this.sendData);
         return;
       }
+      this.sendData(info);
+    },
+    sendData(info){
       let formData = new FormData();
       // if (this.form.isImageOpinion == 1) {
       //   formData.append('file', this.file);
@@ -788,7 +800,7 @@ export default {
             let defaultNotificationTypes = [];
             if (
               res.results.notificationTypes &&
-              that.defaultNotificationType.length == 0
+              that.defaultNotificationType.length == 0 && !that.hideMessage
             ) {
               defaultNotificationTypes = res.results.notificationTypes.filter(
                 (x) => x.defaultSelected == 'true'

package/packages/flow/src/components/TaskRead.vue

@@ -77,6 +77,7 @@
         </div>
         <div class="item">
           <Message
+          v-if="!hideMessage"
             ref="message"
             :code="msgCode"
             :readOnlyNotificationType="readOnlyNotificationType"
@@ -175,6 +176,10 @@ export default {
     isAllCheck: {
       type: Boolean,
       default: false
+    },
+    hideMessage: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {
@@ -298,6 +303,7 @@ export default {
         .then((res) => {
           const { status, message, data } = res;
           if (status === 'success') {
+            if(this.hideMessage) return
             this.form.notificationMsgType = message.split(',');
             this.defaultNotificationType = message.split(',');
             if (data) {

package/packages/flow/src/components/reset.vue

@@ -64,7 +64,7 @@
               :objType="objType"
               :nextUserList="nextUserList"
               @change="handleChange($event, 'nextUserSelectList')"
-              label="办理人"
+              :label="`${flowLabelConfig.nextUser|| '办理人'}`"
             />
           </div>
           <div class="item" v-if="enableCustomLimitTimeSetting">
@@ -138,6 +138,7 @@
           />
           <!-- 通知方式 -->
           <Message
+            v-if="!hideMessage"
             ref="message"
             :code="msgCode"
             :readOnlyNotificationType="readOnlyNotificationType"
@@ -238,7 +239,15 @@ export default {
     opinion: {
       type: String,
       default: ''
-    }
+    },
+    hideMessage: {
+      type: Boolean,
+      default: false
+    },
+    flowLabelConfig: {
+      type: Object,
+      default: () => ({})
+    },
   },
   data() {
     return {
@@ -309,6 +318,7 @@ export default {
         url: findSysCodes
       }).then((res) => {
         // this.form.notificationMsg = res.message;
+        if(this.hideMessage) return
         this.defaultNotificationType = res.message.split(',');
       });
     },
@@ -387,7 +397,7 @@ export default {
         return;
       }
       if (!this.form.nextUserId) {
-        this.$toast('请选择办理人');
+        this.$toast(`请选择${this.flowLabelConfig.nextUser|| '办理人'}`);
         return;
       }
       if (!this.form.nextNodeId) {
@@ -481,7 +491,7 @@ export default {
         this.$refs.selectTree.getContent(label);
       });
       let obj = {
-        label: '请选择办理人',
+        label: `请选择${this.flowLabelConfig.nextUser|| '办理人'}`,
         show: true
       };
       this.$emit('informNav', obj);

package/packages/flow/src/components/supervise.vue

@@ -4,6 +4,7 @@
     <em-input v-model="form.currentHandleNode" label-width="90" label="当前办理节点" readonly />
     <em-input v-model="form.pendingUserNames" label-width="90" label="当前办理人" readonly /> -->
     <Message
+    v-if="!hideMessage"
       ref="message"
       :code="msgCode"
       :baseUrl="baseUrl"
@@ -48,7 +49,8 @@ export default {
       type: String,
       default: 'notification_type'
     },
-    appId:{type:String,default:''}
+    appId:{type:String,default:''},
+    hideMessage:{type:Boolean,default:false}
   },
   data() {
     return {
@@ -116,7 +118,10 @@ export default {
           this.form = res.results;
           this.form.notificationMsg = res.results.notifyMessage
           this.flowList = res.results.taskSuperviseHistories;
-          this.form.noticeType = res.results.fixedNotificationType.split(',');
+          if(!this.hideMessage){
+            this.form.noticeType = res.results.fixedNotificationType.split(',');
+          }
+          
           this.showFlowList = true;
         } else {
           this.$toast(res.msg);

package/packages/flow/src/components/taskUnionExamine.vue

@@ -81,7 +81,7 @@
         <!-- v-if="showMessage" -->
         <Message
           ref="message"
-          v-if="showMessage"
+          v-if="showMessage && !hideMessage"
           :code="msgCode"
           :baseUrl="baseUrl"
           :readOnlyNotificationType="readOnlyNotificationType"
@@ -149,6 +149,10 @@ export default {
     isAllCheck: {
       type: Boolean,
       default: false
+    },
+    hideMessage: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -298,7 +302,9 @@ export default {
           const { status, message } = res;
           this.$toast.clear();
           if (status === 'success') {
-            this.infoList.noticeType = message.split(',');
+            if(!this.hideMessage){
+              this.infoList.noticeType = message.split(',');
+            }
           } else {
             this.$toast(message || '系统错误，请联系管理员！');
           }

package/src/index.js

@@ -105,7 +105,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.3.76',
+  version: '0.3.78',
   install,
   Button,
   ButtonGroup,

package/src/utils/axios.js

@@ -14,7 +14,7 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
     withCredentials: false
   });
   http.interceptors.request.use(
-    config => {
+    (config) => {
       if ((params.params || params) instanceof FormData === false) {
         if (type === 'post' && !format) {
           config.data = qs.stringify(params.params || params);
@@ -96,12 +96,12 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
       }
       return config;
     },
-    error => {
+    (error) => {
       return Promise.error(error);
     }
   );
   http.interceptors.response.use(
-    response => {
+    (response) => {
       if (response.status === 200) {
         if (response.data.rCode === 64 || response.data.rCode === 27) {
           $.H5TokenInvalid();
@@ -112,7 +112,7 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
         return Promise.reject(response.data);
       }
     },
-    error => {
+    (error) => {
       if (error && error.response) {
         if (error.response.status) {
           switch (error.response.status) {