@lambo-design-mobile/workflow-approve 1.0.0-beta.22 → 1.0.0-beta.24

package/src/FlowApproval.vue

@@ -31,7 +31,7 @@
                 <div v-if="approvalForm.nextNode!==''">
                   <van-cell title="下一环节" :value="approvalForm.nextNode"/>
                   <div v-if="handleButtons && handleButtons.includes('appointHandler')">
-                    <van-cell @click="nextNodePopupShow = true" title="办理人员" value-class="approvalForm-value"
+                    <van-cell @click="handleNextNodePopupShow" title="办理人员" value-class="approvalForm-value"
                               :value="approvalForm.handlingPersonnel">
                       <template #right-icon>
                         <van-icon name="friends-o" size="16" style="line-height: inherit;padding-left: 5px"/>
@@ -115,33 +115,16 @@
     <!-- 底部按钮 等其他内容 -->
     <div>
       <van-popup v-model="popupShow" style="padding-top: 40px" closeable round position="bottom">
-        <div v-if="handleButtons && handleButtons.includes('auditTo70')" class="popup-option" @click="audit('70')">
-          {{ getAuditButtonStatus(70) }}
-        </div>
-        <div v-if="handleButtons && handleButtons.includes('auditTo40')" class="popup-option highlighted"
-             @click="audit('40')">
-          {{ getAuditButtonStatus(40) }}
-        </div>
-        <div v-if="handleButtons && handleButtons.includes('auditTo90')" class="popup-option" @click="audit('90')">
-          {{ getAuditButtonStatus(90) }}
-        </div>
-        <div v-if="handleButtons && handleButtons.includes('auditTo80')" class="popup-option" @click="audit('80')">
-          {{ getAuditButtonStatus(80) }}
-        </div>
-        <div v-if="handleButtons && handleButtons.includes('auditTo82')" class="popup-option" @click="audit('82')">
-          {{ getAuditButtonStatus(82) }}
-        </div>
-        <div v-if="handleButtons && handleButtons.includes('auditTo50')" class="popup-option" @click="audit('50')">
-          {{ getAuditButtonStatus(50) }}
-        </div>
+        <template v-for="(button, index) of operationButtons.moreOperations">
+          <div :class="button.class" @click="button.action">
+            {{ button.label }}
+          </div>
+        </template>
       </van-popup>
       <div class="custom-bottom-bar">
-        <div v-if="!isDetail && getVisibleButtonsCount() > 1" class="bar-item" @click="onMore">更多</div>
-        <div v-else-if="!isDetail && getVisibleButtonsCount() === 1" class="bar-item" @click="handleSingleButton()">
-          {{ getSingleButtonText() }}
+        <div v-for="(button, index) of operationButtons.bottomButtons" :class="button.class" @click="button.action">
+          {{ button.label }}
         </div>
-        <div class="bar-item" @click="onTrack">流程跟踪</div>
-        <div v-if="!isDetail" class="bar-item approve" @click="audit('30')">{{ getAuditButtonStatus(30) }}</div>
       </div>
     </div>
     <van-popup @click-close-icon="handleSelect('cancel')" v-model="nextNodePopupShow"
@@ -156,29 +139,32 @@
         <van-field name="radio" label="人员类型" input-align="right">
           <template #input>
             <van-radio-group v-model="item.personType" direction="horizontal">
-              <van-radio name="assignee">办理人</van-radio>
-              <van-radio name="candidate">候选人</van-radio>
+              <van-radio v-if="!nextAssigneeSelectionType || nextAssigneeSelectionType === 'assignee'" name="assignee">办理人</van-radio>
+              <van-radio v-if="!nextAssigneeSelectionType || nextAssigneeSelectionType === 'candidate'" name="candidate">候选人</van-radio>
             </van-radio-group>
           </template>
         </van-field>
         <van-cell v-if="item.personType === 'assignee'" title="办理人"
                   :value="(item.assignee.name ? item.assignee.name : '未指定') + ':' + (item.assignee.id ? item.assignee.id : '未指定')"
-                  @click="nextNodeHandleIndex=index;selectHandlePopupShow=true;">
+                  @click="handleNextNodeAssigneeSelect(index, 'appointHandler')">
         </van-cell>
         <van-cell v-if="item.personType === 'candidate'" title="候选人" @click="toggleDetails(index)"
                   :is-link="true" :arrow-direction="detailsVisible[index] ? 'down' : ''">
         </van-cell>
         <div v-if="detailsVisible[index] && item.personType === 'candidate'">
-          <van-field @click="handleSelectUserPopupShow(index)" label="候选用户" readonly placeholder="点击选择"
+          <van-field v-if="useTransferUser" @click="handleNextNodeUserSelect(index, 'appointHandlerWithCandGroups')" label="候选用户" readonly placeholder="点击选择"
+                     :value="(item.candidateGroups?.users ?? []).map(user => user.name).join(',')">
+          </van-field>
+          <van-field v-if="!useTransferUser && !useTransferOrgan" @click="handleCandUserSelect(index)" label="候选用户" readonly placeholder="点击选择"
                      :value="(item.candidateGroups?.users ?? []).map(user => user.name).join(',')">
           </van-field>
-          <van-field @click="handleSelectPositionPopupShow(index)" label="候选岗位" readonly placeholder="点击选择"
+          <van-field v-if="!useTransferUser && !useTransferOrgan" @click="handleSelectPositionPopupShow(index)" label="候选岗位" readonly placeholder="点击选择"
                      :value="(item.candidateGroups?.positions ?? []).map(position => position.name).join(',')">
           </van-field>
-          <van-field @click="handleSelectRolePopupShow(index)" label="候选角色" readonly placeholder="点击选择"
+          <van-field v-if="!useTransferUser && !useTransferOrgan" @click="handleSelectRolePopupShow(index)" label="候选角色" readonly placeholder="点击选择"
                      :value="(item.candidateGroups?.roles ?? []).map(role => role.name).join(',')">
           </van-field>
