From 941dc737a3cdc84e39c87642f55c0f6ca12e7c9b Mon Sep 17 00:00:00 2001
From: ZhangZhixing <xing007008@163.com>
Date: Fri, 28 Feb 2025 15:16:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A2=84=E5=AE=A1=E9=80=89?=
 =?UTF-8?q?=E4=BA=BA=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=A1=B9=20https:?=
 =?UTF-8?q?//e.gitee.com/gdyditc/projects/725584/tasks/table=3Fissue=3DIBL?=
 =?UTF-8?q?ALD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SecondDev/OpinionDialog.vue    | 16 ++++--------
 .../design/bpmn/components/ApproveRules.vue   | 25 +++++++++----------
 .../design/bpmn/config/propertyConfig.ts      |  4 +--
 src/views/workflow/design/bpmn/panel/User.vue |  4 +--
 4 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue
index 235ab73..f4e8830 100644
--- a/src/components/SecondDev/OpinionDialog.vue
+++ b/src/components/SecondDev/OpinionDialog.vue
@@ -11,17 +11,11 @@
                 </a-form-item>
                 <template v-for="node in flowNextNodes">
                     <a-form-item v-if="_action === 'agree' && !isEnd" :label="flowNextNodes.length > 1 ? node.activityName + '审批人' : '审批人'">
-                        <template v-if="!flowNextNodes.isMore">
-                            <a-select v-show="node.chooseAssign" v-model:value="node.assignees" :options="node.nextAssignees"
-                                      :placeholder="'请选择' + node.activityName + '的审批人'" max-tag-count="responsive" 
-                                      :filterOption="search"
-                            ></a-select>
-                        </template>
-                        <template v-if="flowNextNodes.isMore">
-                            <a-select v-show="node.chooseAssign" v-model:value="node.assignees" :options="node.nextAssignees"
-                                      :placeholder="'请选择' + node.activityName + '的审批人'" max-tag-count="responsive" mode="multiple"
-                                      :filterOption="search"
-                            ></a-select>
+                        <a-select v-show="node.chooseAssign" v-model:value="node.assignees" :options="node.nextAssignees"
+                                  :placeholder="'请选择' + node.activityName + '的审批人'" max-tag-count="responsive" 
+                                  :mode="node.isChooseMulti==false? 'multiple' : ''"
+                                  :filterOption="search"
+                        ></a-select>
                         </template>
                         <span v-show="!node.chooseAssign">{{ getAssigneeText(node) }}</span>
                     </a-form-item>
diff --git a/src/views/workflow/design/bpmn/components/ApproveRules.vue b/src/views/workflow/design/bpmn/components/ApproveRules.vue
index 660f9b6..a3fcfd2 100644
--- a/src/views/workflow/design/bpmn/components/ApproveRules.vue
+++ b/src/views/workflow/design/bpmn/components/ApproveRules.vue
@@ -40,16 +40,16 @@
   <!-- 多选 ：是 / 否 -->
   <FormItem 
   :label="t('多选：')"
-  v-if="props.isMore == true || props.isMore == false"
+  v-if="props.isChooseMulti == true || props.isChooseMulti == false"
   >
-    <a-switch :checked="props.isMore" @change="changeIsMore" />
+    <a-switch :checked="props.isChooseMulti" @change="changeIsChooseMulti" />
   </FormItem>
   <!-- 全选 ：是 / 否 -->
   <FormItem 
   :label="t('全选：')"
-  v-if="props.isAll == true || props.isAll == false"
+  v-if="props.isChooseAll == true || props.isChooseAll == false"
   >
-    <a-switch :checked="props.isAll" @change="changeIsAll" />
+    <a-switch :checked="props.isChooseAll" @change="changeIsChooseAll" />
   </FormItem>
   <!-- 只读 ：是 / 否 -->
   <FormItem 
@@ -70,19 +70,19 @@
     'update:noHandler',
     'update:isPrevChooseNext',
     'update:provisionalApprover',
-    'update:isMore',
-    'update:isAll',
+    'update:isChooseMulti',
+    'update:isChooseAll',
     'update:isReadOnly',
   ]);
   const props = defineProps({
     autoAgreeRule: Array,
     noHandler: Number || String || Boolean,
     isPrevChooseNext: Number || String || Boolean,
-    isMore: {
+    isChooseMulti: {
       type: Boolean || undefined,
       default: true,
     },
-    isAll: {
+    isChooseAll: {
       type: Boolean || undefined,
       default: false,
     },
@@ -161,13 +161,12 @@
     emits('update:provisionalApprover', val);
   }
   // 多选
-  function changeIsMore(val: Boolean) {
-      console.log("changeIsMore", val);
-    emits('update:isMore', val);
+  function changeIsChooseMulti(val: Boolean) {
+    emits('update:isChooseMulti', val);
   }
   // 全选
-  function changeIsAll(val: Boolean) {
-    emits('update:isAll', val);
+  function changeIsChooseAll(val: Boolean) {
+    emits('update:isChooseAll', val);
   }
   // 只读
   function changeIsReadOnly(val: Boolean) {
diff --git a/src/views/workflow/design/bpmn/config/propertyConfig.ts b/src/views/workflow/design/bpmn/config/propertyConfig.ts
index a206826..888df23 100644
--- a/src/views/workflow/design/bpmn/config/propertyConfig.ts
+++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts
@@ -134,8 +134,8 @@ const UserProperties: UserTaskConfig = {
   autoAgreeRule: [], //自动同意规则
   isPrevChooseNext: DesignatedApprover.NOT_SPECIFIED, //是否上一节点审批人指定下一节点审批人
   provisionalApprover: false, //临时审批人
-  isMore: true, //是否多选
-  isAll: false, //是否全选
+  isChooseMulti: true, //是否多选
+  isChooseAll: false, //是否全选
   isReadOnly: false, //是否只读
   noHandler: NoHandler.ADMIN, //无对应处理人
   countersignConfig: {
diff --git a/src/views/workflow/design/bpmn/panel/User.vue b/src/views/workflow/design/bpmn/panel/User.vue
index d1aad9d..77895fd 100644
--- a/src/views/workflow/design/bpmn/panel/User.vue
+++ b/src/views/workflow/design/bpmn/panel/User.vue
@@ -23,8 +23,8 @@
         v-model:noHandler="formInfo.noHandler"
         v-model:isPrevChooseNext="formInfo.isPrevChooseNext"
         v-model:provisionalApprover="formInfo.provisionalApprover"
-        v-model:isMore="formInfo.isMore"
-        v-model:isAll="formInfo.isAll"
+        v-model:isChooseMulti="formInfo.isChooseMulti"
+        v-model:isChooseAll="formInfo.isChooseAll"
         v-model:isReadOnly="formInfo.isReadOnly"
       />
       <MemberTable