eoss-ui 0.8.37 → 0.8.39

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 };
     },

package/packages/flow/src/selectUser.vue

@@ -70,6 +70,7 @@
         :title="title"
         :showFilterListDep="false"
         reset
+        destroyOnClose
         :classify="classify"
         :collapse-tags="selectorTags"
         :mix="mix"

package/packages/flow/src/startTaskRead.vue

@@ -243,6 +243,7 @@ export default {
       configInfo: {}
     };
   },
+ 
   computed: {
     tabs() {
       let tab = {};
@@ -574,6 +575,7 @@ export default {
     },
     // 提交表单
     subProcess(formName) {
+
       this.submit(formName)
     },
     // 提交表单
@@ -584,7 +586,6 @@ export default {
             this.$message.warning('请选择输入审批意见');
             return;
           }
-          console.log(this.mixList, 'this.mixList');
           // let nextUser = [];
           // this.nextNode.nextUser.map(item => {
           //   nextUser.push(item);

package/packages/flow-group/src/main.vue

@@ -61,7 +61,7 @@
                             })
                           "
                           :display="activeName === String(indexs)"
-                          :key="index"
+                          :key="'fl-' + index + '-' + flowListKey"
                         ></es-flow-list>
                         <es-data-table
                           v-if="
@@ -179,7 +179,7 @@
                           })
                         "
                         :display="activeName === String(indexs)"
-                        :key="index"
+                        :key="'fl-' + index + '-' + flowListKey"
                       ></es-flow-list>
                       <es-data-table
                         v-if="
@@ -338,6 +338,7 @@
                       })
                     "
                     :display="activeName === String(indexs)"
+                    :key="'fl-' + flowListKey"
                   ></es-flow-list>
                   <es-data-table
                     v-if="
@@ -438,6 +439,7 @@
       @success="handleSuccess"
       @save="handleSave"
       @endMessageChange="handleEndMessageChange"
+      @successRead="handleSuccessRead"
       :closeParent="closeParent"
     ></es-flow>
     <slot></slot>
@@ -504,7 +506,8 @@ export default {
       taskExamineAppId: this.appId,
       showMsg: true,
       formRefs: this.refs,
-      submits: null
+      submits: null,
+      flowListKey: 0
     };
   },
   computed: {
@@ -545,6 +548,9 @@ export default {
   },
   mounted() {},
   methods: {
+    handleSuccessRead() {
+      this.flowListKey++;
+    },
     handleHide(res) {
       return typeof res === 'boolean'
         ? !res