@lambo-design/workflow-approve 1.0.0-beta.97 → 1.0.0-beta.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.97",
+  "version": "1.0.0-beta.99",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,7 +12,7 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/core": "^4.7.1-beta.170",
+    "@lambo-design/core": "^4.7.1-beta.171",
     "@lambo-design/shared": "^1.0.0-beta.299"
   },
   "dependencies": {

package/src/components/assignee-box.vue

@@ -85,6 +85,12 @@ export default {
       type: String,
       default: '/api/upms-server',
     },
+    //是否展示操作按钮二次弹框
+    showConfirmBox: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
   },
   data() {
     return {
@@ -314,29 +320,15 @@ export default {
               code: self.data.auditResult,
               name: self.data.auditResultName,
             }
+            if (!self.showConfirmBox){
+              self.execute(auditResult)
+              return;
+            }
             self.$Modal.confirm({
               title: '提示',
               content: '确定要' + auditResult.name + '吗？',
               onOk: () => {
-                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);
-                    }
-                  }
-                })
+                self.execute(auditResult)
               },
               onCancel: () => {
                 self.loading = false
@@ -352,7 +344,28 @@ export default {
       }
       this.modalBoxShow = false;
     },
-
+    execute(auditResult){
+      const self = this
+      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);
+          }
+        }
+      })
+    },
     doSearch: function () {
       this.tableSearchParams = Object.assign({}, this.form)
     },

package/src/portrait.vue

@@ -142,7 +142,7 @@
       </Card>
     </Modal>
     <!--  指定他人处理弹框  -->
-    <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted"
+    <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted" :show-confirm-box="showConfirmBox"
                  @update-selected="handleSelectedUser" @update-next-node-assignee="updateNextNodeAssignee"
                  @add-multitask-instance="addMultitaskInstance" @delegate-task-assignee="delegateTask"
                  @appoint-handler-with-candGroups="updateNextNodeCandGroups"
@@ -370,6 +370,12 @@ export default {
       required: false,
       default: '',
     },
