@lambo-design/workflow-approve 1.0.0-beta.47 → 1.0.0-beta.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.47",
+  "version": "1.0.0-beta.48",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/components/assignee-box.vue

@@ -174,7 +174,13 @@ export default {
       self.organTreeType = organTreeType
       self.getRootData(organTreeType)
     },
+    clearData(){
+      this.idSelectedArr = []
+      //清除表格数据
+      this.doSearch()
+    },
     toggleShowHelpBox(organTreeType, permScope, helpBoxType, id) {
+      this.clearData()
       this.id = id
       this.helpBoxType = helpBoxType
       this.organTreeType = organTreeType
@@ -186,44 +192,51 @@ export default {
         this.getRootData(organTreeType)
       }
       this.modalBoxShow = !this.modalBoxShow;
+      this.$forceUpdate()
     },
 
     onOk(){
       let self = this
       let idSelectedArr = self.idSelectedArr
       self.loading = true
-      if (idSelectedArr.length > 1) {
-        self.loading = false
-        self.$Message.info('办理人只能选择一条记录！')
-        this.$emit('update-selected', ''); // 触发事件并传递 userId
+      if (self.helpBoxType ==='addMultitaskInstance'){
+        idSelectedArr = [...new Set(idSelectedArr)]
+        const assingeeList = idSelectedArr.map(item => item.split(',')[0])
+        self.$emit('add-multitask-instance', assingeeList);
       } else {
-        let idSelectedArr = self.idSelectedArr[0].split(',')
-        if (self.helpBoxType === 'transferCurTask'){
-          let auditResult = {
-            code: self.data.auditResult,
-            name: self.data.auditResultName,
-          }
-          self.data.selectedUserId=idSelectedArr[0];
-          let url = this.smartFlowServerContext + '/manage/processTodo/audit'
-          ajax.post(url, self.data).then(function (resp) {
-            let result = resp.data
-            if (result.code == '200') {
-              self.loading = false
-              self.$Message.success(result.message);
-              if (self.executionCompleted) {
-                self.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
-              }
-              self.toBeDoneListDoSearch();
-            } else {
-              self.loading = false
-              self.$Message.error(result.message)
-              if (self.executionCompleted) {
-                self.executionCompleted(false, null, null, auditResult, self.data.taskId);
-              }
-            }
-          })
+        if (idSelectedArr.length > 1) {
+          self.loading = false
+          self.$Message.info('办理人只能选择一条记录！')
+          this.$emit('update-selected', ''); // 触发事件并传递 userId
         } else {
-          self.$emit('update-next-node-assignee', idSelectedArr[0], idSelectedArr[1], self.id);
+          let idSelectedArr = self.idSelectedArr[0].split(',')
+          if (self.helpBoxType === 'transferCurTask'){
+            let auditResult = {
+              code: self.data.auditResult,
+              name: self.data.auditResultName,
+            }
+            self.data.selectedUserId=idSelectedArr[0];
+            let url = this.smartFlowServerContext + '/manage/processTodo/audit'
+            ajax.post(url, self.data).then(function (resp) {
+              let result = resp.data
+              if (result.code == '200') {
+                self.loading = false
+                self.$Message.success(result.message);
+                if (self.executionCompleted) {
+                  self.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
+                }
+                self.toBeDoneListDoSearch();
+              } else {
+                self.loading = false
+                self.$Message.error(result.message)
+                if (self.executionCompleted) {
+                  self.executionCompleted(false, null, null, auditResult, self.data.taskId);
+                }
+              }
+            })
+          } else {
+            self.$emit('update-next-node-assignee', idSelectedArr[0], idSelectedArr[1], self.id);
+          }
         }
       }
       this.modalBoxShow = false;
@@ -234,8 +247,8 @@ export default {
     },
     onSelectionChange: function (selection) {
       let self = this
-      self.idSelectedArr = []
-      if (selection.length > 1) {
+      // self.idSelectedArr = []
+      if (self.helpBoxType !== 'addMultitaskInstance' && selection.length > 1) {
         self.$Message.info('只能选择一条记录！')
         this.$refs.selection.selectAll(false);
       }