eoss-ui 0.8.37 → 0.8.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.8.37",
+  "version": "0.8.38",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/flow/src/flow.vue

@@ -928,8 +928,8 @@
         @cancel="closeProcess($event, 'showReject')"
       />
       <StartTaskRead
-        v-else-if="btnType === 'toStartTaskRead'"
-        ref="toStartTaskRead"
+        v-else-if="btnType === 'toStartTaskRead' || btnType==='toTaskReadAndEnd'"
+        :ref="btnType"
         :pending-id="pendingId"
         hideBtn
         class="es-info"
@@ -2493,22 +2493,24 @@ export default {
      **/
     taskReadBtn(res) {
       // return this.$message.warning('暂未开放！敬请期待');
-
-      if (this.beforeSubmit != undefined) {
-        this.beforeSubmit()
-          .then((next) => {
-            if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-            this.taskReadType = 'create';
-            // this.showTaskRead = true;
-            this.btnType = this.btnFunValue(res.fun);
-          })
-          .catch((e) => {});
-      } else {
-        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-        this.taskReadType = 'create';
-        // this.showTaskRead = true;
-        this.btnType = this.btnFunValue(res.fun);
-      }
+      this.btnType=''
+      setTimeout(() => {
+        if (this.beforeSubmit != undefined) {
+          this.beforeSubmit()
+            .then((next) => {
+              if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+              this.taskReadType = 'create';
+              // this.showTaskRead = true;
+              this.btnType = this.btnFunValue(res.fun);
+            })
+            .catch((e) => {});
+        } else {
+          if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+          this.taskReadType = 'create';
+          // this.showTaskRead = true;
+          this.btnType = this.btnFunValue(res.fun);
+        }
+      }, 0);
     },
     /**
      * getFind
@@ -2676,6 +2678,8 @@ export default {
       // 驳回：taskRejectHtml
       // 直接办结：endFlowHtml
       // 自由发起子流程：toFreeStartFlow
+    
+     
       if (res.type == 4) {
         this.$emit(
           'buttonClick',
@@ -2857,19 +2861,25 @@ export default {
      * @date 2022年9月29日
      **/
     toTaskReadAndEnd(res) {
-      if (this.beforeSubmit != undefined) {
-        this.beforeSubmit()
-          .then((next) => {
-            if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-            this.taskReadType = 'taskReadAndEnd';
-            this.showTaskRead = true;
-          })
-          .catch((e) => {});
-      } else {
-        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-        this.taskReadType = 'taskReadAndEnd';
-        this.showTaskRead = true;
-      }
+      this.btnType=''
+      setTimeout(() => {
+        if (this.beforeSubmit != undefined) {
+          this.beforeSubmit()
+            .then((next) => {
+              if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+              this.taskReadType = 'taskReadAndEnd';
+              this.btnType = this.btnFunValue(res.fun);
+  
+              // this.showTaskRead = true;
+            })
+            .catch((e) => {});
+        } else {
+          if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+          this.taskReadType = 'taskReadAndEnd';
+              this.btnType = this.btnFunValue(res.fun);
+          // this.showTaskRead = true;
+        }
+      }, 0);
     },
     /**
      * rejectAndEnd
@@ -3775,7 +3785,13 @@ export default {
         this.flowSuccess(true);
         // this.$emit('success');
       } else {
-        this.$emit('cancel');
+        if(type == 'showTaskRead'){
+          !this.simpleTips && this.$message.success('分阅成功')
+          this.$emit('success','taskRead');
+        }else{
+          this.$emit('cancel');
+        }
+        
       }
     },
     /**
@@ -4246,8 +4262,8 @@ export default {
                 presetUserJson: JSON.stringify(this.presetUserJson),
                 removeSignUserId,
                 nextReadUserId: this.readMultiple
-                  ? this.mixReadList && this.mixReadList.join('|')
-                  : this.nextNode.nextReadUserId,
+                  ? this.mixReadList ? this.mixReadList.join('|') : ''
+                  : this.nextNode.nextReadUserId.join(','),
                 nextOrgId: !this.isShowNextUser
                   ? this.multiple
                     ? this.mixOrgIdList && this.mixOrgIdList.join('|')
@@ -4363,8 +4379,8 @@ export default {
             presetUserJson: JSON.stringify(this.presetUserJson),
             removeSignUserId,
             nextReadUserId: this.readMultiple
-              ? this.mixReadList && this.mixReadList.join('|')
-              : this.nextNode.nextReadUserId,
+              ? this.mixReadList ? this.mixReadList.join('|') : ''
+                  : this.nextNode.nextReadUserId.join(','),
             nextOrgId: !this.isShowNextUser
               ? this.multiple
                 ? this.mixOrgIdList && this.mixOrgIdList.join('|')

package/packages/flow/src/main.vue

@@ -1915,7 +1915,6 @@ export default {
       }
     },
     getNodeInfoForStartFlow(processDefinitionId) {
-      console.log('processDefinitionId',processDefinitionId);
       let params = {
         url: getNodeInfoForStart,
         params: { processDefinitionId }
@@ -1991,8 +1990,13 @@ export default {
         this.$refs.esContent.scrollTop += this.$refs.messagebox.clientHeight;
       });
     },
-    handleNewFlowSuccess() {
-      this.$emit('success');
+    handleNewFlowSuccess(type) {
+      if(type == 'taskRead'){
+        this.$emit('successRead',type);
+
+      }else{
+        this.$emit('success');
+      }
     },
     freeStartFlowSuccess() {
       this.showFreeStartFlow = false;
@@ -2000,7 +2004,6 @@ export default {
       // this.$emit('success');
     },
     handleChange(val, isForStartFlow) {
-      console.log('handleChange val', val);
       this.getNodeInfoForStartFlow(val, isForStartFlow);
       this.$parent.$emit('flowChange', val);
     },
@@ -4143,8 +4146,8 @@ export default {
                 presetUserJson: JSON.stringify(this.presetUserJson),
                 removeSignUserId,
                 nextReadUserId: this.readMultiple
-                  ? this.mixReadList && this.mixReadList.join('|')
-                  : this.nextNode.nextReadUserId,
+                  ? this.mixReadList ? this.mixReadList.join('|') : ''
+                  : this.nextNode.nextReadUserId.join(','),
                 nextOrgId: !this.isShowNextUser
                   ? this.multiple
                     ? this.mixOrgIdList && this.mixOrgIdList.join('|')
@@ -4261,8 +4264,8 @@ export default {
             presetUserJson: JSON.stringify(this.presetUserJson),
             removeSignUserId,
             nextReadUserId: this.readMultiple
-              ? this.mixReadList && this.mixReadList.join('|')
-              : this.nextNode.nextReadUserId,
+              ? this.mixReadList ? this.mixReadList.join('|') : ''
+              : this.nextNode.nextReadUserId.join(','),
             nextOrgId: !this.isShowNextUser
               ? this.multiple
                 ? this.mixOrgIdList && this.mixOrgIdList.join('|')

package/packages/flow/src/processForm.vue

@@ -1253,17 +1253,24 @@ export default {
           ) {
             return this.$message.warning('请选择办理对象');
           }
-          if (this.isCustomPreset && this.activeNames == '1'){
+          if (this.isCustomPreset && this.activeNames == '1') {
             for (let i = 0; i < this.presetList.length; i++) {
-              if(this.presetList[i].name && this.presetList[i].name != '1' && this.presetList[i].name != 'endEvent' &&( !this.presetList[i].value || this.presetList[i].value.length == 0)){
-             
-                return this.$message.warning(`预设节点<节点${this.presetList[i].sequence}-${this.presetList[i].label}>必须选择办理人！`);
-              }else{
+              if (
+                this.presetList[i].name &&
+                this.presetList[i].name != '1' &&
+                this.presetList[i].name != 'endEvent' &&
+                (!this.presetList[i].value ||
+                  this.presetList[i].value.length == 0)
+              ) {
+                return this.$message.warning(
+                  `预设节点<节点${this.presetList[i].sequence}-${this.presetList[i].label}>必须选择办理人！`
+                );
+              } else {
                 delete this.presetList[i].label;
               }
             }
           }
-         
+
           if (this.isCancelSecondConfirmationType) {
             this.$confirm('确认提交吗?', '提示', {
               confirmButtonText: '确定',
@@ -1355,6 +1362,8 @@ export default {
 
                 newParm.submitTaskParamJson = JSON.stringify(this.taskParams);
                 if (this.formType == 'readTransfer') {
+                  newParm.customPresetUserJson = params.customPresetUserJson;
+                  delete params.customPresetUserJson;
                   newParm.readTransferHandleStartFlowParamJson =
                     JSON.stringify(params);
                   newParm.taskReadEndParamJson = JSON.stringify(
@@ -1493,13 +1502,17 @@ export default {
 
             newParm.submitTaskParamJson = JSON.stringify(this.taskParams);
             if (this.formType == 'readTransfer') {
+              newParm.customPresetUserJson = params.customPresetUserJson;
+              newParm.taskReadEndParamJson = JSON.stringify(this.taskParams);
+              delete params.customPresetUserJson;
               newParm.readTransferHandleStartFlowParamJson =
                 JSON.stringify(params);
-              newParm.taskReadEndParamJson = JSON.stringify(this.taskParams);
+
               delete newParm.copyHistory;
               delete newParm.startFlowParamJson;
               delete newParm.submitTaskParamJson;
             }
+
             params = newParm;
           }
           if (this.copyHistory && !this.isFreeStartFlow) {
@@ -1516,6 +1529,7 @@ export default {
                 ? freeStartFlow
                 : register,
               method: 'post',
+
               data: params
             })
             .then((res) => {
@@ -1820,7 +1834,6 @@ export default {
         if (pOrgId) {
           params.filid = pOrgId;
         }
-      
       }
       return { multiple, params };
     },