@lambo-design/workflow-approve 1.0.0-beta.88 → 1.0.0-beta.89

package/package.json

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

package/src/portrait.vue

@@ -514,7 +514,9 @@ export default {
         '84': '委派任务',
         '61': '交回委派任务',
         '62': '撤回委派任务',
+        'passContinue': '通过并继续',
       },
+      isPassContinue: false, // 标记是否为通过并继续操作
       handleTypeList: [
         {
           value: '00',
@@ -639,6 +641,13 @@ export default {
           action: () => this.audit('30'),
           type: 'primary'
         },
+        {
+          id: 'passContinue',
+          label: `${this.passName}并继续`,
+          condition: this.handleButtons?.includes('passContinue') && !this.isDetail && !this.appointTask,
+          action: () => this.passContinueAudit(),
+          type: 'primary'
+        },
         {
           id: 'revokeDelegateTask',
           label: '撤回委派',
@@ -1280,6 +1289,85 @@ export default {
       self.auditResult = auditResult
       self.submit()
     },
+
+    // 通过并继续审批
+    passContinueAudit: function () {
+      let self = this
+      self.auditResult = '30' // 设置为通过
+      self.isPassContinue = true // 标记为通过并继续
+      self.submit()
+    },
+
+    // 获取下一条待办并刷新页面
+    getNextTodoAndRefresh() {
+      let self = this
+      let param = {
+        procType: self.procType
+      }
+      // 获取待办列表，获取下一条数据，排除当前已处理的任务
+      ajax.get(self.smartFlowServerContext + "/manage/processTodo/list",{params:param}).then(function (resp) {
+        if (resp.data.code === '200' && resp.data.data.rows && resp.data.data.rows.length > 0) {
+          // 过滤掉当前已处理的任务
+          const availableTodos = resp.data.data.rows.filter(todo => todo.applyId !== self.applyId)
+          if (availableTodos.length === 0) {
+            self.$Message.info('该类型没有更多待办任务了')
+            self.isPassContinue = false // 重置标志
+            self.executionCompleted(true, null, null, { code: '30', name: '通过' }, self.curTaskId)
+            return
+          }
+          const nextTodo = availableTodos[0]
+          // 获取节点配置信息
+          let param = {
+            procId: nextTodo.procId,
+            taskNode: nextTodo.taskNode
+          }
+          ajax.post(self.smartFlowServerContext + '/manage/approvalCenter/getNodeData', param).then(function (nodeResp) {
+            if (nodeResp.data.code === '200' && nodeResp.data.data && nodeResp.data.data.length > 0) {
+              const nodeData = nodeResp.data.data[0]
+              // 跳转处理
+              self.jumpToNextTodo(nextTodo, nodeData)
+            } else {
+              self.$Message.warning('无法获取下一条待办的节点配置信息')
+              self.isPassContinue = false // 重置标志
+              self.executionCompleted(true, null, null, { code: '30', name: '通过' }, self.curTaskId)
+            }
+          }).catch(err => {
+            console.error('获取节点配置失败:', err)
+            self.$Message.error('获取节点配置失败')
+            self.isPassContinue = false // 重置标志
+            self.executionCompleted(true, null, null, { code: '30', name: '通过' }, self.curTaskId)
+          })
+        } else {
+          self.$Message.info('没有更多待办任务了')
+          self.isPassContinue = false // 重置标志
+          self.executionCompleted(true, null, null, { code: '30', name: '通过' }, self.curTaskId)
+        }
+      }).catch(err => {
+        console.error('获取待办列表失败:', err)
+        self.$Message.error('获取下一条待办失败')
+        self.isPassContinue = false // 重置标志
+        self.executionCompleted(true, null, null, { code: '30', name: '通过' }, self.curTaskId)
+      })
+    },
+
+    // 通过executionCompleted回调通知父组件进行页面跳转
+    jumpToNextTodo(nextTodo, nodeData) {
+      // 先重置标志
+      this.isPassContinue = false
+
+      this.$Message.success(`已切换到下一条待办`)
+
+      // 构建特殊的auditResult对象，包含下一条待办的信息
+      let auditResult = {
+        code: 'passContinueSuccess',
+        name: '通过并继续',
+        nextTodo: nextTodo,
+        nodeData: nodeData
+      }
+
+      // 通过executionCompleted回调通知父组件处理跳转
+      this.executionCompleted(true, null, null, auditResult, this.curTaskId)
+    },
     submit() {
       let self = this
       self.auditParams = {
@@ -1370,6 +1458,7 @@ export default {
               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 {
@@ -1417,6 +1506,7 @@ export default {
                     //后端没有返回数据
                     setTimeout(() => {
                       self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+                      self.isPassContinue = false // 重置标志
                     }, 1000)
                     bus.$emit('triggerTimer')
                   } else {
@@ -1425,6 +1515,7 @@ export default {
                     self.$Message.error(auditMessage)
                     setTimeout(() => {
                       self.executionCompleted(false, null, null, auditResult, self.curTaskId)
+                      self.isPassContinue = false // 重置标志
                     }, 1000)
                   }
                   bus.$emit('triggerTimer')
@@ -1462,8 +1553,8 @@ export default {
       let self = this
       this.modal = false
       let auditResult = {
-        code: self.auditResult,
-        name: self.handleButtonsNames[self.auditResult]
+        code: self.isPassContinue ? 'passContinue' : self.auditResult,
+        name: self.isPassContinue ? self.handleButtonsNames['passContinue'] : self.handleButtonsNames[self.auditResult]
       }
       if (self.auditResult === '82' && (self.targetTaskNode == '' || self.targetTaskNode == null)) {
         self.auditResult = ''
@@ -1483,15 +1574,21 @@ export default {
               message = result.message ? self.replaceName(result.message, '驳回', self.rejectName) : `${self.rejectName}成功`
             }
             self.$Message.success(message)
-            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)
+            if (self.isPassContinue) {
+              // 通过并继续操作，获取下一条待办
+              self.getNextTodoAndRefresh()
             } else {
-              setTimeout(() => {
-                self.executionCompleted(true, null, null, auditResult, self.curTaskId)
-              }, 1000)
+              // 普通操作，正常回调
+              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') {
             // 数据同步
@@ -1506,9 +1603,17 @@ export default {
             self.loading = false
             self.disable = false
             self.$Message.success(result.message)
-            setTimeout(() => {
-              self.executionCompleted(true, '流程已结束', '流程已结束', auditResult, self.curTaskId)
-            }, 1000)
+            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