@lambo-design/workflow-approve 1.0.0-beta.55 → 1.0.0-beta.57

package/src/portrait.vue

@@ -205,11 +205,11 @@
     </Modal>
     <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted"
                  @update-selected="handleSelectedUser" @update-next-node-assignee="updateNextNodeAssignee"
-                 @add-multitask-instance="addMultitaskInstance"
+                 @add-multitask-instance="addMultitaskInstance" @delegate-task-assignee="delegateTask"
                  :data="assigneeBoxData" :smart-flow-server-context="smartFlowServerContext"
                  :upms-server-context="upmsServerContext"/>
-    <Modal v-model="modalBoxShow" width="1000" title="流程跟踪图">
-      <Workflow_Diagram ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId"
+    <Modal ref="processTraceModal" v-model="modalBoxShow" width="1000" title="流程跟踪图" @scroll="handleScroll">
+      <Workflow_Diagram ref="processTrace" @scroll="handleScroll" :instanceId="process.instanceId" :applyId="process.applyId"
                         :procId="process.procId" :table-columns="diagramTableColumns"
                         :tableData="process.tableData" :hisAudit="hisAudit"
                         :approve-detail-show-way="approveDetailShowWay"
@@ -318,38 +318,46 @@
     <template slot="page-footer">
       <div>
         <slot name="footer-button"></slot>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo70') && !isDetail"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo70') && !isDetail && !appointTask"
                 :disabled="disable" :loading="loading" @click="audit('70')">驳回到原点
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo40') && !isDetail"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo40') && !isDetail && !appointTask"
                 :disabled="disable" :loading="loading" @click="audit('40')">驳回上一节点
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo90') && !isDetail"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo90') && !isDetail && !appointTask"
                 :disabled="disable" :loading="loading" @click="audit('90')">驳回指定节点
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo80') && !isDetail"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo80') && !isDetail && !appointTask"
                 :disabled="disable" :loading="loading" @click="audit('80')">跳转指定节点
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo82') && !isDetail"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo82') && !isDetail && !appointTask"
                 :disabled="disable" :loading="loading" @click="audit('82')">指定他人处理
         </Button>
         <Button style="margin-left: 10px;"
-                v-if="isParallelCountersignature && handleButtons && handleButtons.includes('addMultitaskInstance') && !isDetail"
+                v-if="curNodeType === 'userTask' && handleButtons && handleButtons.includes('delegateTask') && !isDetail && !appointTask"
+                :disabled="disable" :loading="loading" @click="audit('84')">委派
+        </Button>
+        <Button style="margin-left: 10px;"
+                v-if="curNodeType === 'multiNode' && handleButtons && handleButtons.includes('addMultitaskInstance') && !isDetail && !appointTask"
                 :disabled="disable" :loading="loading" @click="showUpdateMultitaskInstanceModal('81')">加签
         </Button>
         <Button style="margin-left: 10px;"
-                v-if="isParallelCountersignature && handleButtons && handleButtons.includes('reductionMultitaskInstance') && !isDetail"
+                v-if="curNodeType === 'multiNode' && handleButtons && handleButtons.includes('reductionMultitaskInstance') && !isDetail && !appointTask"
                 :disabled="disable" :loading="loading" @click="showUpdateMultitaskInstanceModal('83')">减签
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo50') && !isDetail"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo50') && !isDetail && !appointTask"
                 :disabled="disable" :loading="loading" @click="audit('50')">直接结束流程
         </Button>
         <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('processTrace')"
                 @click="processPrint">流程跟踪图
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo30') && !isDetail"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo30') && !isDetail && !appointTask"
                 :disabled="disable" :loading="loading" type="primary" @click="audit('30')">通过
         </Button>
+        <Button style="margin-left: 10px;" v-if="revokeDelegateTask"
+                :disabled="!revokeDelegateTask && disable" :loading="loading" @click="audit('62')">撤回委派
+        </Button>
+        <Button style="margin-left: 10px;" v-if="appointTask" :disabled="disable" :loading="loading" type="primary" @click="audit('61')">交回</Button>
       </div>
     </template>
   </LamboPageContainer>
