diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 692a45fb..75bf765a 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -457,3 +457,9 @@ export const BpmProcessInstanceStatus = { REJECT: 3, // 审批不通过 CANCEL: 4 // 已取消 } + +export const BpmAutoApproveType = { + NONE: 1, // 不自动通过 + APPROVE_ALL: 2, // 仅审批一次,后续重复的审批节点均自动通过 + APPROVE_SEQUENT: 3, // 仅针对连续审批的节点自动通过 +} diff --git a/src/views/bpm/model/form/ExtraSettings.vue b/src/views/bpm/model/form/ExtraSettings.vue index e512cffe..d2e6d2cc 100644 --- a/src/views/bpm/model/form/ExtraSettings.vue +++ b/src/views/bpm/model/form/ExtraSettings.vue @@ -58,11 +58,29 @@ + + +
+
+ 同一审批人在流程中重复出现时: +
+ +
+ 不自动通过 + 仅审批一次,后续重复的审批节点均自动通过 + 仅针对连续审批的节点自动通过 +
+
+
+
diff --git a/src/views/bpm/model/form/index.vue b/src/views/bpm/model/form/index.vue index 4bc1cfc0..84e74d89 100644 --- a/src/views/bpm/model/form/index.vue +++ b/src/views/bpm/model/form/index.vue @@ -86,7 +86,7 @@ import * as FormApi from '@/api/bpm/form' import { CategoryApi, CategoryVO } from '@/api/bpm/category' import * as UserApi from '@/api/system/user' import { useUserStoreWithOut } from '@/store/modules/user' -import { BpmModelFormType, BpmModelType } from '@/utils/constants' +import { BpmModelFormType, BpmModelType, BpmAutoApproveType } from '@/utils/constants' import BasicInfo from './BasicInfo.vue' import FormDesign from './FormDesign.vue' import ProcessDesign from './ProcessDesign.vue' @@ -153,7 +153,8 @@ const formData: any = ref({ infix: '', postfix: '', length: 5 - } + }, + autoApprovalType: BpmAutoApproveType.NONE }) //流程数据