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

package/package.json

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

package/src/components/assignee-box.vue

@@ -278,6 +278,10 @@ export default {
     onOk(){
       let self = this
       let idSelectedArr = self.idSelectedArr
+      if (self.idSelectedArr.length === 0) {
+        self.onCancel()
+        return
+      }
       self.loading = true
       if (self.helpBoxType ==='addMultitaskInstance'){
         idSelectedArr = [...new Set(idSelectedArr)]

package/src/components/opinion.vue

@@ -59,6 +59,11 @@ export default {
     UploadFile
   },
   props: {
+    value: {
+      type: String,
+      required: false,
+      default: ''
+    },
     attachmentFile:{
       type: Boolean,
       default: false,
@@ -289,7 +294,7 @@ export default {
     },
   },
   mounted() {
-    this.auditOpinion = this.defaultAuditOpinion
+    this.auditOpinion = this.defaultAuditOpinion || this.value
   },
   watch: {
     auditOpinionText(label) {
@@ -298,6 +303,9 @@ export default {
     auditOpinion(val) {
       this.$emit('input', val)
     },
+    value(newVal) {
+      this.auditOpinion = newVal;
+    },
     defaultAuditOpinion(val) {
       this.auditOpinion = this.defaultAuditOpinion
       this.$emit('input', val)

package/src/components/process-info.vue

@@ -198,6 +198,11 @@ export default {
     LamboPagingTable,
   },
   props: {
+    value: {
+      type: String,
+      required: false,
+      default: ''
+    },
     isDetail: {
       type: Boolean,
       required: false,
@@ -515,11 +520,15 @@ export default {
   mounted() {
     this.getAttachList(this.taskId)
     this.processInfoWidth = this.inHorizontal ? 1000 : this.portraitWidth
+    this.form.auditOpinion = this.value;
   },
   watch: {
     'form.auditOpinion'(val) {
       this.$emit('input', val)
     },
+    value(newVal) {
+      this.form.auditOpinion = newVal;
+    },
     defaultAuditOpinion(val) {
       this.auditOpinion = this.defaultAuditOpinion
       this.$emit('input', val)

package/src/portrait.vue

@@ -165,9 +165,7 @@
       </Table>
     </Modal>
     <!--  下一环节设置弹框  -->
-    <Modal v-model="appointBoxShow" title="下一环节设置"
-           @on-cancel="appointBoxShow = false" width="600"
-           @on-ok="appointOk">
+    <Modal v-model="appointBoxShow" title="下一环节设置" width="600">
       <Card v-for="(item,index) of nextNodesFormList" :key="index" style="margin-bottom: 10px"
             v-if="handleButtons && (handleButtons.includes('appointHandler') || handleButtons.includes('appointTimeoutTime'))">
         <Form ref="appointBox" justify="center" :label-width="100" :model="item"
@@ -250,6 +248,10 @@
           </div>
         </Form>
       </Card>
+      <template slot="footer">
+        <Button @click="appointBoxShow = false">取消</Button>
+        <Button type="primary" @click="appointOk">确定</Button>
+      </template>
     </Modal>
     <Modal v-model="rejectAttributesBoxShow" title="驳回的节点通过后"
            @on-cancel="rejectAttributesCancel"
@@ -512,7 +514,9 @@ export default {
         '84': '委派任务',
         '61': '交回委派任务',
         '62': '撤回委派任务',
+        'passContinue': '通过并继续',
       },
+      isPassContinue: false, // 标记是否为通过并继续操作
       handleTypeList: [
         {
           value: '00',
@@ -637,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: '撤回委派',
@@ -1278,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 = {
@@ -1301,6 +1391,7 @@ export default {
       }
       if (self.form.auditOpinion == '' || self.form.auditOpinion == null) {
         if (self.auditResult === '30') {
+          self.form.auditOpinion = '通过'
           self.auditParams.auditOpinion = '通过'
           self.businessFormSave ? self.businessFormSave(self.handleSaveResult, auditResult) : self.handleSaveResult(true)
           return
@@ -1367,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 {
@@ -1414,6 +1506,7 @@ export default {
                     //后端没有返回数据
                     setTimeout(() => {
                       self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+                      self.isPassContinue = false // 重置标志
                     }, 1000)
                     bus.$emit('triggerTimer')
                   } else {
@@ -1422,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')
@@ -1459,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 = ''
@@ -1480,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') {
             // 数据同步
@@ -1503,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
@@ -1765,6 +1873,7 @@ export default {
     appointOk() {
       const self = this
       let oldSettings
+      let illegalNodes = []
       let params = this.nextNodesFormList.reduce((acc, item) => {
         acc[item.id] = {
           needUpdate: 'false',
@@ -1779,17 +1888,25 @@ export default {
           acc[item.id].timeLimit = ''
         }
         oldSettings = self.nextNodesOldSettings.filter(oldSetting => oldSetting.id === item.id)[0]
+        if ((!item.assignee && !oldSettings.assignee && !item.candidateGroups && !oldSettings.candidates) || (item.isMultiInstance && !item.candidateGroups && !oldSettings.candidates)){
+          illegalNodes = [...illegalNodes, item.name]
+        }
         if (oldSettings.assignee !== item.assignee || self.checkGroupsUpdate(oldSettings.candidates, item.candidateGroups, item.isMultiInstance) || self.checkTimeLimitUpdate(oldSettings.timeLimit, timeLimit)) {
           acc[item.id].needUpdate = 'true'
         }
         return acc
       }, {})
+      if (illegalNodes.length > 0){
+        self.$Message.error(`请选择节点${illegalNodes.join(',')}的审批人！`);
+        return
+      }
       self.auditParams.nodeConfigMaps = JSON.stringify(params)
       self.doPass((execResult, instanceId, taskIds, auditResult, curTaskId) => {
         if (this.executionCompleted) {
           this.executionCompleted(execResult, instanceId, taskIds, auditResult, curTaskId)
         }
       })
+      self.appointBoxShow = false
     },
     checkGroupsUpdate(oldSetting, newSetting, isMultiInstance) {
       if (oldSetting && newSetting) {