@lambo-design/workflow-approve 1.0.0-beta.10 → 1.0.0-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.12",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,8 +12,8 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/core": "^4.7.1-beta.139",
-    "@lambo-design/shared": "^1.0.0-beta.200"
+    "@lambo-design/shared": "^1.0.0-beta.204",
+    "@lambo-design/core": "^4.7.1-beta.139"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/assignee-box.vue

@@ -188,15 +188,15 @@ export default {
           if (result.code == '200') {
             self.loading = false
             self.$Message.success(result.message);
-            if (this.executionCompleted) {
-              this.executionCompleted(true, self.data.instanceId, self.data.taskId, auditResult, self.data.taskId);
+            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 (this.executionCompleted) {
-              this.executionCompleted(false, null, null, auditResult, self.data.taskId);
+            if (self.executionCompleted) {
+              self.executionCompleted(false, null, null, auditResult, self.data.taskId);
             }
           }
         })

package/src/portrait.vue

@@ -177,7 +177,7 @@
                  @on-current-change="selectNode">
           </Table>
         </Modal>
-        <assigneeBox ref="assigneeHelpBox" :executionCompleted="executionCompleted" @update-selected="handleSelectedUser"
+        <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted" @update-selected="handleSelectedUser"
                      :data="assigneeBoxData" :smart-flow-server-context="smartFlowServerContext" :upms-server-context="upmsServerContext"/>
         <Modal v-model="modalBoxShow" width="1000" title="流程跟踪图">
           <Workflow_Diagram ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId"
@@ -380,13 +380,13 @@ export default {
       let str = '';
       const hasAuditOpinion = !this.handleButtons || this.handleButtons.includes('auditOpinion')
       const hasAttachmentFile = (!this.handleButtons || this.handleButtons.includes('attachmentFile')) && this.attachmentList.length > 0
-      const isDetail = this.isDetail && this.hisAuditOpinion[0].auditOpinion
+      const isDetail = this.isDetail && !this.hisAuditOpinion[0].auditOpinion.length > 0
       if (hasAuditOpinion && !hasAttachmentFile && !isDetail){
         str+= "height: 43vh"
       } else if (hasAuditOpinion && hasAttachmentFile && !isDetail){
         str+= "height: 40vh"
       } else {
-        str+= "height: 60vh"
+        str+= "height: 67vh"
       }
       return str;
     },
@@ -885,6 +885,7 @@ export default {
       this.auditResult = '';
     },
     ok() {
+      let self = this;
       this.modal = false
       let auditResult = {
         code: self.auditResult,
@@ -919,8 +920,8 @@ export default {
               self.disable = false
               self.$Message.success("审批成功");
               if (self.executionCompleted) {
-                let taskIds = result.data.map(item => item.id).join(',');
-                self.executionCompleted(true, result.data[0].processInstanceId, taskIds, auditResult, self.taskId)
+                let taskIds = result.data.id;
+                self.executionCompleted(true, result.data.processInstanceId, taskIds, auditResult, self.taskId)
               }
               bus.$emit('triggerTimer')
             }, 500)