diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
index c7152001..f36afd60 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
@@ -17,42 +17,21 @@
-
-
-
-
-
- {{ task.assigneeUser.nickname.substring(0, 1) }}
-
-
-
+
+ {{ task.assigneeUser.nickname.substring(0, 1) }}
+
+
-
-
-
-
- {{ task.ownerUser.nickname.substring(0, 1) }}
-
-
+ :src="task.ownerUser.avatar"
+ />
+
+ {{ task.ownerUser.nickname.substring(0, 1) }}
+
{{ task.ownerUser.nickname }}
-
@@ -131,20 +106,6 @@
>
{{ getApprovalNodeTime(activity) }}
-
-
-
@@ -219,8 +180,11 @@ const getApprovalNodeColor = (taskStatus: number) => {
}
const getApprovalNodeTime = (node: ProcessInstanceApi.ApprovalNodeInfo) => {
+ if (node.nodeType === NodeType.START_USER_NODE && node.startTime) {
+ return `发起时间:${formatDate(node.startTime)}`
+ }
if (node.endTime) {
- return `结束时间:${formatDate(node.endTime)}`
+ return `审批时间:${formatDate(node.endTime)}`
}
if (node.startTime) {
return `创建时间:${formatDate(node.startTime)}`
diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue
index 204746c3..ab04d4a9 100644
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -42,7 +42,7 @@