-          <van-field @click="handleSelectOrganizePopupShow(index)" label="候选组织" readonly placeholder="点击选择"
+          <van-field v-if="!useTransferUser" @click="handleSelectOrganizePopupShow(index)" label="候选组织" readonly placeholder="点击选择"
                      :value="(item.candidateGroups?.organs ?? []).map(organ => organ.name).join(',')">
           </van-field>
         </div>
@@ -236,17 +222,19 @@
         <div class="bar-item approve" @click="handleSelect('select')">确认</div>
       </div>
     </van-popup>
-    <van-popup v-if="selectHandlePopupShow" v-model="selectHandlePopupShow" closeable round position="bottom"
-               :style="{ height: '80%' }" style="background: #f7f8fa">
-      <select-handle title="指定办理人" :multi-select="false" :procType="procType" @selectHandle="handleSelectResult"></select-handle>
+    <van-popup v-if="selectUserPopupShow" v-model="selectUserPopupShow" closeable round position="bottom"
+               :style="{ height: '80%' }" :class="selectUserPopupParams.class">
+      <select-handle :title="selectUserPopupParams.title" :multi-select="selectUserPopupParams.multiSelect" :procType="procType" :organ-tree-type="selectUserPopupParams.organTreeType"
+                     :org-list="selectUserPopupParams.orgList" :user-list="selectUserPopupParams.userList" @selectHandle="selectUserPopupParams.action"></select-handle>
     </van-popup>
     <van-popup v-if="selectOrganizePopupShow" v-model="selectOrganizePopupShow" closeable round position="bottom"
                :style="{ height: '80%' }">
-      <select-organize ref="selectOrganize" :all-organize="false" :organize-id-list="permissionsScope.O"  @selectOrganizeHandle="selectOrganizeHandle" ></select-organize>
+      <select-organize ref="selectOrganize" :treetype-id="orgTreeType" :all-organize="false" :organize-id-list="permissionsScope.O"  @selectOrganizeHandle="selectOrganizeHandle" ></select-organize>
     </van-popup>
-    <van-popup v-if="selectUserPopupShow" v-model="selectUserPopupShow" closeable round position="bottom"
+    <van-popup v-if="selectCandUserPopupShow" v-model="selectCandUserPopupShow" closeable round position="bottom"
                :style="{ height: '80%' }">
-      <select-handle title="选择用户" :multi-select="true" :procType="procType" @selectHandle="selectUserHandle" ></select-handle>
+      <select-handle title="选择用户" :multi-select="true" :procType="procType" :organ-tree-type="selectUserPopupParams.organTreeType" :org-list="selectUserPopupParams.orgList"
+                     :user-list="selectUserPopupParams.userList" @selectHandle="selectCandUserHandle"></select-handle>
     </van-popup>
     <van-popup v-if="selectPositionPopupShow" v-model="selectPositionPopupShow" closeable round position="bottom"
                :style="{ height: '80%' }">
@@ -256,7 +244,23 @@
                :style="{ height: '80%' }">
       <select-normal-list title="选择角色" :id-list="permissionsScope.R" @selectNormalListHandle="selectRoleHandle" :parse-function="parseRoleFunction"></select-normal-list>
     </van-popup>
-    <van-dialog v-model="nodeListDialogShow" @confirm="processJumpSpecifiedNode()" @close="nodeListDialogShowClose()"
+    <van-popup v-if="selectReductionUserPopupShow" v-model="selectReductionUserPopupShow" closeable round position="bottom" :style="{ height: '80%' }">
+      <div id="reductionListContent" style="background: #f7f8fa">
+        <div class="van-nav-bar__content">
+          <div class="van-nav-bar__title">{{ getAuditButtonStatus(83) }}</div>
+        </div>
+        <van-list style="padding-top: 15px">
+          <select-handle-card ref="selectHandleCard" :multi-select="true" :person-list="unapprovedAssigneeList"
+                              :result.sync="reductionUsers" :show-status="false">
+          </select-handle-card>
+        </van-list>
+      </div>
+      <div v-if="reductionUsers.length > 0" class="custom-bottom-bar">
+        <div class="bar-item" @click="handleReductionUserSelect('cancel')">取消</div>
+        <div class="bar-item approve" @click="handleReductionUserSelect('select')">选择</div>
+      </div>
+    </van-popup>
+    <van-dialog v-model="nodeListDialogShow" @confirm="processJumpSpecifiedNode()" @close="nodeListDialogShowClose()" :before-close="onBeforeClose"
                 :title="getAuditButtonStatus(auditResult)" show-cancel-button>
       <van-radio-group v-model="radio">
         <van-cell-group>
@@ -267,7 +271,7 @@
           </div>
           <div class="table-row"
                v-for="(item, index) in nodeList" :key="index"
-               @click="radio = index">
+               @click="selectNode(item, index)">
             <div>{{ item.taskName }}</div>
             <div>
               <van-tag v-if="item.auditResult" :type="getAuditStatus(item.auditResult).type">
@@ -281,9 +285,34 @@
               <van-radio :name='index'/>
             </div>
           </div>
+          <div v-if="showRejectToSelected" class="table-row">
+            <van-field @click="handleSelectRejectUser" label="选择驳回人员" readonly placeholder="点击选择" :value="rejectUsers.name"></van-field>
+          </div>
+          <div v-if="showProcessControl" class="reject-attribute">
+            <div>驳回的节点通过后：</div>
+            <van-radio-group v-model="rejectAttribute">
+              <van-radio v-for="(item, index) in rejectAttributeList" :key="index" :name="item.type">{{ item.name }}</van-radio>
+            </van-radio-group>
+          </div>
         </van-cell-group>
       </van-radio-group>
     </van-dialog>