@@ -514,9 +522,11 @@ export default {
       },
       loading: false,
       disable: false,
+      revokeDelegateTask: false,
+      appointTask: false,
       instanceId: '',
       curTaskId: '',
-      isParallelCountersignature: false,
+      curNodeType: 'userTask',
       handleButtons: [],
       handleName: '',
       auditOpinionTitle: '',
@@ -554,7 +564,10 @@ export default {
         '90': '驳回指定节点',
         '80': '跳转指定节点',
         '82': '指定他人处理',
-        '50': '直接结束流程'
+        '50': '直接结束流程',
+        '84': '委派任务',
+        '61': '交回委派任务',
+        '62': '撤回委派任务',
       },
       handleTypeList: [
         {
@@ -649,6 +662,22 @@ export default {
                   }
                 }, '已撤回')
               ])
+            } else if (params.row.auditResult == '61' && params.row.taskNode != this.taskNode) {
+              return h('div', [
+                h('tag', {
+                  props: {
+                    color: '#19be6b'
+                  }
+                }, '已交回委派任务')
+              ])
+            } else if (params.row.auditResult == '62' && params.row.taskNode != this.taskNode) {
+              return h('div', [
+                h('tag', {
+                  props: {
+                    color: '#ed4014'
+                  }
+                }, '委派任务已撤回')
+              ])
             } else if (params.row.auditResult == '80' && params.row.taskNode != this.taskNode) {
               return h('div', [
                 h('tag', {
@@ -730,6 +759,12 @@ export default {
           } else if (row.auditResult == '60') {
             label = '撤回'
             tagColor = 'blue' // 蓝色
+          } else if (row.auditResult == '61') {
+            label = '交回委派任务'
+            tagColor = 'green' // 绿色
+          } else if (row.auditResult == '62') {
+            label = '委派任务被撤回'
+            tagColor = 'blue' // 蓝色
           } else if (row.auditResult == '80') {
             label = '跳转到指定节点'
             tagColor = 'cyan' // 青色
@@ -842,10 +877,14 @@ export default {
       }
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/list', { params: param }).then(function (resp) {
         if (resp.data.code === '200') {
-          self.curTaskId = resp.data.data.rows[0].taskId
-          self.instanceId = resp.data.data.rows[0].procInstanceId
-          self.curAuditGroup = resp.data.data.rows[0].auditGroup
-          let procType = resp.data.data.rows[0].procType
+          let todoData = resp.data.data.rows[0]
+          self.curTaskId = todoData.taskId
+          self.instanceId = todoData.procInstanceId
+          self.curAuditGroup = todoData.auditGroup
+          self.revokeDelegateTask = todoData.delegateStatus ? todoData.delegateStatus === '10' : false
+          self.appointTask = todoData.delegateStatus ? todoData.delegateStatus === '20' : false
+          if (self.revokeDelegateTask) self.disable = true
+          let procType = todoData.procType
           ajax.get(self.smartFlowServerContext + '/manage/processType/lists?proType=' + procType)
             .then(resp => {
               let data = resp.data.data.rows
@@ -939,7 +978,7 @@ export default {
         if (resp.data.code === '200') {
           self.handleButtons = resp.data.data[0].handleButtons
           if (resp.data.data[0].hasOwnProperty('isSequential')) {
-            self.isParallelCountersignature = !resp.data.data[0].isSequential
+            self.curNodeType = resp.data.data[0].isSequential ? 'sequentialMultiNode' : 'multiNode'
           }
           self.handleName = resp.data.data[0].handleName ? resp.data.data[0].handleName : '审批'
           self.auditOpinionTitle = resp.data.data[0].handleName ? resp.data.data[0].handleName + '意见' : '审批意见'
@@ -1115,7 +1154,7 @@ export default {
           self.businessFormSave ? self.businessFormSave(self.handleSaveResult) : self.handleSaveResult(true)
           return
         }
-        if (!self.handleButtons || self.handleButtons.includes('auditOpinion')) {
+        if ((!self.handleButtons || self.handleButtons.includes('auditOpinion')) && self.auditResult !== '84') {
           self.$Message.error(`请输入${self.handleName}意见！`)
           return
         } else {
@@ -1142,15 +1181,57 @@ export default {
         name: self.handleButtonsNames[self.auditResult]
       }
       if (self.auditResult === '82') {
+        //指定他人处理
         self.assigneeBoxData = self.auditParams
         self.assigneeBoxData.auditResultName = self.handleButtonsNames[self.auditResult]
         self.assigneeBoxData.instanceId = self.instanceId
         self.$refs.assigneeHelpBox.toggleShowHelpBox(self.organTreeType, '', 'transferCurTask')
+      } else if (self.auditResult === '84') {
+        //委派任务
+        self.$refs.assigneeHelpBox.toggleShowHelpBox(self.organTreeType, '', 'delegateTask')
+      } else if (self.auditResult === '62') {
+        //撤回委派任务
+        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)
+          }
+        })
+      } else if (self.auditResult === '61') {
+        //交回委派任务
+        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)
+          }
+        })
       } else if (self.auditResult === '80') {
+        //跳转到后序指定节点
         self.getNodesBehind()
       } else if (self.auditResult === '90') {
+        //驳回到前序指定节点
         self.getAllPreNodes()
       } else if (self.auditResult === '40') {
+        //驳回到上一级
         self.loading = true
         self.disable = true
         let url = self.smartFlowServerContext + '/manage/processTodo/getPreNode'
@@ -1345,6 +1426,39 @@ export default {
         console.log(err)
       })
     },
+    //委派
+    delegateTask(assignee) {
+      const self = this
+      if (!assignee){
+        self.$Message.error('请选择加签人员')
+        return
+      }
+      let auditResult = {
+        code: self.auditResult,
+        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 {
+          self.loading = false
+          self.disable = false
+          self.$Message.error(result.message)
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     //加签
     addMultitaskInstance(assingeeList) {
       const assingees = assingeeList.join(',')
@@ -1653,6 +1767,17 @@ export default {
         node.needUpdate = true
         this.$forceUpdate()
       }
+    },
+    handleScroll(delta) {
+      let modalElement = this.$refs.processTraceModal.$el
+      for (let i = 0; i < modalElement.children.length; i++) {
+        //找到目标element进行滚动
+        let targetElement = modalElement.children[i]
+        if (targetElement.classList.toString().includes('-wrap')){
+          targetElement.scrollTop -= delta.dy
+          break
+        }
+      }
     }
   },
   watch: {

package/src/workflow-diagram.vue

@@ -60,6 +60,8 @@
                 <Tag color="red" v-else-if="item.auditResult=='50'">驳回到原点</Tag>
                 <Tag color="purple" v-else-if="item.auditResult=='51'">流程终止</Tag>
                 <Tag color="blue" v-else-if="item.auditResult == '60'">撤回</Tag>
+                <Tag color="green" v-else-if="item.auditResult == '61'">交回委派任务</Tag>
+                <Tag color="blue" v-else-if="item.auditResult == '62'">委派任务被撤回</Tag>
                 <Tag color="cyan" v-else-if="item.auditResult == '80'">跳转指定节点</Tag>
                 <Tag color="cyan" v-else-if="item.auditResult == '83'">会签减签</Tag>
                 <Tag color="magenta" v-else-if="item.auditResult == '90'">驳回指定节点</Tag>
@@ -176,6 +178,14 @@ export default {
                 label = '撤回';
                 tagColor = 'blue'; // 蓝色
               }
+              else if (row.auditResult == '61'){
+                label = '交回委派任务';
+                tagColor = 'green'; // 绿色
+              }
+              else if (row.auditResult == '62'){
+                label = '委派任务被撤回';
+                tagColor = 'blue'; // 蓝色
+              }
               else if (row.auditResult == '80'){
                 label = '跳转到指定节点';
                 tagColor = 'cyan'; // 青色
@@ -290,6 +300,11 @@ export default {
         ]
       });
 
+      //修改zoomScroll的scroll方法，将滚动事件抛出
+      zoomScroll.zoomScroll[1].prototype.scroll = (delta)=>{
+        this.$emit('scroll', delta)
+      }
+
       ajax.get(this.smartFlowServerContext + "/manage/processTodo/printData", {
         params: {
           applyId: this.applyId,