diff --git a/src/assets/svgs/bpm/finish.svg b/src/assets/svgs/bpm/finish.svg new file mode 100644 index 00000000..674c6df6 --- /dev/null +++ b/src/assets/svgs/bpm/finish.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue new file mode 100644 index 00000000..e56c75e3 --- /dev/null +++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue @@ -0,0 +1,278 @@ + + + + diff --git a/src/views/bpm/processInstance/create/index_new.vue b/src/views/bpm/processInstance/create/index_new.vue new file mode 100644 index 00000000..fae0d768 --- /dev/null +++ b/src/views/bpm/processInstance/create/index_new.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue index 7c87d55f..62b8eafb 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue @@ -15,6 +15,7 @@ >
@@ -131,11 +132,18 @@ import auditorSvg from '@/assets/svgs/bpm/auditor.svg' import copySvg from '@/assets/svgs/bpm/copy.svg' import conditionSvg from '@/assets/svgs/bpm/condition.svg' import parallelSvg from '@/assets/svgs/bpm/parallel.svg' +import finishSvg from '@/assets/svgs/bpm/finish.svg' defineOptions({ name: 'BpmProcessInstanceTimeline' }) -defineProps<{ - approveNodes: ProcessInstanceApi.ApprovalNodeInfo[] // 审批节点信息 -}>() +withDefaults( + defineProps<{ + approveNodes: ProcessInstanceApi.ApprovalNodeInfo[] // 审批节点信息 + showStatusIcon?: boolean // 是否显示头像右下角状态图标 + }>(), + { + showStatusIcon: true // 默认值为 true + } +) // 审批节点 const statusIconMap2 = { @@ -180,6 +188,8 @@ const statusIconMap = { } const nodeTypeSvgMap = { + // 结束节点 + [NodeType.END_EVENT_NODE]: { color: '#ffffff', svg: finishSvg }, // 发起人节点 [NodeType.START_USER_NODE]: { color: '#ffffff', svg: starterSvg }, // 审批人节点