eoss-mobiles 0.3.62 → 0.3.64

package/package.json

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

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

@@ -50,7 +50,10 @@
           :isHiddenOftenOpinion="isHiddenOftenOpinion == 1 ? false : true"
         ></Opinion>
         <!-- 审核内容 -->
-        <div class="special-box input-box" v-if="typeCode != 'fenyue' && !endFlow">
+        <div
+          class="special-box input-box"
+          v-if="typeCode != 'fenyue' && (!endFlow || taskOperations.length>1 || taskOperationShiftedNodeList)"
+        >
           <!-- 加签 -->
           <div
             class="item"
@@ -399,7 +402,8 @@
               <div
                 class="item"
                 v-if="
-                  currentNodeEnableItemHandleDescription && nodeList &&
+                  currentNodeEnableItemHandleDescription &&
+                  nodeList &&
                   nodeList.length != 0 &&
                   isShowNode &&
                   isNextUser
@@ -538,7 +542,7 @@
               <Message
                 ref="message"
                 :label="'催办通知方式'"
-                :code="'notification_type'"
+                :code="msgCode"
                 onlyShowType
                 :baseUrl="baseUrl"
                 :pendingId="pendingId"
@@ -551,7 +555,7 @@
             <div class="item-msg item-msg2">
               <Message
                 ref="message"
-                :code="'notification_type'"
+                :code="msgCode"
                 :baseUrl="baseUrl"
                 :readOnlyNotificationType="readOnlyNotificationType"
                 :notificationMessageReadOnly="notificationMessageReadOnly"
@@ -564,7 +568,10 @@
           </div>
         </div>
       </div>
-      <div v-if="isSubmitButtonShowAgreeAndDisagree && showFlowBtn" class="btn-list">
+      <div
+        v-if="isSubmitButtonShowAgreeAndDisagree && showFlowBtn"
+        class="btn-list"
+      >
         <div class="btn" @click="handleFlow = false">不同意</div>
         <div class="btn" @click="onSubmit()">同意</div>
       </div>
@@ -646,6 +653,10 @@ export default {
       type: [String, Number],
       default: 0
     },
