From 8f748edd96ce45c51059bd3f4ddb0d41889645b6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 24 Aug 2024 18:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E5=B7=A5=E4=BD=9C=E6=B5=81=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=A4=9A=E4=BA=BA=E5=AE=A1=E6=89=B9=E7=9A=84=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SimpleProcessDesignerV2/src/NodeHandler.vue        |  2 +-
 src/components/SimpleProcessDesignerV2/src/consts.ts   | 10 +++++-----
 src/components/SimpleProcessDesignerV2/src/node.ts     |  2 +-
 .../src/nodes-config/UserTaskNodeConfig.vue            |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
index dd0f001b..81b78852 100644
--- a/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
+++ b/src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
@@ -81,7 +81,7 @@ const addNode = (type: number) => {
       name: NODE_DEFAULT_NAME.get(NodeType.USER_TASK_NODE) as string,
       showText: '',
       type: NodeType.USER_TASK_NODE,
-      approveMethod: ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE,
+      approveMethod: ApproveMethodType.SEQUENTIAL_APPROVE,
       // 超时处理
       rejectHandler: {
         type: RejectHandlerType.FINISH_PROCESS
diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index ca8e5577..d0e59558 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -147,7 +147,7 @@ export enum ApproveMethodType {
   /**
    * 随机挑选一人审批
    */
-  RRANDOM_SELECT_ONE_APPROVE = 1,
+  RANDOM_SELECT_ONE_APPROVE = 1,
 
   /**
    * 多人会签(按通过比例)
@@ -421,10 +421,10 @@ export const APPROVE_TYPE: DictDataVO[] = [
 ]
 
 export const APPROVE_METHODS: DictDataVO[] = [
-  { label: '随机挑选一人审批', value: ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE },
-  { label: '多人会签(按通过比例%)', value: ApproveMethodType.APPROVE_BY_RATIO },
-  { label: '多人或签(一人通过或拒绝)', value: ApproveMethodType.ANY_APPROVE },
-  { label: '依次审批(按顺序依次审批)', value: ApproveMethodType.SEQUENTIAL_APPROVE }
+  { label: '按顺序依次审批', value: ApproveMethodType.SEQUENTIAL_APPROVE },
+  { label: '会签（可同时审批，至少 % 人必须审批通过）', value: ApproveMethodType.APPROVE_BY_RATIO },
+  { label: '或签(可同时审批，有一人通过即可)', value: ApproveMethodType.ANY_APPROVE },
+  { label: '随机挑选一人审批', value: ApproveMethodType.RANDOM_SELECT_ONE_APPROVE }
 ]
 
 export const CONDITION_CONFIG_TYPES: DictDataVO[] = [
diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts
index 282600a3..816d9b19 100644
--- a/src/components/SimpleProcessDesignerV2/src/node.ts
+++ b/src/components/SimpleProcessDesignerV2/src/node.ts
@@ -190,7 +190,7 @@ export function useNodeForm(nodeType: NodeType) {
   if (nodeType === NodeType.USER_TASK_NODE) {
     configForm.value = {
       candidateStrategy: CandidateStrategy.USER,
-      approveMethod: ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE,
+      approveMethod: ApproveMethodType.SEQUENTIAL_APPROVE,
       approveRatio: 100,
       rejectHandlerType: RejectHandlerType.FINISH_PROCESS,
       assignStartUserHandlerType: AssignStartUserHandlerType.START_USER_AUDIT,
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
index e72b1117..969cf48b 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
@@ -188,7 +188,7 @@
                       :value="item.value"
                       :label="item.value"
                       :disabled="
-                        item.value !== ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE &&
+                        item.value !== ApproveMethodType.RANDOM_SELECT_ONE_APPROVE &&
                         notAllowedMultiApprovers
                       "
                     >
@@ -547,7 +547,7 @@ const changeCandidateStrategy = () => {
   configForm.value.postIds = []
   configForm.value.userGroups = []
   configForm.value.deptLevel = 1
-  configForm.value.approveMethod = ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE
+  configForm.value.approveMethod = ApproveMethodType.SEQUENTIAL_APPROVE
   if (
     configForm.value.candidateStrategy === CandidateStrategy.START_USER ||
     configForm.value.candidateStrategy === CandidateStrategy.USER
@@ -564,7 +564,7 @@ const changedCandidateUsers = () => {
     configForm.value.userIds?.length <= 1 &&
     configForm.value.candidateStrategy === CandidateStrategy.USER
   ) {
-    configForm.value.approveMethod = ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE
+    configForm.value.approveMethod = ApproveMethodType.RANDOM_SELECT_ONE_APPROVE
     configForm.value.rejectHandlerType = RejectHandlerType.FINISH_PROCESS
     notAllowedMultiApprovers.value = true
   } else {