审批详情评论类型

src/components/Flow/FlowNodeAvatar.vue

@@ -9,7 +9,7 @@
 			<UserFilled v-else />
 		</el-avatar>
 		<!-- <div v-if="showName && user && user.name" class="name" :style="NameStyle">{{ user.name }}</div> -->
-		<div class="name" :style="NameStyle">{{ name }}</div>
+		<div v-if="showName" class="name" :style="NameStyle">{{ name }}</div>
 	</div>
 </template>
 

src/views/approve/components/approvedContent.vue

@@ -46,15 +46,28 @@
 
 						<!--审批流-->
 						<el-timeline style="margin-left: 50px">
-							<el-timeline-item v-for="active in activeData" :key="active.id" hollow :timestamp="active.taskName" placement="top">
+							<el-timeline-item v-for="active in activeData" :key="active.id" hollow :timestamp="formatTimestamp(new Date(active.createTime))">
 								<template #dot>
 									<FlowTypeDot :status="active.taskState" :type="active.taskType" />
 								</template>
 
-								<div class="timeline-box flex-1">
+								<div v-show="active.type === 0" class="timeline-box flex-1">
+									<span style="font-size: 16px; color: #86909c; display: block; margin-bottom: 3px">评论</span>
 									<div class="flex flex-align-center">
 										<div class="timeline-box-user flex-1">
-											<FlowNodeAvatar id="1" />
+											{{ active.createBy }}
+											<div class="comment">
+												<div class="comment-content">{{ active.content }}</div>
+											</div>
+										</div>
+										<span class="timeline-box-date">{{ formatTimestamp(active.finishTime) }}</span>
+									</div>
+								</div>
+
+								<div v-show="active.type !== 0" class="timeline-box flex-1">
+									<div class="flex flex-align-center">
+										<div class="timeline-box-user flex-1">
+											<FlowNodeAvatar :name="active.createBy" />
 											<div class="comment">
 												<div class="comment-content">{{ active.duration }}</div>
 											</div>
@@ -296,7 +309,7 @@ const getTaskDetail = () => {
 		instanceId: cur.instanceId
 	})
 		.then(data => {
-			activeData.value = data
+			activeData.value = data.processApprovals
 			console.log(data, 'data.......')
 			// validateForm.value.origin = data
 			try {
@@ -479,4 +492,16 @@ watch(
 		padding: 0 20px;
 	}
 }
+
+.comment-content {
+	user-select: none;
+	margin-top: 4px;
+	padding: 8px;
+	border-radius: 4px;
+	background-color: #f8f8fa;
+}
+
+.timeline-box {
+	margin-left: 5px;
+}
 </style>