Эх сурвалжийг харах

【代码优化】工作流:调整多人审批的文案

YunaiV 1 жил өмнө
parent
commit
8f748edd96

+ 1 - 1
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

+ 5 - 5
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[] = [

+ 1 - 1
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,

+ 3 - 3
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 {