diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index 9265d8b6..17ea37d2 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -159,7 +159,7 @@ export type TimeoutHandler = {
//是否开启超时处理
enable: boolean
// 超时执行的动作
- action?: number
+ type?: number
// 超时时间设置
timeDuration?: string
// 执行动作是自动提醒, 最大提醒次数
@@ -176,6 +176,21 @@ export enum RejectHandlerType {
*/
RETURN_USER_TASK = 2
}
+// 用户任务超时处理类型枚举
+export enum TimeoutHandlerType {
+ /**
+ * 自动提醒
+ */
+ REMINDER = 1,
+ /**
+ * 自动同意
+ */
+ APPROVE = 2,
+ /**
+ * 自动拒绝
+ */
+ REJECT = 3
+}
// 用户任务的审批人与发起人相同时,处理类型枚举
export enum AssignStartUserHandlerType {
/**
@@ -316,7 +331,7 @@ export const TIME_UNIT_TYPES: DictDataVO[] = [
{ label: '天', value: TimeUnitType.DAY }
]
// 超时处理执行动作类型
-export const TIMEOUT_HANDLER_ACTION_TYPES: DictDataVO[] = [
+export const TIMEOUT_HANDLER_TYPES: DictDataVO[] = [
{ label: '自动提醒', value: 1 },
{ label: '自动同意', value: 2 },
{ label: '自动拒绝', value: 3 }
diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts
index abb3510e..b4b3b37d 100644
--- a/src/components/SimpleProcessDesignerV2/src/node.ts
+++ b/src/components/SimpleProcessDesignerV2/src/node.ts
@@ -98,7 +98,7 @@ export type UserTaskFormType = {
rejectHandlerType?: RejectHandlerType
returnNodeId?: string
timeoutHandlerEnable?: boolean
- timeoutHandlerAction?: number
+ timeoutHandlerType?: number
assignStartUserHandlerType?: AssignStartUserHandlerType
timeDuration?: number
maxRemindCount?: number
@@ -131,7 +131,7 @@ export function useNodeForm(nodeType: NodeType) {
assignStartUserHandlerType: AssignStartUserHandlerType.START_USER_AUDIT,
returnNodeId: '',
timeoutHandlerEnable: false,
- timeoutHandlerAction: 1,
+ timeoutHandlerType: 1,
timeDuration: 6, // 默认 6小时
maxRemindCount: 1, // 默认 提醒 1次
buttonsSetting: []
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
index 77497e7f..b565fd37 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
@@ -227,15 +227,15 @@
@@ -370,13 +370,14 @@ import {
ApproveMethodType,
TimeUnitType,
RejectHandlerType,
- TIMEOUT_HANDLER_ACTION_TYPES,
+ TIMEOUT_HANDLER_TYPES,
TIME_UNIT_TYPES,
REJECT_HANDLER_TYPES,
DEFAULT_BUTTON_SETTING,
OPERATION_BUTTON_NAME,
ButtonSetting,
- ASSIGN_START_USER_HANDLER_TYPES
+ ASSIGN_START_USER_HANDLER_TYPES,
+ TimeoutHandlerType
} from '../consts'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import {
@@ -426,7 +427,7 @@ const formRules = reactive({
approveRatio: [{ required: true, message: '通过比例不能为空', trigger: 'blur' }],
returnNodeId: [{ required: true, message: '驳回节点不能为空', trigger: 'change' }],
timeoutHandlerEnable: [{ required: true }],
- timeoutHandlerAction: [{ required: true }],
+ timeoutHandlerType: [{ required: true }],
timeDuration: [{ required: true, message: '超时时间不能为空', trigger: 'blur' }],
maxRemindCount: [{ required: true, message: '提醒次数不能为空', trigger: 'blur' }]
})
@@ -482,8 +483,8 @@ const returnTaskList = ref([])
// 审批人超时未处理设置
const {
timeoutHandlerChange,
- cTimeoutAction,
- timeoutActionChanged,
+ cTimeoutType,
+ timeoutHandlerTypeChanged,
timeUnit,
timeUnitChange,
isoTimeDuration,
@@ -514,7 +515,7 @@ const saveConfig = async () => {
// 设置超时处理
currentNode.value.timeoutHandler = {
enable: configForm.value.timeoutHandlerEnable!,
- action: cTimeoutAction.value,
+ type: cTimeoutType.value,
timeDuration: isoTimeDuration.value,
maxRemindCount: cTimeoutMaxRemindCount.value
}
@@ -572,7 +573,7 @@ const showUserTaskNodeConfig = (node: SimpleFlowNode) => {
configForm.value.timeDuration = parseInt(parseTime)
timeUnit.value = convertTimeUnit(parseTimeUnit)
}
- configForm.value.timeoutHandlerAction = node.timeoutHandler?.action
+ configForm.value.timeoutHandlerType = node.timeoutHandler?.type
configForm.value.maxRemindCount = node.timeoutHandler?.maxRemindCount
// 1.5 设置用户任务的审批人与发起人相同时
configForm.value.assignStartUserHandlerType = node.assignStartUserHandlerType
@@ -619,21 +620,21 @@ function useTimeoutHandler() {
if (configForm.value.timeoutHandlerEnable) {
timeUnit.value = 2
configForm.value.timeDuration = 6
- configForm.value.timeoutHandlerAction = 1
+ configForm.value.timeoutHandlerType = 1
configForm.value.maxRemindCount = 1
}
}
// 超时执行的动作
- const cTimeoutAction = computed(() => {
+ const cTimeoutType = computed(() => {
if (!configForm.value.timeoutHandlerEnable) {
return undefined
}
- return configForm.value.timeoutHandlerAction
+ return configForm.value.timeoutHandlerType
})
// 超时处理动作改变
- const timeoutActionChanged = () => {
- if (configForm.value.timeoutHandlerAction === 1) {
+ const timeoutHandlerTypeChanged = () => {
+ if (configForm.value.timeoutHandlerType === TimeoutHandlerType.REMINDER) {
configForm.value.maxRemindCount = 1 // 超时提醒次数,默认为1
}
}
@@ -676,7 +677,7 @@ function useTimeoutHandler() {
if (!configForm.value.timeoutHandlerEnable) {
return undefined
}
- if (configForm.value.timeoutHandlerAction !== 1) {
+ if (configForm.value.timeoutHandlerType !== TimeoutHandlerType.REMINDER) {
return undefined
}
return configForm.value.maxRemindCount
@@ -684,8 +685,8 @@ function useTimeoutHandler() {
return {
timeoutHandlerChange,
- cTimeoutAction,
- timeoutActionChanged,
+ cTimeoutType,
+ timeoutHandlerTypeChanged,
timeUnit,
timeUnitChange,
isoTimeDuration,