@lambo-design/workflow-approve 1.0.0-beta.65 → 1.0.0-beta.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.65",
+  "version": "1.0.0-beta.67",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,7 +12,7 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/shared": "^1.0.0-beta.250",
+    "@lambo-design/shared": "^1.0.0-beta.252",
     "@lambo-design/core": "^4.7.1-beta.158"
   },
   "dependencies": {

package/src/portrait.vue

@@ -198,13 +198,19 @@
 
     <Modal v-model="modal1" title="选择节点"
            @on-cancel="cancel"
-           @on-ok="doPass">
+           @on-ok="doJump">
       <Table border
              :data="allNode"
              :columns="nodeColumn"
              highlight-row
              @on-current-change="selectNode">
       </Table>
+      <Card  v-if="auditResult == '90'">
+          <p slot="title">选择驳回后流程流转方式：</p>
+          <RadioGroup v-model="rejectAttribute">
+            <Radio v-for="(item, index) in rejectAttributeList" :key="index" :label="item.type">{{item.name}}</Radio>
+          </RadioGroup>
+      </Card>
     </Modal>
     <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted"
                  @update-selected="handleSelectedUser" @update-next-node-assignee="updateNextNodeAssignee"
@@ -314,6 +320,13 @@
         </Form>
       </Card>
     </Modal>
+    <Modal v-model="rejectAttributesBoxShow" title="选择被驳回任务通过后流程流转方式"
+           @on-cancel="rejectAttributesCancel"
+           @on-ok="rejectProcessWithRejectAttributes">
+      <RadioGroup v-model="rejectAttribute">
+        <Radio v-for="(item, index) in rejectAttributeList" :key="index" :label="item.type">{{item.name}}</Radio>
+      </RadioGroup>
+    </Modal>
     <candidateGroupsHelpBox ref="candidateGroupsHelpBox" :show="candidateGroupsHelpBoxShow"
                             @update-cand-groups="updateCandGroups"
                             :upms-server-context="upmsServerContext"
@@ -321,34 +334,34 @@
     <template slot="page-footer">
       <div>
         <slot name="footer-button"></slot>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo70') && !isDetail && !appointTask"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo70') && !isDetail && !appointTask && !rejectedTask"
                 :disabled="disable" :loading="loading" @click="audit('70')">驳回到原点
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo40') && !isDetail && !appointTask"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo40') && !isDetail && !appointTask && !rejectedTask"
                 :disabled="disable" :loading="loading" @click="audit('40')">驳回上一节点
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo90') && !isDetail && !appointTask"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo90') && !isDetail && !appointTask && !rejectedTask"
                 :disabled="disable" :loading="loading" @click="audit('90')">驳回指定节点
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo80') && !isDetail && !appointTask"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo80') && !isDetail && !appointTask && !rejectedTask"
                 :disabled="disable" :loading="loading" @click="audit('80')">跳转指定节点
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo82') && !isDetail && !appointTask"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo82') && !isDetail && !appointTask && !rejectedTask"
                 :disabled="disable" :loading="loading" @click="audit('82')">指定他人处理
         </Button>
         <Button style="margin-left: 10px;"
-                v-if="curNodeType === 'userTask' && handleButtons && handleButtons.includes('delegateTask') && !isDetail && !appointTask"
+                v-if="curNodeType === 'userTask' && handleButtons && handleButtons.includes('delegateTask') && !isDetail && !appointTask && !rejectedTask"
                 :disabled="disable" :loading="loading" @click="audit('84')">委派
         </Button>
         <Button style="margin-left: 10px;"
-                v-if="curNodeType === 'multiNode' && handleButtons && handleButtons.includes('addMultitaskInstance') && !isDetail && !appointTask"
+                v-if="curNodeType === 'multiNode' && handleButtons && handleButtons.includes('addMultitaskInstance') && !isDetail && !appointTask && !rejectedTask"
                 :disabled="disable" :loading="loading" @click="showUpdateMultitaskInstanceModal('81')">加签
         </Button>
         <Button style="margin-left: 10px;"
-                v-if="curNodeType === 'multiNode' && handleButtons && handleButtons.includes('reductionMultitaskInstance') && !isDetail && !appointTask"
+                v-if="curNodeType === 'multiNode' && handleButtons && handleButtons.includes('reductionMultitaskInstance') && !isDetail && !appointTask && !rejectedTask"
                 :disabled="disable" :loading="loading" @click="showUpdateMultitaskInstanceModal('83')">减签
         </Button>