+    msgCode: {
+      type: String,
+      default: 'notification_type'
+    },
     isAllCheck: {
       type: Boolean,
       default: false
@@ -662,7 +673,7 @@ export default {
       type: String,
       default: ''
     },
-    selectorParams:{
+    selectorParams: {
       type: Object,
       default: () => {}
     }
@@ -673,8 +684,8 @@ export default {
         { name: '前置加签', value: 'preAddSign' },
         { name: '后置加签', value: 'postAddSign' }
       ],
-      showFlowBtn:false,
-      endFlow:false,
+      showFlowBtn: false,
+      endFlow: false,
       currentOrgSelectorParams: {},
       currentOrgSelectorTabs: 'employee, persongroup',
       foreignOrgSelectorTabs: 'enterprise,filgroupobj',
@@ -1353,9 +1364,7 @@ export default {
     },
     // 切换下一步操作
     changeNextOperate(val, isDef) {
-      console.log(val,isDef,this.tagKey,'isDef')
       if (!isDef && val.key === this.tagKey) return;
-      console.log(val,isDef,this.tagKey,'isDef2222')
       this.tagKey = val.key;
       //恢复默认
       this.isNextUser = false;
@@ -1379,13 +1388,13 @@ export default {
       } else {
         this.isReject = false;
       }
-      this.form.nextOperate = val.key;
+      this.form.nextOperate = val.isNextNode? val.nextOperate:val.key;
       this.form.nextOperateName = val.value;
       this.nodeList = val.taskNodeList;
       if (this.isSpecial) {
         if (val.key == -1) {
           this.form.isSerialSubmit = 1;
-          this.showFlowBtn = true
+          this.showFlowBtn = true;
           return;
         } else if (val.key == 0) {
           this.isNextUser = true;
@@ -1395,35 +1404,35 @@ export default {
           this.isShowNode = true;
         } else if (val.key == 2) {
           this.form.isReturnSubmitter = 1;
-          this.showFlowBtn = true
+          this.showFlowBtn = true;
           return;
         } else if (val.key == 3) {
           this.form.isUndertakeReply = 1;
-          this.showFlowBtn = true
+          this.showFlowBtn = true;
           return;
         } else if (val.key == 4) {
           this.form.isTakeAdviceReply = 1;
-          this.showFlowBtn = true
+          this.showFlowBtn = true;
           return;
         } else if (val.key == 5) {
           this.form.isUndertakeEnd = 1;
-          this.showFlowBtn = true
+          this.showFlowBtn = true;
           return;
         } else if (val.key == 6) {
           this.form.isTakeAdviceEnd = 1;
-          this.showFlowBtn = true
+          this.showFlowBtn = true;
           return;
         } else if (val.key == 7) {
           this.form.isReadDealReply = 1;
-          this.showFlowBtn = true
+          this.showFlowBtn = true;
           return;
         } else if (val.key == 8) {
           this.form.isReadDealEnd = 1;
-          this.showFlowBtn = true
+          this.showFlowBtn = true;
           return;
         } else if (val.key == 9) {
           this.form.isReturnRejectNode = 1;
-          this.showFlowBtn = true
+          this.showFlowBtn = true;
           return;
         } else {
         }
@@ -1451,8 +1460,8 @@ export default {
         });
 
         this.getNodeObj(this.form.nextNodeId);
-      }else{
-          this.showFlowBtn = true
+      } else {
+        this.showFlowBtn = true;
       }
       if (this.nodeList && this.nodeList.length > 0) {
         let defNode = this.nodeList.filter(
@@ -1475,8 +1484,8 @@ export default {
         });
 
         if (isDef !== true) this.getNodeObj(this.form.nextNodeId);
-      }else{
-        this.showFlowBtn = true
+      } else {
+        this.showFlowBtn = true;
       }
 
       this.showNextOperate = false;
@@ -1641,7 +1650,7 @@ export default {
                     currentOrgparams[i] == 'my'
                       ? choiceOrgId
                       : currentOrgparams[i],
-                  only_filid:true,
+                  only_filid: true
                 };
               });
               that.currentOrgSelectorTabs =
@@ -1657,10 +1666,16 @@ export default {
                   pid:
                     foreignOrgparams[i] == 'my'
                       ? choiceOrgId
-                      : foreignOrgparams[i] == 'other' || foreignOrgparams[i] == 'nofilidorg'
+                      : foreignOrgparams[i] == 'other' ||
+                        foreignOrgparams[i] == 'nofilidorg'
                       ? 'root'
                       : foreignOrgparams[i],
-                  nofilid:foreignOrgparams[i] == 'nofilidorg' ? that.orgId || JSON.parse($.getStorage('userInfo')).orgId : foreignOrgparams[i] == 'other' ? 1 : 0,
+                  nofilid:
+                    foreignOrgparams[i] == 'nofilidorg'
+                      ? that.orgId || JSON.parse($.getStorage('userInfo')).orgId
+                      : foreignOrgparams[i] == 'other'
+                      ? 1
+                      : 0,
                   myUserid: x == 'filgroup' ? $.getStorage('userId') : '',
                   ...that.selectorParams
                 };
@@ -1728,17 +1743,31 @@ export default {
               let isSelected = false;
               that.taskOperations.map((item) => {
                 if (item.isSelected || that.taskOperations.length == 1) {
+
                   isSelected = true;
                   if (that.taskOperations.length == 1) {
-                    that.form.nextOperate = that.taskOperations[0].key;
+
+                    if (that.taskOperations[0].isNextNode) {
+
+                      that.form.nextOperate =
+                        that.taskOperations[0].nextOperate;
+                    } else {
+                      that.form.nextOperate = that.taskOperations[0].key;
+                    }
                     that.form.nextOperateName = that.taskOperations[0].value;
                     if (
-                      !that.taskOperations[0].taskNodeList ||
-                      that.taskOperations[0].taskNodeList.length === 0
+                     ( !that.taskOperations[0].taskNodeList ||
+                      (that.taskOperations[0].taskNodeList.length === 0)) &&
+                        !that.taskOperations[0].isNextNode
                     ) {
+
                       that.form.nextNodeId = undefined;
                       that.form.nextNodeName = undefined;
+                    } else if (that.taskOperations[0].isNextNode) {
+                      that.form.nextNodeId = that.taskOperations[0].key;
+                      that.form.nextNodeName = that.taskOperations[0].value;
                     } else {
+
                       that.nodeList = that.taskOperations[0].taskNodeList;
                       let info = [];
                       that.nodeList.map((x) => {
@@ -1807,7 +1836,9 @@ export default {
             that.changeNextOperate(
               {
                 value: that.form.nextOperateName,
-                key: that.form.nextOperate,
+                key: that.taskOperations[0].key,
+                nextOperate: that.taskOperations[0].nextOperate,
+                isNextNode:that.taskOperations[0].isNextNode,
                 taskNodeList: that.nodeList
               },
               true
@@ -1891,7 +1922,7 @@ export default {
             message,
             data: { isCanFenyue, taskExamine, taskReadOpinionRequired }
           } = res;
-          this.showFlowBtn = true
+          this.showFlowBtn = true;
           if (status === 'success') {
             this.taskExamineInfo = taskExamine;
             this.isCanFenyue = isCanFenyue;
@@ -1906,8 +1937,8 @@ export default {
         })
         .catch((err) => {
           this.$toast.clear();
-          
-          this.showFlowBtn = true
+
+          this.showFlowBtn = true;
           if (err.message && err.message !== 'canceled') {
             this.$toast(err.message);
           }
@@ -1928,9 +1959,8 @@ export default {
         }
       }).then((res) => {
         this.$toast.clear();
-        this.showFlowBtn = true
+        this.showFlowBtn = true;
         if (res.status == 'success') {
-          
           _that.currentNodeEnableItemHandleDescription =
             res.data.nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
           _that.deptRoleCode = res.data.nodeExtAttr.deptRoleCode;
@@ -2033,7 +2063,7 @@ export default {
               : false; // 判断是否隐藏下一步节点信息和接收人信息
           if (res.data.globalNodeType === 'endEvent') {
             this.isNextUser = false;
-            _that.endFlow = true
+            _that.endFlow = true;
             this.form.nextUserId = '流程办结';
           } else {
             this.nodeType != 1 &&

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

@@ -29,7 +29,7 @@
         <Message
         v-if="rejectObj && rejectObj.length != 0"
           ref="message"
-          :code="'notification_type'"
+          :code="msgCode"
           :baseUrl="baseUrl"
           :readOnlyNotificationType="readOnlyNotificationType"
           :notificationMessageReadOnly="notificationMessageReadOnly"
@@ -65,6 +65,10 @@ export default {
       type: Boolean,
       default: false
     },
+    msgCode: {
+      type: String,
+      default: 'notification_type'
+    },
     userId: {
       type: String,
       default: ''

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

@@ -157,7 +157,7 @@
           <!-- 通知方式 -->
           <Message
             ref="message"
-            :code="'notification_type'"
+            :code="msgCode"
             :readOnlyNotificationType="readOnlyNotificationType"
             :notificationMessageReadOnly="notificationMessageReadOnly"
             :defaultNotificationMsg="form.notificationMsg"
@@ -249,6 +249,10 @@ export default {
       type: Object,
       default: () => {}
     },
+    msgCode: {
+      type: String,
+      default: 'notification_type'
+    },
     opinion: {
       type: String,
       default: ''

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

@@ -78,7 +78,7 @@
         <div class="item">
           <Message
             ref="message"
-            :code="'notification_type'"
+            :code="msgCode"
             :readOnlyNotificationType="readOnlyNotificationType"
             :notificationMessageReadOnly="notificationMessageReadOnly"
             :defaultNotificationMsg="defaultNotificationMessage"
@@ -168,6 +168,10 @@ export default {
       type: String,
       default: ''
     },
+    msgCode: {
+      type: String,
+      default: 'notification_type'
+    },
     isAllCheck: {
       type: Boolean,
       default: false

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

@@ -139,7 +139,7 @@
           <!-- 通知方式 -->
           <Message
             ref="message"
-            :code="'notification_type'"
+            :code="msgCode"
             :readOnlyNotificationType="readOnlyNotificationType"
             :notificationMessageReadOnly="notificationMessageReadOnly"
             :defaultNotificationMsg="form.notificationMsg"
@@ -215,6 +215,10 @@ export default {
       type: Boolean,
       default: false
     },
+    msgCode: {
+      type: String,
+      default: 'notification_type'
+    },
     userId: {
       type: String,
       default: ''

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

@@ -5,7 +5,7 @@
     <em-input v-model="form.pendingUserNames" label-width="90" label="当前办理人" readonly /> -->
     <Message
       ref="message"
-      :code="'notification_type'"
+      :code="msgCode"
       :baseUrl="baseUrl"
       :showCheckType="false"
       :showMsg="true"
@@ -44,6 +44,10 @@ export default {
   props: {
     baseUrl: String,
     businessId: String,
+    msgCode: {
+      type: String,
+      default: 'notification_type'
+    },
     appId:{type:String,default:''}
   },
   data() {

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

@@ -82,7 +82,7 @@
         <Message
           ref="message"
           v-if="showMessage"
-          :code="'notification_type'"
+          :code="msgCode"
           :baseUrl="baseUrl"
           :readOnlyNotificationType="readOnlyNotificationType"
           :notificationMessageReadOnly="notificationMessageReadOnly"
@@ -138,6 +138,10 @@ export default {
       type: [String, Number],
       default: 0
     },
+    msgCode: {
+      type: String,
+      default: 'notification_type'
+    },
     esign: {
       type: Boolean,
       default: false

package/src/index.js

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