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

package/package.json

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

package/src/components/history.vue

@@ -243,6 +243,7 @@ export default {
         procName: item.procName,
         effectTime: item.startDate,
         expireTime: item.warningDate,
+        applyId: item.applyId,
       };
       let url = self.smartFlowServerContext + "/manage/processTodo/sendMessage";
       ajax.post(url, params).then(function (resp) {

package/src/portrait.vue

@@ -195,7 +195,7 @@
                 :disabled="disable" :loading="loading" @click="audit('70')">驳回到原点
         </Button>
         <Button style="margin-left: 10px;" v-if="(!handleButtons || handleButtons.includes('auditTo40')) && !isDetail"
-                :disabled="disable" :loading="loading" @click="audit('40')">驳回到上一级
+                :disabled="disable" :loading="loading" @click="audit('40')">驳回上一节点
         </Button>
         <Button style="margin-left: 10px;" v-if="(!handleButtons || handleButtons.includes('auditTo90')) && !isDetail"
                 :disabled="disable" :loading="loading" @click="audit('90')">驳回指定节点
@@ -447,7 +447,7 @@ export default {
                   }
                 }, '已跳转到指定节点')
               ])
-            } else if (params.row.auditResult == '80' && params.row.taskNode != this.taskNode) {
+            } else if (params.row.auditResult == '90' && params.row.taskNode != this.taskNode) {
               return h('div', [
                 h('tag', {
                   props: {
@@ -607,9 +607,9 @@ export default {
         console.log(err)
       })
     },
-    handleSaveResult(saveResult) {
+    handleSaveResult(saveResult, businessParams) {
       if (saveResult) {
-        this.executeButtonAction((execResult, instanceId, taskIds, auditResult, curTaskId) => {
+        this.executeButtonAction(businessParams,(execResult, instanceId, taskIds, auditResult, curTaskId) => {
           if (this.executionCompleted) {
             this.executionCompleted(execResult, instanceId, taskIds, auditResult, curTaskId);
           }
@@ -618,8 +618,12 @@ export default {
         console.error('保存失败');
       }
     },
-    executeButtonAction(callback) {
+    executeButtonAction(businessParams, callback) {
       const self = this;
+      if (businessParams){
+        Object.assign(self.datas, businessParams)
+        self.auditParams.params = JSON.stringify(self.datas)
+      }
       let auditResult = {
         code: self.auditResult,
         name: self.handleButtonsNames[self.auditResult]
@@ -639,7 +643,14 @@ export default {
         let url = self.smartFlowServerContext + '/manage/processTodo/getPreNode'
         ajax.post(url, self.auditParams).then(function (resp) {
           let result = resp.data
-          if (result.code == '30010') {
+          if(result.code == '30013' || result.code == '30014') {
+            //前序节点为子流程或当前节点为子流程第一个节点不可驳回上一级节点
+            self.$Message.warning(result.message)
+            //避免未提示消息直接回调
+            setTimeout(() => {
+              callback(false, null, null, auditResult, self.taskId);
+            }, 1000)
+          } else if (result.code == '30010') {
             self.$Modal.confirm({
               title: "提示",
               content: result.message,
@@ -659,7 +670,9 @@ export default {
                     self.loading = false
                     self.disable = false
                     self.$Message.error(result.message)
-                    callback(false, null, null, auditResult, self.taskId);
+                    setTimeout(() => {
+                      callback(false, null, null, auditResult, self.taskId);
+                    }, 1000)
                   }
                   bus.$emit('triggerTimer')
                 })
@@ -689,7 +702,9 @@ export default {
                 self.loading = false
                 self.disable = false
                 self.$Message.error(result.message)
-                callback(false, null, null, auditResult, self.taskId);
+                setTimeout(() => {
+                  callback(false, null, null, auditResult, self.taskId);
+                }, 1000)
               }
               bus.$emit('triggerTimer')
             })
@@ -720,8 +735,10 @@ export default {
           } else {
             self.loading = false
             self.disable = false
-            callback(false, null, null, auditResult, self.taskId)
             self.$Message.error(result.message)
+            setTimeout(() => {
+              callback(false, null, null, auditResult, self.taskId);
+            }, 1000)
           }
           bus.$emit('triggerTimer')
         })