From 2cb159ff83a169b2a14ddce5bb637556ba20b793 Mon Sep 17 00:00:00 2001
From: "825299534@qq.com" <Aa825299534>
Date: Mon, 28 Apr 2025 08:48:03 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E9=85=8D=E7=BD=AE2.?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=AE=B1=E6=B7=BB=E5=8A=A0=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=92=8C=E4=BB=BB=E5=8A=A1=E5=90=8D=E5=92=8C?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/bpmn/components/ApproveRules.vue   | 65 -------------------
 src/views/workflow/design/bpmn/panel/User.vue | 12 +++-
 .../task/components/processTasks/Drafts.vue   | 15 ++++-
 3 files changed, 23 insertions(+), 69 deletions(-)

diff --git a/src/views/workflow/design/bpmn/components/ApproveRules.vue b/src/views/workflow/design/bpmn/components/ApproveRules.vue
index 5b60a70..f9a7a0f 100644
--- a/src/views/workflow/design/bpmn/components/ApproveRules.vue
+++ b/src/views/workflow/design/bpmn/components/ApproveRules.vue
@@ -26,35 +26,6 @@
       @change="changeDesignatedApprover"
     />
   </FormItem>
-  <FormItem
-    :tip="
-      t(
-        '临时审批人是指由上一节点审批人指定下一节点审批人过程中，是否允许在审批人基础上添加组织架构人员。',
-      )
-    "
-    :label="t('临时审批人：')"
-    v-if="props.provisionalApprover == true || props.provisionalApprover == false"
-  >
-    <a-switch :checked="props.provisionalApprover" @change="changeProvisionalApprover" />
-  </FormItem>
-  <!-- 多选 ：是 / 否 -->
-  <FormItem 
-  :label="t('多选：')"
-  >
-    <a-switch :checked="props.isChooseMulti" @change="changeIsChooseMulti" />
-  </FormItem>
-  <!-- 全选 ：是 / 否 -->
-  <FormItem 
-  :label="t('全选：')"
-  >
-    <a-switch :checked="props.isChooseAll" @change="changeIsChooseAll" />
-  </FormItem>
-  <!-- 只读 ：是 / 否 -->
-  <FormItem 
-  :label="t('只读：')"
-  >
-    <a-switch :checked="props.isReadOnly" @change="changeIsReadOnly" />
-  </FormItem>
 </template>
 
 <script setup lang="ts" name="ProcessBasic">
@@ -66,31 +37,11 @@
     'update:autoAgreeRule',
     'update:noHandler',
     'update:isPrevChooseNext',
-    'update:provisionalApprover',
-    'update:isChooseMulti',
-    'update:isChooseAll',
-    'update:isReadOnly',
   ]);
   const props = defineProps({
     autoAgreeRule: Array,
     noHandler: Number || String || Boolean,
     isPrevChooseNext: Number || String || Boolean,
-    isChooseMulti: {
-      type: Boolean,
-      default: true,
-    },
-    isChooseAll: {
-      type: Boolean,
-      default: false,
-    },
-    isReadOnly: {
-      type: Boolean,
-      default: false,
-    },
-    provisionalApprover: {
-      type: Boolean || undefined,
-      default: undefined,
-    },
   });
 
   // 自动同意规则
@@ -153,22 +104,6 @@
       emits('update:autoAgreeRule', []);
     }
   }
-  // 临时审批人
-  function changeProvisionalApprover(val: Boolean) {
-    emits('update:provisionalApprover', val);
-  }
-  // 多选
-  function changeIsChooseMulti(val: Boolean) {
-    emits('update:isChooseMulti', val);
-  }
-  // 全选
-  function changeIsChooseAll(val: Boolean) {
-    emits('update:isChooseAll', val);
-  }
-  // 只读
-  function changeIsReadOnly(val: Boolean) {
-    emits('update:isReadOnly', val);
-  }
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/workflow/design/bpmn/panel/User.vue b/src/views/workflow/design/bpmn/panel/User.vue
index 77895fd..70a4878 100644
--- a/src/views/workflow/design/bpmn/panel/User.vue
+++ b/src/views/workflow/design/bpmn/panel/User.vue
@@ -18,7 +18,7 @@
       </FormItem>
     </template>
     <a-tab-pane key="2" :tab="t('审批人')">
-      <ApproveRules
+      <ApproveUserRules
         v-model:autoAgreeRule="formInfo.autoAgreeRule"
         v-model:noHandler="formInfo.noHandler"
         v-model:isPrevChooseNext="formInfo.isPrevChooseNext"
@@ -26,6 +26,8 @@
         v-model:isChooseMulti="formInfo.isChooseMulti"
         v-model:isChooseAll="formInfo.isChooseAll"
         v-model:isReadOnly="formInfo.isReadOnly"
+        v-model:minAppRovers="formInfo.minAppRovers"
+        v-model:maxAppRovers="formInfo.maxAppRovers"
       />
       <MemberTable
         v-model:memberList="formInfo.approverConfigs"
@@ -34,6 +36,11 @@
       />
     </a-tab-pane>
     <a-tab-pane key="3" :tab="t('传阅人')">
+        <MemberUserTable
+            v-model:provisionalDistributor="formInfo.provisionalDistributor"
+            v-model:maxReaders="formInfo.maxReaders"
+            v-model:minReaders="formInfo.minReaders"
+        />
       <MemberTable
         v-model:memberList="formInfo.circulateConfigs"
         :is-common-type="false"
@@ -56,7 +63,8 @@
   import NoticePolicyConfig from '/@bpmn/components/NoticePolicyConfig.vue';
   import SettingList from '/@bpmn/components/formSettings/SettingList.vue';
   import MemberTable from '/@bpmn/components/member/MemberTable.vue';
-  import ApproveRules from '/@bpmn/components/ApproveRules.vue';
+  import MemberUserTable from '/@bpmn/components/member/MemberUserTable.vue';
+  import ApproveUserRules from '/@bpmn/components/ApproveUserRules.vue';
   import Countersign from './user/Countersign.vue';
   import ButtonSetting from './user/ButtonSetting.vue';
   import OpinionConfig from './user/OpinionConfig.vue';
diff --git a/src/views/workflow/task/components/processTasks/Drafts.vue b/src/views/workflow/task/components/processTasks/Drafts.vue
index ec06c82..9f03b59 100644
--- a/src/views/workflow/task/components/processTasks/Drafts.vue
+++ b/src/views/workflow/task/components/processTasks/Drafts.vue
@@ -43,16 +43,27 @@
   const { t } = useI18n();
   const configColumns: BasicColumn[] = [
     {
-      title: t('流程名称'),
+      title: t('流程定义名称'),
       dataIndex: 'schemaName',
       align: 'left',
     },
     {
-      title: t('发起者'),
+        title: t('任务名称'),
+        dataIndex: 'taskName',
+        align: 'left',
+    },
+    {
+      title: t('流程发起者'),
       dataIndex: 'originator',
       sorter: true,
       align: 'left',
     },
+    {
+      title: t('创建人'),
+      dataIndex: 'createUserName',
+      sorter: true,
+      align: 'left',
+    },
     {
       title: t('发起时间'),
       dataIndex: 'createDate',