优化显示图标及流程实例状态位调整

src/components/Flow/FlowStatusStamp.vue

@@ -1,9 +1,11 @@
 <template>
 	<div class="flow-stamp-container">
-		<img v-if="status == FlowStatusEnum.APPROVED" :style="style" src="@/assets/images/flw03.svg" />
-		<img v-else-if="status == FlowStatusEnum.REJECTED" :style="style" src="@/assets/images/flw04.svg" />
-		<img v-else-if="status == FlowStatusEnum.UNDERWAY" :style="style" src="@/assets/images/flw01.svg" />
-		<img v-else-if="status == FlowStatusEnum.CANCELLED" :style="style" src="@/assets/images/flw02.svg" />
+		<img v-if="status == FlowStatusEnum.ACTIVE" :style="style" src="@/assets/images/flw01.svg" />
+		<img v-else-if="status == FlowStatusEnum.COMPLETE" :style="style" src="@/assets/images/flw03.svg" />
+		<img v-else-if="status == FlowStatusEnum.REJECT" :style="style" src="@/assets/images/flw04.svg" />
+		<img v-else-if="status == FlowStatusEnum.REVOKE" :style="style" src="@/assets/images/flw02.svg" />
+		<img v-else-if="status == FlowStatusEnum.TIMEOUT" :style="style" src="@/assets/images/flw05.svg" />
+		<img v-else-if="status == FlowStatusEnum.TERMINATE" :style="style" src="@/assets/images/flw06.svg" />
 	</div>
 </template>
 

src/components/Flow/FlowStatusTag.vue

@@ -1,9 +1,11 @@
 <template>
 	<div class="status">
-		<el-tag v-if="status == FlowStatusEnum.APPROVED" type="success">已通过</el-tag>
-		<el-tag v-else-if="status == FlowStatusEnum.REJECTED" type="danger">不通过</el-tag>
-		<el-tag v-else-if="status == FlowStatusEnum.UNDERWAY">审批中</el-tag>
-		<el-tag v-else-if="status == FlowStatusEnum.CANCELLED" type="warning">已撤销</el-tag>
+		<el-tag v-if="status == FlowStatusEnum.COMPLETE" type="success">已通过</el-tag>
+		<el-tag v-else-if="status == FlowStatusEnum.REJECT" type="danger">不通过</el-tag>
+		<el-tag v-else-if="status == FlowStatusEnum.ACTIVE">审批中</el-tag>
+		<el-tag v-else-if="status == FlowStatusEnum.REVOKE" type="warning">已撤销</el-tag>
+		<el-tag v-else-if="status == FlowStatusEnum.TIMEOUT" type="danger">超时结束</el-tag>
+		<el-tag v-else-if="status == FlowStatusEnum.TERMINATE" type="danger">强制终止</el-tag>
 	</div>
 </template>
 

src/components/Flow/enums.ts

@@ -1,13 +1,17 @@
 /** 流程状态 */
 export const enum FlowStatusEnum {
 	/** 审批中 */
-	UNDERWAY,
-	/** 已通过 */
-	APPROVED,
-	/** 不通过 */
-	REJECTED,
-	/** 已撤销 */
-	CANCELLED
+	ACTIVE,
+	/** 审批通过 */
+	COMPLETE,
+	/** 审批拒绝 */
+	REJECT,
+	/** 撤销审批 */
+	REVOKE,
+	/** 超时结束 */
+	TIMEOUT,
+	/** 强制终止 */
+	TERMINATE
 }
 
 /** 任务类型 */

src/views/approve/components/approvedContent.vue

@@ -11,12 +11,12 @@
 				<!-- 1、头部信息 -->
 				<div class="flow-status-stamp">
 					<div class="flow-stamp-container">
-						<FlowStatusStamp :status="0" />
+						<FlowStatusStamp :status="currentTaskRow.instanceState" />
 					</div>
 				</div>
 
 				<div class="flow-header-box">
-					<div class="flow-no">编号：{{ currentTaskRow.taskId }}</div>
+					<div class="flow-no">编号：{{ currentTaskRow.instanceId }}</div>
 					<div class="action-area">
 						<div class="action-item"></div>
 					</div>
@@ -306,7 +306,8 @@ const getTaskDetail = () => {
 	validateForm.value.loading = true
 	processTaskApprovalInfo({
 		taskId: cur.taskId,
-		instanceId: cur.instanceId
+		instanceId: cur.instanceId,
+		instanceState: cur.instanceState
 	})
 		.then(data => {
 			activeData.value = data.processApprovals