Prechádzať zdrojové kódy

流程详情页面 修改部分状态图标

jiawenlong 1 rok pred
rodič
commit
a672197a8d

+ 14 - 5
src/components/Flow/FlowTypeDot.vue

@@ -17,14 +17,23 @@
 
 		<!-- 状态 -->
 		<div class="badge">
-			<template v-if="type === 3">
-				<svg-icon icon-class="reject" />
+			<template v-if="type === 1">
+				<svg-icon icon-class="approval"/>
 			</template>
-			<template v-else-if="status === 1">
-				<svg-icon icon-class="active" color="#2a5eff" />
+			<template v-else-if="type === 2">
+				<svg-icon icon-class="active"/>
+			</template>
+			<template v-else-if="type === 3">
+				<svg-icon icon-class="approval"/>
+			</template>
+			<template v-else-if="type === 4">
+				<svg-icon icon-class="reject"/>
+			</template>
+			<template v-else-if="type === 15">
+				<svg-icon icon-class="close_all"/>
 			</template>
 			<template v-else>
-				<svg-icon icon-class="approval" />
+				<svg-icon icon-class="approval"/>
 			</template>
 		</div>
 	</div>

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

@@ -56,7 +56,7 @@
 						<el-timeline style="margin-left: 50px">
 							<el-timeline-item v-for="active in activeData" :key="active.id" hollow :timestamp="active.local_timestamp">
 								<template #dot>
-									<FlowTypeDot :status="active.id ? 0 : 1" :type="active.taskType" :name="active.createBy" />
+									<FlowTypeDot :status="active.id ? 0 : 1" :type="active.type" :name="active.createBy" />
 								</template>
 								<div v-show="active.type === 0" class="timeline-box flex-1">
 									<span style="color: #86909c; display: block; margin-bottom: 3px; padding-left: 4px">评论</span>

+ 1 - 1
src/views/approve/pendingApproval/detail.vue

@@ -37,7 +37,7 @@
 					<el-timeline style="margin-left: 50px">
 						<el-timeline-item v-for="active in activeData" :key="active.id" hollow :timestamp="active.taskName" placement="top">
 							<template #dot>
-								<FlowTypeDot :status="active.taskState" :type="active.taskType" />
+								<FlowTypeDot :status="active.taskState" :type="active.type" />
 							</template>
 
 							<div class="timeline-box flex-1">