+    <van-dialog v-model="rejectAttributesBoxShow" @confirm="processRejectNode()" @close="rejectAttributesDialogShowClose()"
+                title="驳回设置" show-cancel-button>
+      <div v-if="showProcessControl" class="reject-attribute">
+        <div>驳回的节点通过后：</div>
+        <van-radio-group v-model="rejectAttribute">
+          <van-radio v-for="(item, index) in rejectAttributeList" :key="index" :name="item.type">{{ item.name }}</van-radio>
+        </van-radio-group>
+      </div>
+      <div v-if="showRejectToSelected" class="reject-attribute">
+        <van-field @click="handleSelectRejectUser" label="选择驳回人员" readonly placeholder="点击选择" :value="rejectUsers.name"></van-field>
+      </div>
+    </van-dialog>
+    <van-popup v-if="selectRejectUserPopupShow" v-model="selectRejectUserPopupShow" closeable round position="bottom"
+               :style="{ height: '80%' }">
+      <select-handle title="选择驳回人员" :multi-select="true" :procType="procType" :user-list="rejectUserList" @selectHandle="selectRejectUserHandle"></select-handle>
+    </van-popup>
   </div>
 </template>
 
@@ -297,9 +326,16 @@ import {
   getNodesBehind,
   getPosition,
   getPreNode,
-  getHandleButtons,
+  getNodeData,
   getProcessHis,
-  getProcessType, getRole
+  getProcessType, getRole,
+  getTransferRange,
+  updateMultitaskInstance,
+  getUnapprovedListOfMultiNode,
+  getProcessTodoList,
+  getProcessAttributes,
+  listAll,
+  getDoneDetail
 } from "../api";
 import {Dialog, Toast} from "vant";
 import UploadFile from '@lambo-design-mobile/upload-file';
@@ -310,6 +346,8 @@ import SelectOrganize from "./SelectOrganize.vue";
 import SelectNormalList from "./SelectNormalList.vue";
 import ApprovalNodeCell from "./ApprovalNodeCell.vue";
 import {getAuditStatus} from "./js/global";
+import {NodeType} from "./utils/const";
+import SelectHandleCard from "./SelectHandleCard.vue";
 
 
 export default {
@@ -319,9 +357,178 @@ export default {
     },
     showAuditOpinion(){
       return this.handleButtons && (this.handleButtons.includes('auditOpinion') ||  this.handleButtons.includes('appointHandler') ||  this.handleButtons.includes('attachmentFile'))
+    },
+    operationButtons() {
+      // 流程跟踪按钮
+      const processTraceButton = {
+        id: 'processTrace',
+        label: '流程跟踪',
+        condition: this.handleButtons?.includes('processTrace'),
+        class: 'bar-item',
+        action: () => this.onTrack(),
+      }
+
+      // 审批按钮
+      const auditButtonDefinitions = [
+        {
+          id: 'auditTo30',
+          label: this.getAuditButtonStatus(30),
+          condition: this.handleButtons?.includes('auditTo30') && !this.isDetail && !this.revokeDelegateTask && !this.appointTask && !this.coSignVotingTask,
+          class: 'bar-item approve',
+          action: () => this.audit('30'),
+        },
+        {
+          id: 'auditTo62',
+          label: this.getAuditButtonStatus(62),
+          condition: !this.isDetail && this.revokeDelegateTask,
+          class: 'bar-item approve',
+          action: () => this.audit('62'),
+        },
+        {
+          id: 'auditTo61',
+          label: this.getAuditButtonStatus(61),
+          condition: !this.isDetail && this.appointTask,
+          class: 'bar-item approve',
+          action: () => this.audit('61'),
+        },
+        {
+          id: 'auditTo32',
+          label: this.getAuditButtonStatus(32),
+          condition: this.coSignVotingTask,
+          class: 'bar-item disagree',
+          action: () => this.audit('32'),
+        },
+        {
+          id: 'auditTo31',
+          label: this.getAuditButtonStatus(31),
+          condition: this.coSignVotingTask,
+          class: 'bar-item approve',
+          action: () => this.audit('31'),
+        },
+      ]
+
+      // 实际可以展示的审批按钮
+      const validAuditButtons = auditButtonDefinitions.filter(item => item.condition)
+      const showButtons = !this.appointTask && !this.rejectedTask && !this.revokeDelegateTask && !this.coSignVotingTask && !this.isDetail
+      const handleButtonsDefinitions = [
+        {
+          id: 'delegateTask',
+          label: this.getAuditButtonStatus(84),
+          condition: this.curNodeType === NodeType.UserTask &&
+              this.handleButtons?.includes('delegateTask') &&
+              showButtons,
+          class: 'popup-option',
+          barClass: 'bar-item approve',
+          action: () => this.audit('84'),
+        },
+        {
+          id: 'addMultitaskInstance',
+          label: this.getAuditButtonStatus(81),
+          condition: this.curNodeType === NodeType.MultiNode &&
+              this.handleButtons?.includes('addMultitaskInstance') &&
+              showButtons,
+          class: 'popup-option',
+          barClass: 'bar-item approve',
+          action: () => this.showUpdateMultitaskInstanceModal('81'),
+        },
+        {
+          id: 'reductionMultitaskInstance',
+          label: this.getAuditButtonStatus(83),
+          condition: this.curNodeType === NodeType.MultiNode &&
+              this.handleButtons?.includes('reductionMultitaskInstance') &&
+              showButtons,
+          class: 'popup-option',
+          barClass: 'bar-item disagree',
+          action: () => this.showUpdateMultitaskInstanceModal('83'),
+        },
+        {
+          id: 'auditTo70',
+          label: this.getAuditButtonStatus(70),
+          condition: this.handleButtons && this.handleButtons.includes('auditTo70') && showButtons,
+          class: 'popup-option',
+          barClass: 'bar-item disagree',
+          action: () => this.audit('70'),
+        },
+        {
+          id: 'auditTo40',
+          label: this.getAuditButtonStatus(40),
+          condition: this.handleButtons && this.handleButtons.includes('auditTo40') && showButtons,
+          class: 'popup-option highlighted',
+          barClass: 'bar-item disagree',
+          action: () => this.audit('40'),
+        },
+        {
+          id: 'auditTo90',
+          label: this.getAuditButtonStatus(90),
+          condition: this.handleButtons && this.handleButtons.includes('auditTo90') && showButtons,
+          class: 'popup-option',
+          barClass: 'bar-item disagree',
+          action: () => this.audit('90'),
+        },
+        {
+          id: 'auditTo80',
+          label: this.getAuditButtonStatus(80),
+          condition: this.handleButtons && this.handleButtons.includes('auditTo80') && showButtons,
+          class: 'popup-option',
+          barClass: 'bar-item approve',
+          action: () => this.audit('80'),
+        },
+        {
+          id: 'auditTo82',
+          label: this.getAuditButtonStatus(82),
+          condition: this.handleButtons && this.handleButtons.includes('auditTo82') && showButtons,
+          class: 'popup-option',
+          barClass: 'bar-item approve',
+          action: () => this.audit('82'),
+        },
+        {
+          id: 'auditTo50',
+          label: this.getAuditButtonStatus(50),
+          condition: this.handleButtons && this.handleButtons.includes('auditTo50') && showButtons,
+          class: 'popup-option',
+          barClass: 'bar-item disagree',
+          action: () => this.audit('50'),
+        },
+      ]
+
+      // 实际更多操作按钮
+      let moreOperations = handleButtonsDefinitions.filter(item => item.condition)
+
+      let moreButtons = []
+      let borrowedButton = null;
+      // 如果审批按钮为空，且更多操作里有按钮，则借调最后一个
+      if (validAuditButtons.length === 0 && moreOperations.length > 0) {
+        borrowedButton = moreOperations.pop();
+        borrowedButton.class = borrowedButton.barClass
+      }
+      if (!this.isDetail) {
+        if (moreOperations.length > 1) {
+          moreButtons.push({
+            id: 'onMore',
+            label: '更多',
+            condition: true,
+            class: 'bar-item',
+            action: () => this.onMore(),
+          })
+        } else if (moreOperations.length === 1) {
+          moreButtons.push({
+            id: moreOperations[0].id,
+            label: moreOperations[0].label,
+            condition: true,
+            class: 'bar-item',
+            action: () => moreOperations[0].action(),
+          })
+        }
+      }
+      const baseList = [...moreButtons, processTraceButton]
+      if (borrowedButton) {
+        baseList.splice(2, 0, borrowedButton);
+      }
+      const bottomButtons = [...baseList, ...validAuditButtons]
+      return { bottomButtons, moreOperations }
     }
   },
