Merge remote-tracking branch 'origin/master'

src/views/approve/approved/index.vue

@@ -17,13 +17,18 @@
 					<el-button type="primary">操作已审批</el-button>
 				</template>
 
+				<template #currentNodeSlot="scope">
+					<div v-if="scope.row.currentNode === 'complete'">-</div>
+					<div v-else>{{ scope.row.currentNode }}</div>
+				</template>
+
 				<template #instanceStateSlot="scope">
 					<el-tag v-if="scope.row.instanceState === 0" size="small" effect="plain">审批中</el-tag>
 					<el-tag v-if="scope.row.instanceState === 1" size="small" type="info" effect="plain">审批通过</el-tag>
 					<el-tag v-if="scope.row.instanceState === 2" size="small" type="warning" effect="plain">审批拒绝</el-tag>
-					<el-tag v-if="scope.row.instanceState === 2" size="small" type="warning" effect="plain">撤销审批</el-tag>
-					<el-tag v-if="scope.row.instanceState === 2" size="small" type="warning" effect="plain">超时结束</el-tag>
-					<el-tag v-if="scope.row.instanceState === 2" size="small" type="warning" effect="plain">强制终止</el-tag>
+					<el-tag v-if="scope.row.instanceState === 3" size="small" type="warning" effect="plain">撤销审批</el-tag>
+					<el-tag v-if="scope.row.instanceState === 4" size="small" type="warning" effect="plain">超时结束</el-tag>
+					<el-tag v-if="scope.row.instanceState === 5" size="small" type="warning" effect="plain">强制终止</el-tag>
 				</template>
 
 				<template #actionSlot="scope">
@@ -91,6 +96,14 @@ const columns = [
 		label: '流程名称',
 		minWidth: 80
 	},
+	{
+		prop: 'currentNode',
+		label: '当前所在节点',
+		minWidth: 80,
+		slots: {
+			default: 'currentNodeSlot'
+		}
+	},
 	{
 		prop: 'instanceState',
 		label: '流程状态',
@@ -101,12 +114,30 @@ const columns = [
 	},
 	{
 		prop: 'createBy',
-		label: '发布人',
+		label: '发起人',
 		minWidth: 100
 	},
 	{
 		prop: 'createTime',
-		label: '发布时间',
+		label: '发起时间',
+		minWidth: 126
+	},
+	{
+		prop: 'endTime',
+		label: '结束时间',
+		minWidth: 126
+	},
+	{
+		prop: 'duration',
+		label: '处理耗时',
+		minWidth: 100,
+		slots: {
+			default: 'durationSlot'
+		}
+	},
+	{
+		prop: 'expireTime',
+		label: '期望完成时间',
 		minWidth: 126
 	},
 	{