Skip to content

Commit 8f748ed

Browse files
committed
【代码优化】工作流:调整多人审批的文案
1 parent e75f954 commit 8f748ed

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/components/SimpleProcessDesignerV2/src/NodeHandler.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const addNode = (type: number) => {
8181
name: NODE_DEFAULT_NAME.get(NodeType.USER_TASK_NODE) as string,
8282
showText: '',
8383
type: NodeType.USER_TASK_NODE,
84-
approveMethod: ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE,
84+
approveMethod: ApproveMethodType.SEQUENTIAL_APPROVE,
8585
// 超时处理
8686
rejectHandler: {
8787
type: RejectHandlerType.FINISH_PROCESS

src/components/SimpleProcessDesignerV2/src/consts.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export enum ApproveMethodType {
147147
/**
148148
* 随机挑选一人审批
149149
*/
150-
RRANDOM_SELECT_ONE_APPROVE = 1,
150+
RANDOM_SELECT_ONE_APPROVE = 1,
151151

152152
/**
153153
* 多人会签(按通过比例)
@@ -421,10 +421,10 @@ export const APPROVE_TYPE: DictDataVO[] = [
421421
]
422422

423423
export const APPROVE_METHODS: DictDataVO[] = [
424-
{ label: '随机挑选一人审批', value: ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE },
425-
{ label: '多人会签(按通过比例%)', value: ApproveMethodType.APPROVE_BY_RATIO },
426-
{ label: '多人或签(一人通过或拒绝)', value: ApproveMethodType.ANY_APPROVE },
427-
{ label: '依次审批(按顺序依次审批)', value: ApproveMethodType.SEQUENTIAL_APPROVE }
424+
{ label: '按顺序依次审批', value: ApproveMethodType.SEQUENTIAL_APPROVE },
425+
{ label: '会签(可同时审批,至少 % 人必须审批通过)', value: ApproveMethodType.APPROVE_BY_RATIO },
426+
{ label: '或签(可同时审批,有一人通过即可)', value: ApproveMethodType.ANY_APPROVE },
427+
{ label: '随机挑选一人审批', value: ApproveMethodType.RANDOM_SELECT_ONE_APPROVE }
428428
]
429429

430430
export const CONDITION_CONFIG_TYPES: DictDataVO[] = [

src/components/SimpleProcessDesignerV2/src/node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ export function useNodeForm(nodeType: NodeType) {
190190
if (nodeType === NodeType.USER_TASK_NODE) {
191191
configForm.value = {
192192
candidateStrategy: CandidateStrategy.USER,
193-
approveMethod: ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE,
193+
approveMethod: ApproveMethodType.SEQUENTIAL_APPROVE,
194194
approveRatio: 100,
195195
rejectHandlerType: RejectHandlerType.FINISH_PROCESS,
196196
assignStartUserHandlerType: AssignStartUserHandlerType.START_USER_AUDIT,

src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
:value="item.value"
189189
:label="item.value"
190190
:disabled="
191-
item.value !== ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE &&
191+
item.value !== ApproveMethodType.RANDOM_SELECT_ONE_APPROVE &&
192192
notAllowedMultiApprovers
193193
"
194194
>
@@ -547,7 +547,7 @@ const changeCandidateStrategy = () => {
547547
configForm.value.postIds = []
548548
configForm.value.userGroups = []
549549
configForm.value.deptLevel = 1
550-
configForm.value.approveMethod = ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE
550+
configForm.value.approveMethod = ApproveMethodType.SEQUENTIAL_APPROVE
551551
if (
552552
configForm.value.candidateStrategy === CandidateStrategy.START_USER ||
553553
configForm.value.candidateStrategy === CandidateStrategy.USER
@@ -564,7 +564,7 @@ const changedCandidateUsers = () => {
564564
configForm.value.userIds?.length <= 1 &&
565565
configForm.value.candidateStrategy === CandidateStrategy.USER
566566
) {
567-
configForm.value.approveMethod = ApproveMethodType.RRANDOM_SELECT_ONE_APPROVE
567+
configForm.value.approveMethod = ApproveMethodType.RANDOM_SELECT_ONE_APPROVE
568568
configForm.value.rejectHandlerType = RejectHandlerType.FINISH_PROCESS
569569
notAllowedMultiApprovers.value = true
570570
} else {

0 commit comments

Comments
 (0)