--添加测试模块

src/views/actHiTaskinst/components/CustomDevForm.vue

@@ -234,7 +234,7 @@
                         </div>
                     </div>
                     <div class="ant-col ant-form-item-control ant-col-12">
-                        <a-button v-auth="'monitor:appointedAuditor'" @click="flowChange">{{
+                        <a-button v-if="canClick" v-allAuth="'adminOperation:toDesignatedNode'" @click="flowChange">{{
                             t('将任务流转到')
                             }}</a-button>
                     </div>
@@ -244,7 +244,12 @@
             <div class="ant-col ant-col-24">
                 <div class="ant-row ant-form-item" style="row-gap: 0px;">
                     <div class="ant-col ant-form-item-label" style="width: 120px;">
-                        <label>审批人</label>
+                        <label>
+                            审批人
+                            <a-tooltip title="当前节点为会签节点时是加减签，为普通节点时是加减审批人抢令牌">
+                                <QuestionCircleOutlined style="margin-left: 4px; cursor: pointer; color: #1890ff;" />
+                            </a-tooltip>
+                        </label>
                     </div>
                     <div class="ant-col ant-form-item-control">
                         <div class="ant-form-item-control-input">
@@ -256,16 +261,9 @@
                         </div>
                     </div>
                     <div class="ant-col ant-form-item-control ant-col-12">
-                        <!-- <a-button style="width: 20%;" v-auth="'monitor:appointedAuditor'" @click="addOrSubtractUser">{{
-                            t('加减签')
-                            }}</a-button> -->
-                        <a-button v-if="!showAdd" v-auth="'monitor:appointedAuditor'" style="margin-right: 10px;"
-                            @click="approveUser">{{
-                                t('修改审批人')
-                            }}</a-button>
-                        <AddOrSubtract v-else :schemaId="schemaId" :taskId="assignee.value.taskId"
-                            :selectedUser="assignee.value.assigneeVoList">
-                        </AddOrSubtract>
+                        <AddOrSubtractV2 :schemaId="schemaId" :taskId="assignee.value.taskId" v-if="canClick" v-allAuth="'adminOperation:setAssignee'"
+                            :lastAddStepUser="assignee.value.assigneeVoList" @change="changedUser">
+                        </AddOrSubtractV2>
                     </div>
                 </div>
             </div>
@@ -316,7 +314,6 @@
     <!-- 指派审核人 -->
     <!-- 流程流转 -->
     <opinionDialog ref="opinionDlg" />
-    <!-- <AddOrSubtract v-if="showAdd"></AddOrSubtract> -->
 
 </template>
 
@@ -326,12 +323,13 @@ import SimpleFormSetup from '/@/components/SimpleForm/src/SimpleFormSetup.vue';
 import { Col, Form, message, Row } from 'ant-design-vue';
 import SimpleFormItem from '/@/components/SimpleForm/src/components/SimpleFormItem.vue';
 import { ref, reactive, inject } from 'vue';
-import { CheckCircleOutlined } from '@ant-design/icons-vue';
+import { CheckCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons-vue';
 import ApproveProcessMonitor from '../../../views/workflow/task/components/flow/ApproveProcessMonitorUser.vue';
 import { data } from '../../demo/excel/data';
 import opinionDialog from '/@/components/SecondDev/OpinionDialogSelected.vue';
 import { getProcessUserNodes, SetChangeProcessNode } from '/@/api/workflow/adminOperation'
 import AddOrSubtract from '../../workflow/task/components/flow/AddOrSubtractWork.vue';
+import AddOrSubtractV2 from '../../workflow/task/components/flow/AddOrSubtractV2.vue';
 
 
 const FormItem = Form.Item;
@@ -339,6 +337,7 @@ const FormItem = Form.Item;
 export default {
     components: {
         CheckCircleOutlined,
+        QuestionCircleOutlined,
         Form,
         Col,
         SimpleFormItem,
@@ -347,6 +346,7 @@ export default {
         ApproveProcessMonitor,
         opinionDialog,
         AddOrSubtract,
+        AddOrSubtractV2
     },
     mixins: [SimpleFormSetup],
     setup(props, ctx) {
@@ -357,26 +357,22 @@ export default {
         const isCustom = ref(Boolean)
         const schemaId = ctx.attrs.schemaId;
         const processId = ctx.attrs.processId;
+        const canClick = ctx.attrs.canClick
         isCustom.value = ctx.attrs.isCustom;
 
         const showApproveUser = ref(Boolean);
         showApproveUser.value = false;
-        const showAdd = ref(Boolean);
-        showAdd.value = true;
 
         const opinionDlg = ref();
         const selectedInfo = ref();
-        const allTaskNodes = inject('taskNode');;
+        const allTaskNodes = inject('taskNode');
+        const refreshInfo = inject('refreshApproveInfo', () => {})
 
         const users = ref('');
         users.value = assignee.value.assigneeVoList.map((ele) => {
             return ele.name + '(' + ele.code + ')';
         }).join('，')
 
-        if (assignee.value.assigneeVoList.length > 1) {
-            showAdd.value = false;
-        }
-
         function approveUser() {
             showApproveUser.value = true;
         }
@@ -395,6 +391,10 @@ export default {
             });
         }
 
+        function changedUser() {
+            refreshInfo()
+        }
+
         function submit(info) {
             const key = info.taskId;
             const userIds = info.selectedList.map((ele) => {
@@ -426,7 +426,6 @@ export default {
         return {
             approveUser,
             flowChange,
-            showAdd,
             processId,
             schemaId,
             showApproveUser,
@@ -435,6 +434,8 @@ export default {
             currentTaskAssigneeNames,
             opinionDlg,
             users,
+            canClick,
+            changedUser,
             ...ret
         };
     },
@@ -455,7 +456,7 @@ export default {
                 }
             });
             return schemaMap;
-        }
+        },
     },
     methods: {
         getIfShow2: function (key) {

src/views/actHiTaskinst/components/Form.vue

@@ -2,7 +2,7 @@
   <SimpleForm ref="systemFormRef" :formProps="data.formDataProps" :formModel="{}"
     :isWorkFlow="props.fromPage != FromPageType.MENU" :clickedTaskAssignees="props.clickedTaskAssignees"
     :processId="props.processId" :isCustom="props.customFlg" :schemaId="props.schemaId"
-    :currentTaskAssigneeNames="taskAssigneeNames" />
+    :currentTaskAssigneeNames="taskAssigneeNames" :canClick="canClick"/>
 </template>
 <script lang="ts" setup>
 import { reactive, ref, onMounted, computed } from 'vue';
@@ -27,6 +27,10 @@ const props = defineProps({
   customFlg: false,
   clickedTaskAssignees: {},
   currentTaskAssigneeNames: {},
+  canClick: {
+    type: Boolean,
+    default: false
+  },
   fromPage: {
     type: Number,
     default: FromPageType.MENU,