-        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo50') && !isDetail && !appointTask"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo50') && !isDetail && !appointTask && !rejectedTask"
                 :disabled="disable" :loading="loading" @click="audit('50')">直接结束流程
         </Button>
         <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('processTrace')"
@@ -506,8 +519,12 @@ export default {
       reductionMultitaskInstanceModal: false,
       candidateGroupsHelpBoxShow: false,
       appointBoxShow: false,
+      rejectAttributesBoxShow: false,
+      rejectAttributes: {},
       autoOpenNode: '0',
       unapprovedAssigneeList: [],
+      rejectAttribute: 'inSequence',
+      rejectAttributeList: [],
       reductionAssigneeList: [],
       nextNodesOldSettings: [],
       nextNodesFormList: [],
@@ -526,6 +543,7 @@ export default {
       },
       loading: false,
       disable: false,
+      rejectedTask: false,
       revokeDelegateTask: false,
       appointTask: false,
       instanceId: '',
@@ -949,6 +967,11 @@ export default {
           self.instanceId = todoData.procInstanceId
           self.curAuditGroup = todoData.auditGroup
           self.revokeDelegateTask = todoData.delegateStatus ? todoData.delegateStatus === '10' : false
+          const taskExtensionAttributes = todoData.taskExtensionAttributes ? JSON.parse(todoData.taskExtensionAttributes) : ''
+          if (taskExtensionAttributes && taskExtensionAttributes.rejectAttributes) {
+            const rejectAttributes = taskExtensionAttributes.rejectAttributes
+            if (rejectAttributes && rejectAttributes.type && rejectAttributes.type != 'inSequence') self.rejectedTask = true
+          }
           self.appointTask = todoData.delegateStatus ? todoData.delegateStatus === '20' : false
           if (self.revokeDelegateTask) self.disable = true
           let procType = todoData.procType
@@ -1296,6 +1319,7 @@ export default {
         self.getNodesBehind()
       } else if (self.auditResult === '90') {
         //驳回到前序指定节点
+        self.getProcessAttributes()
         self.getAllPreNodes()
       } else if (self.auditResult === '40') {
         //驳回到上一级
@@ -1354,39 +1378,15 @@ export default {
               self.executionCompleted(true, null, null, auditResult, self.curTaskId)
             }, 1000)
           } else {
-            self.loading = true
-            self.disable = true
-            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
-                self.$Message.success(result.message)
-                setTimeout(() => {
-                  if (result.data) {
-                    let taskIds = result.data.map(item => item.id).join(',')
-                    self.executionCompleted(true, result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
-                  } else {
-                    self.executionCompleted(true, null, null, auditResult, self.curTaskId)
-                  }
-                }, 1000)
-              } else {
-                self.loading = false
-                self.disable = false
-                self.$Message.error(result.message)
-                setTimeout(() => {
-                  self.executionCompleted(false, null, null, auditResult, self.curTaskId)
-                }, 1000)
-              }
-              bus.$emit('triggerTimer')
-            })
+            self.getProcessAttributes()
           }
         })
       } else {
-        if (self.auditResult === '30' && (!self.handleButtons || self.handleButtons.includes('appointHandler') || self.handleButtons.includes('appointTimeoutTime'))) {
+        if (self.auditResult === '30' && !self.rejectedTask && (!self.handleButtons || self.handleButtons.includes('appointHandler') || self.handleButtons.includes('appointTimeoutTime'))) {
           self.getNextNodes()
           self.appointBoxShow = true
+        } else if (self.auditResult === '70'){
+          self.getProcessAttributes()
         } else {
           self.doPass()
         }
@@ -1451,6 +1451,12 @@ export default {
         })
       }
     },
