Эх сурвалжийг харах

发起审批新增终止节点

xlsea 1 жил өмнө
parent
commit
18f2e7f714

+ 9 - 1
src/components/Flow/FlowTypeDot.vue

@@ -11,7 +11,7 @@
 		</template>
 		</template>
 
 
 		<!-- 状态 -->
 		<!-- 状态 -->
-		<div class="badge">
+		<!-- <div class="badge">
 			<template v-if="status === TaskStatusEnum.ACTIVE">
 			<template v-if="status === TaskStatusEnum.ACTIVE">
 				<svg-icon color="#2A5EFF" icon-class="active" />
 				<svg-icon color="#2A5EFF" icon-class="active" />
 			</template>
 			</template>
@@ -24,6 +24,14 @@
 			<template v-else-if="status === TaskStatusEnum.REJECT">
 			<template v-else-if="status === TaskStatusEnum.REJECT">
 				<svg-icon icon-class="reject" />
 				<svg-icon icon-class="reject" />
 			</template>
 			</template>
+		</div> -->
+		<div class="badge">
+			<template v-if="type === 3">
+				<svg-icon icon-class="reject" />
+			</template>
+			<template v-else>
+				<svg-icon icon-class="approval" />
+			</template>
 		</div>
 		</div>
 	</div>
 	</div>
 </template>
 </template>

+ 1 - 2
src/views/approve/components/approvedContent.vue

@@ -30,7 +30,7 @@
 							<FlowStatusTag :status="0" />
 							<FlowStatusTag :status="0" />
 						</div>
 						</div>
 						<div class="initiator-info">
 						<div class="initiator-info">
-							<FlowNodeAvatar id="1" />
+							<FlowNodeAvatar :name="currentTaskRow.createBy" />
 							<div class="begin-time">{{ currentTaskRow.createTime }} 提交</div>
 							<div class="begin-time">{{ currentTaskRow.createTime }} 提交</div>
 						</div>
 						</div>
 					</div>
 					</div>
@@ -50,7 +50,6 @@
 								<template #dot>
 								<template #dot>
 									<FlowTypeDot :status="active.taskState" :type="active.taskType" />
 									<FlowTypeDot :status="active.taskState" :type="active.taskType" />
 								</template>
 								</template>
-
 								<div v-show="active.type === 0" 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>
 									<span style="font-size: 16px; color: #86909c; display: block; margin-bottom: 3px">评论</span>
 									<div class="flex flex-align-center">
 									<div class="flex flex-align-center">

+ 3 - 0
src/views/approve/launch/ItemDrawer.vue

@@ -42,6 +42,9 @@
 						</div>
 						</div>
 					</template>
 					</template>
 				</el-timeline-item>
 				</el-timeline-item>
+				<el-timeline-item>
+					<div style="padding-bottom: 6px">结束</div>
+				</el-timeline-item>
 			</el-timeline>
 			</el-timeline>
 			<el-divider></el-divider>
 			<el-divider></el-divider>
 		</div>
 		</div>