@lambo-design/workflow-approve 1.0.0-beta.46 → 1.0.0-beta.48

package/src/portrait.vue

@@ -202,7 +202,7 @@
       </Table>
     </Modal>
     <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted"
-                 @update-selected="handleSelectedUser" @update-next-node-assignee="updateNextNodeAssignee"
+                 @update-selected="handleSelectedUser" @update-next-node-assignee="updateNextNodeAssignee" @add-multitask-instance="addMultitaskInstance"
                  :data="assigneeBoxData" :smart-flow-server-context="smartFlowServerContext"
                  :upms-server-context="upmsServerContext"/>
     <Modal v-model="modalBoxShow" width="1000" title="流程跟踪图">
@@ -212,6 +212,15 @@
                         :smart-flow-server-context="smartFlowServerContext">
       </Workflow_Diagram>
     </Modal>
+    <Modal v-model="reductionMultitaskInstanceModal" title="会签减签"
+           @on-cancel="reductionModalCancel"
+           @on-ok="reductionMultitaskInstance">
+      <Table border
+             :data="unapprovedAssigneeList"
+             :columns="reductionColumn"
+             @on-selection-change="selectAssignee">
+      </Table>
+    </Modal>
     <Modal v-model="appointBoxShow" title="下一环节设置"
            @on-cancel="appointBoxShow = false" width="600"
            @on-ok="appointOk">
@@ -313,6 +322,12 @@
         <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo82') && !isDetail"
                 :disabled="disable" :loading="loading" @click="audit('82')">指定他人处理
         </Button>
+        <Button style="margin-left: 10px;" v-if="isParallelCountersignature && handleButtons && handleButtons.includes('addMultitaskInstance') && !isDetail"
+                :disabled="disable" :loading="loading" @click="showUpdateMultitaskInstanceModal('81')">加签
+        </Button>
+        <Button style="margin-left: 10px;" v-if="isParallelCountersignature && handleButtons && handleButtons.includes('reductionMultitaskInstance') && !isDetail"
+                :disabled="disable" :loading="loading" @click="showUpdateMultitaskInstanceModal('83')">减签
+        </Button>
         <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo50') && !isDetail"
                 :disabled="disable" :loading="loading" @click="audit('50')">直接结束流程
         </Button>
@@ -463,9 +478,12 @@ export default {
       auditParams: {},
       modal1: false,
       modalBoxShow: false,
+      reductionMultitaskInstanceModal: false,
       candidateGroupsHelpBoxShow: false,
       appointBoxShow: false,
       autoOpenNode: '0',
+      unapprovedAssigneeList: [],
+      reductionAssigneeList: [],
       nextNodesOldSettings: [],
       nextNodesFormList: [],
       hisNode: [],
@@ -485,6 +503,7 @@ export default {
       disable: false,
       instanceId: '',
       curTaskId: '',
+      isParallelCountersignature: false,
       handleButtons: [],
       handleName: '',
       auditOpinionTitle: '',
@@ -660,6 +679,13 @@ export default {
       })
       return column
     },
+    reductionColumn: function () {
+      let column = []
+      column.push({title: '#', key: 'selectId', type: 'selection', align: 'center', width: 55})
+      column.push({title: '账号', key: 'auditId', align: 'center'})
+      column.push({title: '姓名', key: 'auditName', align: 'center'})
+      return column
+    },
     diagramTableColumns: function () {
       let column = []
       column.push({title: '序号', type: 'index', width: 60});
@@ -674,6 +700,10 @@ export default {
             label = '流程发起';
             tagColor = 'green'; // 绿色
           }
+          else if (row.auditResult == '10'){
+            label = '自动跳过';
+            tagColor = 'green'; // 绿色
+          }
           else if (row.auditResult == '30'){
             label = '通过';
             tagColor = 'green'; // 绿色
@@ -698,6 +728,10 @@ export default {
             label = '跳转到指定节点';
             tagColor = 'cyan'; // 青色
           }
+          else if (row.auditResult == '83'){
+            label = '会签减签';
+            tagColor = 'red'; // 青色
+          }
           else if (row.auditResult == '90'){
             label = '驳回到指定节点';
             tagColor = 'magenta'; // 品红色
@@ -898,6 +932,9 @@ export default {
       ajax.post(self.smartFlowServerContext + '/manage/approvalCenter/getNodeData', param).then(function (resp) {
         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.handleName = resp.data.data[0].handleName ? resp.data.data[0].handleName : '审批'
           self.auditOpinionTitle = resp.data.data[0].handleName ? resp.data.data[0].handleName + '意见' : '审批意见'
           if (!self.handleButtons || (!self.handleButtons.includes('auditOpinion') && !self.handleButtons.includes('attachmentFile') && !self.handleButtons.includes('auditHistory'))){
@@ -1255,6 +1292,62 @@ export default {
         })
       }
     },
+    showUpdateMultitaskInstanceModal(updateType){
+      const self = this
+      if (updateType === '81'){
+        this.$refs.assigneeHelpBox.toggleShowHelpBox(this.organTreeType, '', 'addMultitaskInstance')
+      } else if (updateType === '83') {
+        ajax.get(self.smartFlowServerContext + '/manage/processTodo/getUnapprovedListOfMultiNode?taskId=' + self.curTaskId).then(function (resp) {
+          if (resp.data.code === '200') {
+            self.unapprovedAssigneeList = resp.data.data
+            self.reductionMultitaskInstanceModal = true
+          } else {
+            self.$Message.error(resp.data.message)
+          }
+        }).catch(err => {
+          console.log(err);
+        })
+      }
+    },
+    updateMultitaskInstance(updateType, assignees){
+      const self = this
+      self.loading = true
+      self.disable = true
+      let param = {
+        taskId: self.curTaskId,
+        applyId: self.applyId,
+        assignees: assignees,
+        updateType: updateType
+      }
+      ajax.post(self.smartFlowServerContext + '/manage/processTodo/updateMultitaskInstance', param).then(resp => {
+        let result = resp.data
+        if (result.code == '200') {
+          self.loading = false
+          self.disable = false
+          self.$Message.success(result.message);
+        } else {
+          self.loading = false
+          self.disable = false
+          self.$Message.error(result.message)
+        }
+      }).catch(err => {
+        console.log(err);
+      })
+    },
+    //加签
+    addMultitaskInstance(assingeeList){
+      const assingees = assingeeList.join(',')
+      this.updateMultitaskInstance('81', assingees)
+    },
+    //减签
+    reductionMultitaskInstance(){
+      if (this.reductionAssigneeList.length === 0){
+        this.$Message.error('请选择减签人员')
+        return
+      }
+      const assingees = this.reductionAssigneeList.map(item => item.auditId).join(',')
+      this.updateMultitaskInstance('83', assingees)
+    },
 
     doSearch() {
       //不需要实现，是子组件assigneeBox要求使用父组件的这个方法
@@ -1343,6 +1436,13 @@ export default {
       this.modal = false
       this.auditResult = '';
     },
+    reductionModalCancel() {
+      this.reductionMultitaskInstanceModal = false
+      this.reductionAssigneeList = []
+    },
+    selectAssignee(selection) {
+      this.reductionAssigneeList = selection
+    },
     selectNode(currentRow, oldCurrentRow) {
       let self = this
       self.targetTaskNode = currentRow.taskNode