+    doJump(){
+      if (this.auditResult === '90'){
+        this.auditParams.rejectAttribute = this.rejectAttribute ? this.rejectAttribute :'inSequence'
+      }
+      this.doPass()
+    },
     showUpdateMultitaskInstanceModal(updateType) {
       const self = this
       if (updateType === '81') {
@@ -1540,6 +1546,10 @@ export default {
       const assingees = this.reductionAssigneeList.map(item => item.auditId).join(',')
       this.updateMultitaskInstance('83', assingees)
     },
+    rejectProcessWithRejectAttributes(){
+      this.auditParams.rejectAttribute = this.rejectAttribute ? this.rejectAttribute :'inSequence'
+      this.doPass()
+    },
 
     doSearch() {
       //不需要实现，是子组件assigneeBox要求使用父组件的这个方法
@@ -1627,11 +1637,18 @@ export default {
     cancel() {
       this.modal = false
       this.auditResult = ''
+      this.rejectAttribute = 'inSequence'
     },
     reductionModalCancel() {
       this.reductionMultitaskInstanceModal = false
       this.reductionAssigneeList = []
     },
+    rejectAttributesCancel() {
+      this.rejectAttributesBoxShow = false
+      this.rejectAttribute = 'inSequence'
+      this.loading = false
+      this.disable = false
+    },
     selectAssignee(selection) {
       this.reductionAssigneeList = selection
     },
@@ -1835,6 +1852,56 @@ export default {
         this.$forceUpdate()
       }
     },
+    getProcessAttributes(){
+      const self = this
+      let params = {
+        procId: self.procId,
+        taskNode: self.taskNode
+      }
+      self.rejectAttributeList = [{
+          _checked: true,
+          type: 'inSequence',
+          name: '按顺序流转'
+        }]
+
+      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getProcessAttributes', { params: params }).then(function (resp) {
+        if (resp.data.code === '200') {
+          if ((self.auditParams.auditResult == '70' && !resp.data.data.jumpFirstNode) || (self.auditParams.auditResult == '40' && resp.data.data.multiNode)){
+            self.doPass()
+            return
+          } else {
+            if (self.auditParams.auditResult == '40'){
+              self.rejectAttributeList.push(
+                {
+                  type: 'returnToCurrentAuditUser',
+                  name: '返回我'
+                }
+              )
+            } else {
+              self.rejectAttributeList.push(
+                {
+                  type: 'returnToCurrentNode',
+                  name: '返回本节点'
+                }
+              )
+              if (!resp.data.data.multiNode){
+                self.rejectAttributeList.push(
+                  {
+                    type: 'returnToCurrentAuditUser',
+                    name: '返回我'
+                  }
+                )
+              }
+            }
+            if (self.auditParams.auditResult != '90') self.rejectAttributesBoxShow = true
+          }
+        } else {
+          self.$Message.error(resp.data.message)
+        }
+      }).catch((err) => {
+        console.log(err)
+      })
+    }
   },
   watch: {
     auditOpinionText(label) {

package/src/workflow-diagram.vue

@@ -30,7 +30,7 @@
 
     <Modal v-model="showDetail" :width="modelWidth" :footer-hide='true' :title="detailDones[0] && detailDones[0].handleName ? detailDones[0].handleName + '详情' : '审批详情'">
       <Card v-for="(item,index) in detailDones" :key="index" style="margin-bottom: 10px">
-        <Form :model="item" :label-width="140">
+        <Form :model="item" :label-width="120">
           <Row>
             <i-col span="12" offset="0">
               <FormItem :label="item.handleName ? item.handleName + '节点：' : '审批节点：'">
@@ -54,11 +54,11 @@
             <i-col span="12" offset="0">
               <FormItem :label="item.handleName ? item.handleName + '结果：' : '审批结果：'">
                 <Tag color="green" v-if="item.auditResult == '00'">流程发起</Tag>
-                <Tag color="green" v-if="item.auditResult == '10'">自动跳过</Tag>
-                <Tag color="green" v-if="item.auditResult == '11'">与上一环节办理人相同自动跳过</Tag>
-                <Tag color="green" v-if="item.auditResult == '12'">与发起人相同自动跳过</Tag>
-                <Tag color="green" v-if="item.auditResult == '13'">办理人为空自动跳过</Tag>
-                <Tag color="green" v-if="item.auditResult == '14'">符合流程变量条件自动跳过</Tag>
+                <Tag color="green" v-else-if="item.auditResult == '10'">自动跳过</Tag>
+                <Tag color="green" v-else-if="item.auditResult == '11'">与上一环节办理人相同自动跳过</Tag>
+                <Tag color="green" v-else-if="item.auditResult == '12'">与发起人相同自动跳过</Tag>
+                <Tag color="green" v-else-if="item.auditResult == '13'">办理人为空自动跳过</Tag>
+                <Tag color="green" v-else-if="item.auditResult == '14'">符合流程变量条件自动跳过</Tag>
                 <Tag color="green" v-else-if="item.auditResult == '30'">通过</Tag>
                 <Tag color="volcano" v-else-if="item.auditResult == '40'">驳回上一节点</Tag>
                 <Tag color="red" v-else-if="item.auditResult=='50'">驳回到原点</Tag>