-  components: {ApprovalNodeCell, SelectNormalList, SelectOrganize, Tree, SelectHandle, UploadFile},
+  components: {ApprovalNodeCell, SelectNormalList, SelectOrganize, Tree, SelectHandle, UploadFile, SelectHandleCard},
   props: {
     //业务表单保存方法
     businessFormSave: {
@@ -341,6 +548,18 @@ export default {
       required: false,
       default: false
     },
+    //审批人来源
+    auditGroup: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    //默认审批意见
+    defaultAuditOpinion: {
+      type: String,
+      required: false,
+      default: '',
+    },
     processTraceRouterName: {
       type: String,
       required: true,
@@ -372,12 +591,13 @@ export default {
       handleButtons: this.$route.query.handleButtons,
 
       approvalForm: {
-        auditOpinion: '',
+        auditOpinion: this.defaultAuditOpinion,
         nextNode: '',
         handlingPersonnel: '',
         nodeConfigMaps: '',
       },
       approvalError: false,
+      orgTreeType: '00',
 
       processHistory: [],
       tableData: [],
@@ -386,7 +606,15 @@ export default {
 
       activeNames: [],
       popupShow: false,
+      appointTask: false,
+      revokeDelegateTask: false,
+      rejectedTask: false,
+      coSignVotingTask: false,
+      curNodeType: NodeType.UserTask,
 
+      nextAssigneeSelectionType: '',
+      useTransferUser: false,
+      useTransferOrgan: false,
       nextNodePopupShow: false,
       nextNodeHandleIndex: 0,
       nextNodeProcessedData: [], // 用于存储处理下一节点的数据
@@ -411,6 +639,8 @@ export default {
       ],
       handleTypeValue: '',
       showPicker: {},
+      rejectName: '驳回',
+      passName: '通过',
 
       nodeListDialogShow: false,
       nodeList: [],
@@ -423,12 +653,40 @@ export default {
       files: [],
       //文件上传列表
       fileList: [],
+      // 可以减签的人员
+      unapprovedAssigneeList: [],
+      // 减签人员
+      reductionUsers: [],
 
       permissionsScope: {},
       selectOrganizePopupShow: false,
+      selectCandUserPopupShow: false,
+      selectRejectUserPopupShow: false,
       selectUserPopupShow: false,
       selectRolePopupShow: false,
+      selectReductionUserPopupShow: false,
       selectPositionPopupShow: false,
+      selectUserPopupParams: {
+        title: '选择用户',
+        class: '',
+        multiSelect: true,
+        userList: [],
+        orgList: [],
+        organTreeType: '',
+        action: (checkResult) => { console.log('未定义回调方法') },
+      },
+      showRejectToSelected: false,
+      showProcessControl: false,
+      rejectAttributesBoxShow: false,
+      rejectAttribute: 'inSequence',
+      rejectAttributeList: [],
+      taskAuditUserList: [],
+      rejectUserList: [],
+      targetTaskNodeProcessControl: '',
+      rejectUsers: {
+        name: '全部办理人',
+        id: 'all'
+      },
     };
   },
   methods: {
@@ -437,6 +695,7 @@ export default {
       if (!this.handleButtons){
         this.getHandleButtons();
       }
+      if (!this.isDetail) this.getTaskStatus();
       this.getProcessHistory();
       this.getNextNodes();
       this.getAttachmentList();
@@ -473,10 +732,42 @@ export default {
       }
     },
 
+    getTaskStatus() {
+      const self = this
+      let params = {
+        procId: self.procId,
+        applyId: self.applyId,
+        taskNode: self.taskNode,
+        taskId: self.taskId,
+        auditGroup: self.auditGroup,
+      }
+      getProcessTodoList(0, 10, params).then(resp => {
+        if (resp.data.code === '200') {
+          const todoData = resp.data.data.rows[0]
+          // 委派任务状态
+          self.revokeDelegateTask = todoData?.delegateStatus ? todoData.delegateStatus === '10' : false
+          self.appointTask = todoData?.delegateStatus ? todoData.delegateStatus === '20' : 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
+          }
+        }
+      })
+    },
     getHandleButtons() {
-      getHandleButtons(this.procId, this.taskNode).then(resp => {
+      getNodeData(this.procId, this.taskNode).then(resp => {
         if (resp.data.code === '200') {
-          this.handleButtons = resp.data.data[0]?.handleButtons;
+          const data = resp.data.data[0]
+          this.handleButtons = data.handleButtons ? data.handleButtons : ["processTrace", "auditHistory", "auditOpinion", "attachmentFile", "auditTo30", "auditTo70", "auditTo40", "auditTo90", "auditTo80", "auditTo82", "auditTo50"];
+          this.coSignVotingTask = data.handleButtons && data.handleButtons.includes('coSignVoting')
+          this.nextAssigneeSelectionType = data.nextAssigneeSelectionType;
+          this.passName = data.handleName;
+          this.rejectName = data.rejectName;
+          if (data.hasOwnProperty('isSequential')) {
+            this.curNodeType = data.isSequential ? NodeType.SequentialMultiNode : NodeType.MultiNode;
+          }
         }
       })
     },
@@ -573,7 +864,7 @@ export default {
     },
     processData(data) {
       return data.map(node => {
-        node.personType = node.assignee ? "assignee" : "candidate";
+        node.personType = this.nextAssigneeSelectionType ? this.nextAssigneeSelectionType : node.assignee ? "assignee" : "candidate";
         if (node.assignee) {
           node.candidateGroups = {
             organs: [],
@@ -610,7 +901,10 @@ export default {
         return node;
       });
     },
-    toggleDetails(index) {
+    async toggleDetails(index) {
+      if (!this.detailsVisible[index]){
+        await this.fetchTransferRange('appointHandlerWithCandGroups')
+      }
       this.$set(this.detailsVisible, index, !this.detailsVisible[index]);
     },
     onHandleTypeConfirm(selectedLabel, selectedIndex, index) {
@@ -631,6 +925,13 @@ export default {
       // 拼接成目标格式
       return `O:${organIds},U:${userIds},P:${positionIds},R:${roleIds},RP:,T:`;
     },
+    handleReductionUserSelect(handle) {
+      if (handle === 'select') {
+        this.updateMultitaskInstance('83', this.reductionUsers.map(item => item.userId).join(','))
+      } else {
+        this.checkResult = [];
+      }
+    },
     handleSelect(handle) {
       if (handle === 'select') {
         //处理审批参数
@@ -666,11 +967,77 @@ export default {
     },
     handleSelectOrganizePopupShow(index) {
       this.nextNodeHandleIndex = index;
+      if (this.useTransferOrgan){
+        this.permissionsScope.O = this.selectUserPopupParams.orgList.map(item => item.orgCode)
+      }
       this.selectOrganizePopupShow=true;
     },
-    handleSelectUserPopupShow(index) {
+    handleCandUserSelect(index){
       this.nextNodeHandleIndex = index;
-      this.selectUserPopupShow=true;
+      this.selectUserPopupParams.userList = []
+      this.selectUserPopupParams.orgList = []
+      this.selectCandUserPopupShow = true
+    },
+    async handleNextNodePopupShow(){
+      // 指定下一环节选人为单/多选并且给出具体选人范围则直接弹出选人框
+      if (this.nextAssigneeSelectionType){
+        const actionType = this.nextAssigneeSelectionType === 'assignee' ? 'appointHandler' : 'appointHandlerWithCandGroups'
+        const action = this.nextAssigneeSelectionType === 'assignee' ? (checkResult) => this.handleAssigneeSelectResult(checkResult) : (checkResult) => this.selectCandUserHandle(checkResult)
+        await this.fetchTransferRange(actionType);
+        if (this.selectUserPopupParams.userList?.length > 0 || this.selectUserPopupParams.orgList?.length > 0){
+          this.handleSelectUserPopupShow('选择用户', this.nextAssigneeSelectionType === 'candidate', action, actionType)
+          return
+        }
+      }
+      this.nextNodePopupShow = true;
+    },
+    handleNextNodeAssigneeSelect(index, actionType){
+      this.nextNodeHandleIndex = index;
+      this.handleSelectUserPopupShow('选择用户', true, (checkResult) => this.handleAssigneeSelectResult(checkResult), actionType)
+    },
+    handleNextNodeUserSelect(index, actionType){
+      this.nextNodeHandleIndex = index;
+      this.handleSelectUserPopupShow('选择用户', true, (checkResult) => this.selectCandUserHandle(checkResult), actionType)
+    },
+    async handleSelectUserPopupShow(title, multiSelect, action, actionType) {
+      this.selectUserPopupParams.title = title
+      this.selectUserPopupParams.multiSelect = multiSelect
+      this.selectUserPopupParams.action = action
+      const success = await this.fetchTransferRange(actionType);
+      if (success) {
+        this.selectUserPopupShow = true;
+      }
+    },
+    async fetchTransferRange(actionType) {
+      try {
+        const params = {
+          procType: this.procType,
+          procId: this.procId,
+          taskNode: this.taskNode,
+          applyId: this.applyId,
+          taskId: this.taskId,
+          instanceId: this.instanceId,
+          actionType: actionType,
+        };
+        const res = await getTransferRange(params);
+        const result = res.data;
+        if (result.code == 200) {
+          this.selectUserPopupParams.organTreeType = result.data.organTreeType;
+          this.selectUserPopupParams.userList = result.data.userList;
+          this.selectUserPopupParams.orgList = result.data.orgList;
+          if (actionType === 'appointHandlerWithCandGroups'){
+            this.useTransferUser = result.data.userList?.length > 0
+            this.useTransferOrgan = result.data.orgList?.length > 0
+          }
+          return true;
+        } else {
+          console.warn('获取选择人员范围失败，返回码:', result.code);
+          return false;
+        }
+      } catch (err) {
+        console.error('获取选择人员范围异常', err);
+        return false;
+      }
     },
     handleSelectRolePopupShow(index) {
       this.nextNodeHandleIndex = index;
@@ -719,13 +1086,20 @@ export default {
 
     getAuditButtonStatus(auditResult) {
       let statusMap = {
-        '30': '通过',
-        '40': '驳回上一节点',
+        '30': `${this.passName}`,
+        '31': '同意',
+        '32': '不同意',
+        '40': `${this.rejectName}上一节点`,
         '50': '直接结束流程',
-        '70': '驳回到原点',
+        '61': '交回',
+        '62': '撤回委派',
+        '70': `${this.rejectName}到原点`,
         '80': '跳转指定节点',
+        '81': '加签',
         '82': '指定他人处理',
-        '90': '驳回指定节点',
+        '83': '减签',
+        '84': '委派',
+        '90': `${this.rejectName}指定节点`,
       };
       return statusMap[auditResult];
     },
@@ -743,20 +1117,55 @@ export default {
           procId: this.procId,
           instanceId: this.instanceId,
           taskNode: this.taskNode,
+          taskId: this.taskId,
+          predictButtonEnabled: this.handleButtons && this.handleButtons.includes('predictiveRoute'),
         }
       })
     },
+    // 加减签
+    showUpdateMultitaskInstanceModal(updateType){
+      this.selectHandlePopupShow = true
+      const self = this
+      if (updateType === '81') {
+        self.handleSelectUserPopupShow('加签', true, (checkResult) => this.updateMultitaskInstance('81', checkResult.map(item => item.userId).join(',')), 'addMultitaskInstance')
+      } else if (updateType === '83') {
+        getUnapprovedListOfMultiNode(self.taskId).then(res => {
+          if (res.data.code === '200') {
+            self.unapprovedAssigneeList = res.data.data.map(item => ({...item, userId: item.auditId, organName: item.auditUserOrgan ? item.auditUserOrgan.split(':')[1] : '未知部门'}))
+            self.selectReductionUserPopupShow = true
+          } else {
+            Toast.fail(resp.data.message)
+          }
+          this.selectUserPopupShow = false;
+        }).catch(err => {
+          console.log(err)
+          this.selectUserPopupShow = false;
+        })
+      }
+    },
+    updateMultitaskInstance(updateType, assignees) {
+      const self = this
+      updateMultitaskInstance(self.taskId, self.applyId, assignees, updateType).then(res => {
+        res.data.code == 200 ? Toast.success(res.data.message) :Toast.fail(res.data.message)
+        self.selectUserPopupShow = false;
+        self.selectReductionUserPopupShow = false
+      }).catch(err => {
+        console.log(err)
+        self.selectUserPopupShow = false;
+        self.selectReductionUserPopupShow = false
+      })
+    },
     audit(auditResult) {
       console.log('点击了审批:', auditResult);
 
       if (this.approvalForm.auditOpinion === '' || this.approvalForm.auditOpinion == null) {
-        if (!this.handleButtons || this.handleButtons.includes('auditOpinion')) {
+        if (!this.handleButtons || (this.handleButtons.includes('auditOpinion') && auditResult != '30' && auditResult != '31')) {
           this.updateActiveTab()
           this.approvalError = true
           Toast({message: '请输入审批意见', duration: '500'});
           return
         } else {
-          this.auditParams.auditOpinion = this.getAuditButtonStatus(this.auditResult);
+          this.approvalForm.auditOpinion = this.getAuditButtonStatus(auditResult);
         }
       }
 
@@ -785,21 +1194,35 @@ export default {
         //字段不清楚 暂不传递
         params: null,
       }
-      self.businessFormSave ? self.businessFormSave(self.handleSaveResult) : self.handleSaveResult(true)
+      let auditResult = {
+        code: self.auditResult,
+        name: self.getAuditButtonStatus(self.auditResult)
+      }
+      self.businessFormSave ? self.businessFormSave(self.handleSaveResult, auditResult) : self.handleSaveResult(true)
     },
-    handleSaveResult(saveResult) {
+    handleSaveResult(saveResult, businessParams) {
       if (saveResult) {
-        this.executeButtonAction();
+        this.executeButtonAction(businessParams);
       } else {
         console.error('保存失败');
       }
     },
 
-    executeButtonAction() {
+    executeButtonAction(businessParams) {
       const self = this;
+      if (businessParams) {
+        self.auditParams.params = JSON.stringify(businessParams)
+      }
+      let auditResult = {
+        code: self.auditResult,
+        name: self.getAuditButtonStatus(self.auditResult)
+      }
       if (self.auditResult === '82') {
         // 处理转办逻辑
-        this.selectHandlePopupShow = true;
+        this.handleSelectUserPopupShow('指定办理人', false, (checkResult) => this.handleSelectResult(checkResult), 'auditTo82')
+      } else if (self.auditResult === '84') {
+        // 处理委派逻辑
+        this.handleSelectUserPopupShow('委派', false, (checkResult) => this.handleDelegateTaskSelectResult(checkResult), 'delegateTaskTask')
       } else if (self.auditResult === '80') {
         // 处理调转到指定节点逻辑
         self.getNodesBehind()
@@ -813,6 +1236,7 @@ export default {
           // 处理驳回上一节点逻辑
           getPreNode(self.auditParams).then(function (resp) {
             let result = resp.data
+            // 上一节点为原点
             if (result.code === '30010') {
               Dialog.confirm({
                 title: "提示",
@@ -823,8 +1247,31 @@ export default {
                 self.auditRequest(self.auditParams)
               }).catch(() => {
               })
+            } else if (result.code == '30013' || result.code == '30014') {
+              //前序节点为子流程或当前节点为子流程第一个节点不可驳回上一级节点
+              const message = self.rejectName ? self.replaceName(result.message, '驳回', self.rejectName) : result.message
+              Toast.fail(message)
+              //避免未提示消息直接回调
+              setTimeout(() => {
+                self.executionCompleted(false, null, null, auditResult, self.taskId)
+              }, 1000)
+            } else if (result.code == '10012') {
+              // 数据同步
+              self.disable = false
+              Toast.fail(result.message)
+              setTimeout(() => {
+                self.executionCompleted(true, null, null, auditResult, self.taskId)
+              }, 1000)
             } else {
-              self.auditRequest(self.auditParams)
+              // 前序节点只有一个会签节点才可选择驳回人员
+              self.showRejectToSelected = result.data.length === 1 && result.data[0].handleButtons?.includes('rejectToSelected')
+              self.nodeList = result.data
+              self.radio = 0
+              if (self.showRejectToSelected && !self.handleButtons?.includes('rejectProcessControl')) {
+                self.rejectAttributesBoxShow = true
+              } else {
+                self.handleButtons && self.handleButtons.includes('rejectProcessControl') ? self.getProcessAttributes() : self.auditRequest(self.auditParams)
+              }
             }
           })
         }).catch(() => {
@@ -848,12 +1295,94 @@ export default {
         message: message,
       })
     },
+    getProcessAttributes(targetTaskNodeProcessControl){
+      const self = this
+      self.rejectAttributeList = []
+      if (!targetTaskNodeProcessControl || targetTaskNodeProcessControl != 'jump') {
+        self.rejectAttributeList.push({
+          _checked: true,
+          type: 'inSequence',
+          name: '按顺序流转'
+        })
+      }
+      getProcessAttributes(self.procId, self.taskNode).then(resp => {
+        if (resp.data.code === '200') {
+          if ((self.auditParams.auditResult == '70' && !resp.data.data.jumpFirstNode) || (self.auditParams.auditResult == '40' && (resp.data.data.multiNode || resp.data.data.preNodeGateway))) {
+            if (self.showRejectToSelected) {
+              self.rejectAttributesBoxShow = true
+              return
+            }
+            self.auditRequest(self.auditParams)
+            return
+          } else {
+            let param = {
+              procId: self.procId,
+              applyId: self.applyId,
+              taskNode: self.taskNode,
+              taskId: self.curTaskId,
+            }
+            listAll(self.procId, self.applyId, self.taskNode, self.taskId).then(todoResp => {
+              if (todoResp.data.code === '200') {
+                const rows = todoResp.data.data.rows
+                self.taskAuditUserList = rows.map(item => item.auditName)
+                const isMultiNode = resp.data.data.multiNode
+                if (isMultiNode) {
+                  const parentExecutionId = String(rows[0].parentExecutionId).trim();
+                  const nodeDone = self.processHistory.filter(item => item[0].taskNode === self.taskNode && String(item[0].parentExecutionId).trim() === parentExecutionId)
+                  if (nodeDone) {
+                    const doneAuditName = nodeDone[0].flatMap(item => item.auditName);
+                    self.taskAuditUserList = new Set([...doneAuditName, ...self.taskAuditUserList])
+                  }
+                }
+                if (self.auditParams.auditResult == '40' || self.taskAuditUserList.length === 1) {
+                  self.rejectAttributeList.push(
+                      {
+                        type: 'returnToCurrentAuditUser',
+                        name: '返回我'
+                      }
+                  )
+                } else {
+                  self.rejectAttributeList.push(
+                      {
+                        type: 'returnToCurrentNode',
+                        name: '返回本节点'
+                      }
+                  )
+                  if (!isMultiNode) {
+                    self.rejectAttributeList.push(
+                        {
+                          type: 'returnToCurrentAuditUser',
+                          name: '返回我'
+                        }
+                    )
+                  }
+                }
+                self.showProcessControl = self.rejectAttributeList.length > 0 && self.handleButtons && self.handleButtons.includes('rejectProcessControl')
+                if (self.auditParams.auditResult == '70' || self.auditParams.auditResult == '40') {
+                  self.rejectAttributesBoxShow = self.rejectAttributeList.length > 0 && self.handleButtons && self.handleButtons.includes('rejectProcessControl')
+                }
+              }
+            }).catch((err) => {
+              console.log(err)
+            })
+          }
+        } else {
+          self.$Message.error(resp.data.message)
+        }
+      }).catch(err => {
+        console.log(err);
+        Toast.fail('获取流程配置失败')
+      })
+    },
     auditRequest(auditParams) {
       let self = this
       let auditResult = {
         code: self.auditResult,
         name: self.getAuditStatus(self.auditResult).text
       }
+      if (self.rejectUsers.id !== 'all'){
+        auditParams.rejectUsers = self.rejectUsers.id
+      }
       self.showToastLoading('处理审批中');
       //确认执行审批逻辑
       audit(auditParams).then((resp) => {  // 使用箭头函数
@@ -879,6 +1408,7 @@ export default {
           this.executionCompleted(false, null, null, auditResult, self.taskId)
           Toast.fail(result.message);
         }
+        this.selectUserPopupShow = false;
       })
     },
     getNodesBehind() {
@@ -914,12 +1444,81 @@ export default {
       this.nodeListDialogShow = false
       this.auditResult = '';
       this.radio = '';
+      this.rejectAttribute = 'inSequence';
+      this.targetTaskNodeProcessControl = ''
+    },
+    onBeforeClose(action, done) {
+      const self = this;
+      if (action === 'confirm') {
+        if (!self.nodeList[self.radio]) {
+          Toast.fail('请选择驳回节点！');
+          done(false);
+          return;
+        }
+        done(true);
+      } else {
+        done(true);
+      }
+    },
+    selectNode(currentRow, index) {
+      this.radio = index
+      this.targetTaskNodeProcessControl = currentRow.processControl
+      this.rejectUsers = { name: '全部办理人', id: 'all' }
+      this.showRejectToSelected = currentRow.rejectToSelected
     },
     processJumpSpecifiedNode() {
       const self = this;
+      if (!self.nodeList[self.radio]) return;
       self.auditParams.targetTaskNode = self.nodeList[self.radio].taskNode;
+      self.auditParams.rejectAttribute = self.rejectAttribute ? self.rejectAttribute : 'inSequence'
+      self.auditRequest(self.auditParams)
+    },
+    processRejectNode() {
+      const self = this;
+      self.auditParams.rejectAttribute = self.rejectAttribute ? self.rejectAttribute : 'inSequence'
       self.auditRequest(self.auditParams)
     },
+    handleSelectRejectUser() {
+      let self = this
+      getDoneDetail(self.nodeList[self.radio].taskNode, self.applyId).then(function (resp) {
+        if (resp.data.code === '200') {
+          const data = resp.data.data.rows
+          const latestAudit = data.reduce((max, current) => {
+            return current.auditDate > max.auditDate ? current : max;
+          });
+          const seenNames = new Set();
+          self.rejectUserList = data.filter(item => {
+            if (item.parentExecutionId && latestAudit.parentExecutionId && item.parentExecutionId !== latestAudit.parentExecutionId) {
+              return false;
+            }
+            if (seenNames.has(item.auditName)) {
+              return false;
+            }
+            seenNames.add(item.auditName);
+            return true;
+          }).map(item => {
+            return {
+              ...item,
+              userName: item.auditName,
+              userId: item.auditId,
+              organName: item.auditUserOrgan?.split(':')[1]
+            }
+          });
+          self.selectRejectUserPopupShow = true
+        } else {
+          Toast.fail(resp.data.message)
+        }
+      })
+    },
+    rejectAttributesDialogShowClose(){
+      //重置
+      this.showRejectToSelected = false
+      this.showProcessControl = false
+      this.rejectAttributesBoxShow = false
+      this.auditResult = '';
+      this.radio = '';
+      this.rejectAttribute = 'inSequence';
+    },
 
     showAuditDetail(auditComment) {
       Dialog.alert({
@@ -951,6 +1550,21 @@ export default {
         }
       });
     },
+    handleDelegateTaskSelectResult(checkResult) {
+      console.log('Selected result:', checkResult);
+      if (!checkResult) {
+        Toast('请选择委派人员')
+        return
+      }
+      this.auditParams.selectedUserId = checkResult[0].userId
+      Dialog.confirm({
+        message: '确定执行：' + this.getAuditButtonStatus(this.auditResult) + ' ?',
+      }).then(() => {
+        this.auditRequest(this.auditParams)
+      }).catch(() => {
+        // on cancel
+      });
+    },
     handleSelectResult(checkResult) {
       console.log('Selected result:', checkResult);
       const self = this;
@@ -963,7 +1577,16 @@ export default {
         self.auditParams.selectedUserId = checkResult[0].userId;
         self.auditRequest(self.auditParams);
       }
-      self.selectHandlePopupShow = false;
+      self.selectUserPopupShow = false;
+    },
+    handleAssigneeSelectResult(checkResult) {
+      console.log('Selected result:', checkResult);
+      this.nextNodeProcessedData[this.nextNodeHandleIndex].assignee.id = checkResult[0].userId;
+      this.nextNodeProcessedData[this.nextNodeHandleIndex].assignee.name = checkResult[0].userName;
+      if (!this.nextNodePopupShow){
+        this.handleSelect('select')
+      }
+      this.selectUserPopupShow = false;
     },
     selectOrganizeHandle(handle, checkedNodes) {
       if (handle === 'select') {
@@ -975,13 +1598,22 @@ export default {
       }
       this.selectOrganizePopupShow = false
     },
-    selectUserHandle(checkResult) {
+    selectCandUserHandle(checkResult) {
       this.nextNodeProcessedData[this.nextNodeHandleIndex].candidateGroups.users =
           checkResult.map(item => ({
             name: item.userName,
             id: item.userId,
           }));
+      if (!this.nextNodePopupShow){
+        this.handleSelect('select')
+      }
       this.selectUserPopupShow = false;
+      this.selectCandUserPopupShow = false;
+    },
+    selectRejectUserHandle(checkResult) {
+      this.rejectUsers.name = checkResult.map(item => item.userName).join(',')
+      this.rejectUsers.id = checkResult.map(item => item.userId).join(',')
+      this.selectRejectUserPopupShow = false;
     },
     selectPositionHandle(handle, result) {
       if (handle === 'select') {
@@ -1015,6 +1647,18 @@ export default {
     if (!this.activeFirstTab) {
       this.updateActiveTab();
     }
+  },
+  watch: {
+    targetTaskNodeProcessControl(val) {
+      const self = this
+      if (self.handleButtons && self.handleButtons.includes('rejectProcessControl')) {
+        if (val == 'inSequence') {
+          self.showProcessControl = false
+          return
+        }
+        self.getProcessAttributes(val)
+      }
+    },
   }
 
 };
@@ -1086,6 +1730,17 @@ export default {
   background-color: #1989fa;
 }
 
+.disagree {
+  color: #fff;
+  background: linear-gradient(90deg, #ff4d4f, #f5222d);
+  border-radius: 9px;
+  margin: 0 20px;
+}
+
+.disagree:active {
+  background-color: #ff7875;
+}
+
 .title-info {
   font-weight: bold;
   font-size: 14px;
@@ -1158,7 +1813,7 @@ export default {
   font-size: 15px;
 }
 
-.table-row {
+.table-row, .reject-attribute  {
   display: flex;
   border-bottom: 1px solid #ebedf0;
   font-size: 14px;
@@ -1175,6 +1830,14 @@ export default {
   border-bottom: none;
 }
 
+.reject-attribute > div {
+  padding: 10px 10px 10px 5px;
+}
+.reject-attribute .van-radio {
+  padding: 5px;
+  justify-content: flex-start !important;
+}
+
 .van-radio {
   justify-content: center;
 }