From bcec0c6dfcf26ce2060e9d72800db88962d19825 Mon Sep 17 00:00:00 2001
From: ZhangZhixing <xing007008@163.com>
Date: Wed, 26 Feb 2025 16:04:20 +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   | 49 +++++++++++++++++++
 .../design/bpmn/config/propertyConfig.ts      |  3 ++
 src/views/workflow/design/bpmn/panel/User.vue |  3 ++
 4 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue
index 840d815..235ab73 100644
--- a/src/components/SecondDev/OpinionDialog.vue
+++ b/src/components/SecondDev/OpinionDialog.vue
@@ -11,10 +11,18 @@
                 </a-form-item>
                 <template v-for="node in flowNextNodes">
                     <a-form-item v-if="_action === 'agree' && !isEnd" :label="flowNextNodes.length > 1 ? node.activityName + '审批人' : '审批人'">
-                        <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>
+                        <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>
+                        </template>
                         <span v-show="!node.chooseAssign">{{ getAssigneeText(node) }}</span>
                     </a-form-item>
                 </template>
diff --git a/src/views/workflow/design/bpmn/components/ApproveRules.vue b/src/views/workflow/design/bpmn/components/ApproveRules.vue
index 84c1657..660f9b6 100644
--- a/src/views/workflow/design/bpmn/components/ApproveRules.vue
+++ b/src/views/workflow/design/bpmn/components/ApproveRules.vue
@@ -37,6 +37,27 @@
   >
     <a-switch :checked="props.provisionalApprover" @change="changeProvisionalApprover" />
   </FormItem>
+  <!-- 多选 ：是 / 否 -->
+  <FormItem 
+  :label="t('多选：')"
+  v-if="props.isMore == true || props.isMore == false"
+  >
+    <a-switch :checked="props.isMore" @change="changeIsMore" />
+  </FormItem>
+  <!-- 全选 ：是 / 否 -->
+  <FormItem 
+  :label="t('全选：')"
+  v-if="props.isAll == true || props.isAll == false"
+  >
+    <a-switch :checked="props.isAll" @change="changeIsAll" />
+  </FormItem>
+  <!-- 只读 ：是 / 否 -->
+  <FormItem 
+  :label="t('只读：')"
+  v-if="props.isReadOnly == true || props.isReadOnly == false"
+  >
+    <a-switch :checked="props.isReadOnly" @change="changeIsReadOnly" />
+  </FormItem>
 </template>
 
 <script setup lang="ts" name="ProcessBasic">
@@ -49,11 +70,26 @@
     'update:noHandler',
     'update:isPrevChooseNext',
     'update:provisionalApprover',
+    'update:isMore',
+    'update:isAll',
+    'update:isReadOnly',
   ]);
   const props = defineProps({
     autoAgreeRule: Array,
     noHandler: Number || String || Boolean,
     isPrevChooseNext: Number || String || Boolean,
+    isMore: {
+      type: Boolean || undefined,
+      default: true,
+    },
+    isAll: {
+      type: Boolean || undefined,
+      default: false,
+    },
+    isReadOnly: {
+      type: Boolean || undefined,
+      default: false,
+    },
     provisionalApprover: {
       type: Boolean || undefined,
       default: undefined,
@@ -124,6 +160,19 @@
   function changeProvisionalApprover(val: Boolean) {
     emits('update:provisionalApprover', val);
   }
+  // 多选
+  function changeIsMore(val: Boolean) {
+      console.log("changeIsMore", val);
+    emits('update:isMore', val);
+  }
+  // 全选
+  function changeIsAll(val: Boolean) {
+    emits('update:isAll', val);
+  }
+  // 只读
+  function changeIsReadOnly(val: Boolean) {
+    emits('update:isReadOnly', val);
+  }
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/workflow/design/bpmn/config/propertyConfig.ts b/src/views/workflow/design/bpmn/config/propertyConfig.ts
index 315dc2d..a206826 100644
--- a/src/views/workflow/design/bpmn/config/propertyConfig.ts
+++ b/src/views/workflow/design/bpmn/config/propertyConfig.ts
@@ -134,6 +134,9 @@ const UserProperties: UserTaskConfig = {
   autoAgreeRule: [], //自动同意规则
   isPrevChooseNext: DesignatedApprover.NOT_SPECIFIED, //是否上一节点审批人指定下一节点审批人
   provisionalApprover: false, //临时审批人
+  isMore: true, //是否多选
+  isAll: false, //是否全选
+  isReadOnly: false, //是否只读
   noHandler: NoHandler.ADMIN, //无对应处理人
   countersignConfig: {
     multipleInstancesType: MultipleInstancesType.NONE, //多实例类型
diff --git a/src/views/workflow/design/bpmn/panel/User.vue b/src/views/workflow/design/bpmn/panel/User.vue
index 550c823..d1aad9d 100644
--- a/src/views/workflow/design/bpmn/panel/User.vue
+++ b/src/views/workflow/design/bpmn/panel/User.vue
@@ -23,6 +23,9 @@
         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:isReadOnly="formInfo.isReadOnly"
       />
       <MemberTable
         v-model:memberList="formInfo.approverConfigs"