@lambo-design/workflow-approve 1.0.0-beta.96 → 1.0.0-beta.98

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,
@@ -528,9 +534,9 @@ export default {
       },
       handleButtonsNames: {
         '30': '通过',
-        '70': `${this.rejectName}到原点`,
-        '40': `${this.rejectName}上一节点`,
-        '90': `${this.rejectName}指定节点`,
+        '70': `驳回到原点`,
+        '40': `驳回上一节点`,
+        '90': `驳回指定节点`,
         '80': '跳转指定节点',
         '82': '指定他人处理',
         '50': '直接结束流程',
@@ -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;
@@ -1218,6 +1223,19 @@ export default {
           if (!self.handleButtons || (!self.handleButtons.includes('auditOpinion') && !self.handleButtons.includes('attachmentFile') && !self.handleButtons.includes('auditHistory'))) {
             self.showProcessInfo = false;
           }
+          self.handleButtonsNames = {
+            '30': `${self.passName}`,
+            '70': `${self.rejectName}到原点`,
+            '40': `${self.rejectName}上一节点`,
+            '90': `${self.rejectName}指定节点`,
+            '80': '跳转指定节点',
+            '82': '指定他人处理',
+            '50': '直接结束流程',
+            '84': '委派任务',
+            '61': '交回委派任务',
+            '62': '撤回委派任务',
+            'passContinue': '通过并继续',
+          }
         } else {
           self.$Message.error(resp.data.message);
         }
@@ -1484,39 +1502,37 @@ export default {
         //委派任务
         this.getTransferRangeAndOpenModal(self.organTreeType, '', 'delegateTask', '')
       } else if (self.auditResult === '62') {
+        if (!self.showConfirmBox){
+          self.execute('撤回委派成功', auditResult)
+          return;
+        }
         //撤回委派任务
-        ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
-          let result = resp.data
-          if (result.code == '200') {
+        self.$Modal.confirm({
+          title: '提示',
+          content: '确定要' + auditResult.name + '吗？',
+          onOk: () => {
+            self.execute('撤回委派成功', auditResult)
+          },
+          onCancel: () => {
             self.loading = false
             self.disable = false
-            self.revokeDelegateTask = false
-            self.$Message.success('撤回委派成功')
-          } else {
-            self.loading = false
-            self.disable = false
-            self.$Message.error(result.message)
           }
         })
       } else if (self.auditResult === '61') {
+        if (!self.showConfirmBox){
+          self.execute('交回委派任务成功', auditResult)
+          return;
+        }
         //交回委派任务
-        ajax.post(self.smartFlowServerContext + '/manage/processTodo/audit', self.auditParams).then(resp => {
-          let result = resp.data
-          if (result.code == '200') {
+        self.$Modal.confirm({
+          title: '提示',
+          content: '确定要' + auditResult.name + '吗？',
+          onOk: () => {
+            self.execute('交回委派任务成功', auditResult)
+          },
+          onCancel: () => {
             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)
           }
         })
       } else if (self.auditResult === '80') {
@@ -1608,6 +1624,26 @@ 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: () => {
+          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}节点！`)
@@ -1682,6 +1718,31 @@ export default {
         })
       }
     },
+    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'){
         this.auditParams.rejectAttribute = this.rejectAttribute ? this.rejectAttribute :'inSequence'
@@ -1742,25 +1803,20 @@ export default {
         name: self.handleButtonsNames[self.auditResult]
       }
       self.auditParams.selectedUserId = assignee
-      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 {
+      if (!self.showConfirmBox){
+        self.execute('委派成功', auditResult)
+        return;
+      }
+      self.$Modal.confirm({
+        title: '提示',
+        content: '确定要' + auditResult.name + '吗？',
+        onOk: () => {
+          self.execute('委派成功', auditResult)
+        },
+        onCancel: () => {
           self.loading = false
           self.disable = false
-          self.$Message.error(result.message)
         }
-      }).catch(err => {
-        console.log(err)
       })
     },
     //加签