diff --git a/src/api/bpm/task/index.ts b/src/api/bpm/task/index.ts index d4c10380f..a818ae5aa 100644 --- a/src/api/bpm/task/index.ts +++ b/src/api/bpm/task/index.ts @@ -4,6 +4,10 @@ import request from '@/config/axios' * 任务状态枚举 */ export enum TaskStatusEnum { + /** + * 跳过 + */ + SKIP = -2, /** * 未开始 */ diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts index 8cdc99651..6475009de 100644 --- a/src/components/SimpleProcessDesignerV2/src/consts.ts +++ b/src/components/SimpleProcessDesignerV2/src/consts.ts @@ -131,6 +131,8 @@ export interface SimpleFlowNode { signEnable?: boolean // 审批意见 reasonRequire?: boolean + // 跳过表达式 + skipExpression?: string // 触发器设置 triggerSetting?: TriggerSetting // 子流程 diff --git a/src/components/SimpleProcessDesignerV2/src/node.ts b/src/components/SimpleProcessDesignerV2/src/node.ts index 5b754bfac..73534f6a1 100644 --- a/src/components/SimpleProcessDesignerV2/src/node.ts +++ b/src/components/SimpleProcessDesignerV2/src/node.ts @@ -177,6 +177,7 @@ export type UserTaskFormType = { } signEnable: boolean reasonRequire: boolean + skipExpression?: string } export type CopyTaskFormType = { diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue index 433864b02..53058c406 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue @@ -411,6 +411,12 @@ /> +
+ 跳过表达式 + + + +
@@ -770,6 +776,8 @@ const saveConfig = async () => { currentNode.value.signEnable = configForm.value.signEnable // 审批意见 currentNode.value.reasonRequire = configForm.value.reasonRequire + // 跳过表达式 + currentNode.value.skipExpression = configForm.value.skipExpression currentNode.value.showText = showText settingVisible.value = false @@ -851,6 +859,8 @@ const showUserTaskNodeConfig = (node: SimpleFlowNode) => { configForm.value.signEnable = node?.signEnable ?? false // 7. 审批意见 configForm.value.reasonRequire = node?.reasonRequire ?? false + // 8. 跳过表达式 + configForm.value.skipExpression = node?.skipExpression ?? '' } defineExpose({ openDrawer, showUserTaskNodeConfig }) // 暴露方法给父组件 diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue index 6b80b4e4d..bf253fbaf 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue @@ -28,7 +28,8 @@
-
{{ activity.name }}
+
{{ activity.name }} 【跳过】 +