+    //是否展示操作按钮二次弹框
+    showConfirmBox: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     //审批历史默认排序规则
     historySortBy: {
       type: String,
@@ -432,7 +438,7 @@ export default {
       isExpanded: this.processInfoExpanded,
       footerHeight: 55,
       showProcessInfo: true,
-      portraitWidth: 0,
+      portraitWidth: 400,
       openProcessInfo: true,
       currentHeight: 0,
       soltHeight: 0,
@@ -1032,7 +1038,6 @@ export default {
       const windowHeight = window.innerHeight - 50;
       this.maxHeight = (this.maxHeightPercent / 100) * windowHeight;
       this.minHeight = 0.15 * windowHeight;
-
       let initialHeight = (this.initialHeightPercent / 100) * windowHeight;
       initialHeight = Math.max(this.minHeight, Math.min(initialHeight, this.maxHeight));
       this.currentHeight = initialHeight;
@@ -1497,24 +1502,16 @@ export default {
         //委派任务
         this.getTransferRangeAndOpenModal(self.organTreeType, '', 'delegateTask', '')
       } else if (self.auditResult === '62') {
+        if (!self.showConfirmBox){
+          self.execute('撤回委派成功', auditResult)
+          return;
+        }
         //撤回委派任务
         self.$Modal.confirm({
           title: '提示',
           content: '确定要' + auditResult.name + '吗？',
           onOk: () => {
-            ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
-              let result = resp.data
-              if (result.code == '200') {
-                self.loading = false
-                self.disable = false
-                self.revokeDelegateTask = false
-                self.$Message.success('撤回委派成功')
-              } else {
-                self.loading = false
-                self.disable = false
-                self.$Message.error(result.message)
-              }
-            })
+            self.execute('撤回委派成功', auditResult)
           },
           onCancel: () => {
             self.loading = false
@@ -1522,30 +1519,16 @@ export default {
           }
         })
       } else if (self.auditResult === '61') {
+        if (!self.showConfirmBox){
+          self.execute('交回委派任务成功', auditResult)
+          return;
+        }
         //交回委派任务
         self.$Modal.confirm({
           title: '提示',
           content: '确定要' + auditResult.name + '吗？',
           onOk: () => {
-            ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
-              let result = resp.data
-              if (result.code == '200') {
-                self.loading = false
-                self.disable = false
-                self.$Message.success('交回委派任务成功')
-                if (result.data) {
-                  let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
-                  setTimeout(() => {
-                    self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
-                    self.isPassContinue = false // 重置标志
-                  }, 1000)
-                }
-              } else {
-                self.loading = false
-                self.disable = false
-                self.$Message.error(result.message)
-              }
-            })
+            self.execute('交回委派任务成功', auditResult)
           },
           onCancel: () => {
             self.loading = false
@@ -1641,91 +1624,124 @@ export default {
         code: self.isPassContinue ? 'passContinue' : self.auditResult,
         name: self.isPassContinue ? self.handleButtonsNames['passContinue'] : self.handleButtonsNames[self.auditResult]
       }
+      if (!self.showConfirmBox){
+        self.executePass(auditResult)
+        return;
+      }
       //二次确认
       self.$Modal.confirm({
         title: '提示',
         content: '确定要' + auditResult.name + '吗？',
         onOk: () => {
-          if (self.auditResult === '82' && (self.targetTaskNode == '' || self.targetTaskNode == null)) {
-            self.auditResult = ''
-            self.$Message.error(`请选择${self.handleName}节点！`)
-          } else {
-            self.loading = true
-            self.disable = true
-            self.auditParams.targetTaskNode = self.targetTaskNode
-            let url = self.smartFlowServerContext + '/manage/processTodo/audit'
-            ajax.post(url, self.auditParams).then(function (resp) {
-              let result = resp.data
-              if (result.code == '200') {
-                self.loading = false
-                self.disable = false
-                let message = result.message ? result.message : `${self.handleName}成功`
-                if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90'){
-                  message = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}成功`
-                }
-                self.$Message.success(message)
-                if (self.isPassContinue) {
-                  // 通过并继续操作，获取下一条待办
-                  self.getNextTodoAndRefresh()
-                } else {
-                  // 普通操作，正常回调
-                  if (result.data) {
-                    let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
-                    setTimeout(() => {
-                      self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
-                    }, 1000)
-                  } else {
-                    setTimeout(() => {
-                      self.executionCompleted(true, null, null, auditResult, self.curTaskId)
-                    }, 1000)
-                  }
-                }
-              } else if (result.code == '10012') {
-                // 数据同步
-                self.loading = false
-                self.disable = false
-                self.$Message.warning(result.message)
+          self.executePass(auditResult)
+        },
+        onCancel: () => {
+          self.loading = false
+          self.disable = false
+        }
+      })
+
+    },
+    executePass(auditResult){
+      const self = this
+      if (self.auditResult === '82' && (self.targetTaskNode == '' || self.targetTaskNode == null)) {
+        self.auditResult = ''
+        self.$Message.error(`请选择${self.handleName}节点！`)
+      } else {
+        self.loading = true
+        self.disable = true
+        self.auditParams.targetTaskNode = self.targetTaskNode
+        let url = self.smartFlowServerContext + '/manage/processTodo/audit'
+        ajax.post(url, self.auditParams).then(function (resp) {
+          let result = resp.data
+          if (result.code == '200') {
+            self.loading = false
+            self.disable = false
+            let message = result.message ? result.message : `${self.handleName}成功`
+            if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90'){
+              message = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}成功`
+            }
+            self.$Message.success(message)
+            if (self.isPassContinue) {
+              // 通过并继续操作，获取下一条待办
+              self.getNextTodoAndRefresh()
+            } else {
+              // 普通操作，正常回调
+              if (result.data) {
+                let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
                 setTimeout(() => {
-                  self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+                  self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
                 }, 1000)
-              } else if (result.code == '20002') {
-                // 流程结束
-                self.loading = false
-                self.disable = false
-                self.$Message.success(result.message)
-                if (self.isPassContinue) {
-                  // 通过并继续操作，获取下一条待办
-                  setTimeout(() => {
-                    self.getNextTodoAndRefresh()
-                  }, 500)
-                }else {
-                  setTimeout(() => {
-                    self.executionCompleted(true, '流程已结束', '流程已结束', auditResult, self.curTaskId)
-                    self.isPassContinue = false // 重置标志
-                  }, 1000)
-                }
               } else {
-                self.loading = false
-                self.disable = false
-                let failedMessage = result.message ? result.message : `${self.handleName}失败`
-                if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90'){
-                  failedMessage = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}失败`
-                }
-                self.$Message.error(failedMessage)
                 setTimeout(() => {
-                  self.executionCompleted(false, null, null, auditResult, self.curTaskId)
+                  self.executionCompleted(true, null, null, auditResult, self.curTaskId)
                 }, 1000)
               }
-              bus.$emit('triggerTimer')
-            })
+            }
+          } else if (result.code == '10012') {
+            // 数据同步
+            self.loading = false
+            self.disable = false
+            self.$Message.warning(result.message)
+            setTimeout(() => {
+              self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+            }, 1000)
+          } else if (result.code == '20002') {
+            // 流程结束
+            self.loading = false
+            self.disable = false
+            self.$Message.success(result.message)
+            if (self.isPassContinue) {
+              // 通过并继续操作，获取下一条待办
+              setTimeout(() => {
+                self.getNextTodoAndRefresh()
+              }, 500)
+            }else {
+              setTimeout(() => {
+                self.executionCompleted(true, '流程已结束', '流程已结束', auditResult, self.curTaskId)
+                self.isPassContinue = false // 重置标志
+              }, 1000)
+            }
+          } else {
+            self.loading = false
+            self.disable = false
+            let failedMessage = result.message ? result.message : `${self.handleName}失败`
+            if (self.auditResult === '40' || self.auditResult === '70' || self.auditResult === '90'){
+              failedMessage = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}失败`
+            }
+            self.$Message.error(failedMessage)
+            setTimeout(() => {
+              self.executionCompleted(false, null, null, auditResult, self.curTaskId)
+            }, 1000)
           }
-        },
-        onCancel: () => {
+          bus.$emit('triggerTimer')
+        })
+      }
+    },
+    execute(successMessage, auditResult){
+      ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
+        let result = resp.data
+        if (result.code == '200') {
           self.loading = false
           self.disable = false
+          self.$Message.success(successMessage)
+          if (result.data) {
+            let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
+            setTimeout(() => {
+              self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
+              self.isPassContinue = false // 重置标志
+            }, 1000)
+          }
+        } else {
+          self.loading = false
+          self.disable = false
+          self.$Message.error(result.message)
         }
+      }).catch(err => {
+        self.loading = false
+        self.disable = false
+        console.log(err)
       })
-
     },
     doJump(){
       if (this.auditResult === '90'){
@@ -1787,32 +1803,15 @@ export default {
         name: self.handleButtonsNames[self.auditResult]
       }
       self.auditParams.selectedUserId = assignee
+      if (!self.showConfirmBox){
+        self.execute('委派成功', auditResult)
+        return;
+      }
       self.$Modal.confirm({
         title: '提示',
         content: '确定要' + auditResult.name + '吗？',
         onOk: () => {
-          ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
-            let result = resp.data
-            if (result.code == '200') {
-              self.loading = false
-              self.disable = false
-              self.$Message.success('委派成功')
-              if (result.data) {
-                let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',')
-                setTimeout(() => {
-                  self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
-                }, 1000)
-              }
-            } else {
-              self.loading = false
-              self.disable = false
-              self.$Message.error(result.message)
-            }
-          }).catch(err => {
-            self.loading = false
-            self.disable = false
-            console.log(err)
-          })
+          self.execute('委派成功', auditResult)
         },
         onCancel: () => {
           self.loading = false