|
|
@@ -24,8 +24,11 @@
|
|
|
{{ getNameByWorkid(row.workshopId, row.workspaceId, locationOptions) }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column v-if="!isShowTab" label="时间" prop="createdAt" width="250"></el-table-column>
|
|
|
- <el-table-column v-if="isShowTab" label="时间" prop="issueTime" width="250"></el-table-column>
|
|
|
+ <el-table-column label="时间" prop="tableTime" width="250">
|
|
|
+ <template #default="{ row }">
|
|
|
+ {{ getTimeByTab(row.issueTime, row.createdAt) }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="负责人" prop="personNameInCharge" width="100"></el-table-column>
|
|
|
<el-table-column label="处理状态" prop="issueState">
|
|
|
<template #default="{ row }">
|
|
|
@@ -68,6 +71,7 @@ interface DataSourceItem {
|
|
|
description: String, // 问题描述
|
|
|
workspaceId: Number[], // 工位id(地点=车间+工位?)
|
|
|
createdAt: String,
|
|
|
+ issueTime: String,
|
|
|
personNameInCharge: String,
|
|
|
issueState: Number, // 问题单状态:1-待审核、2-待处理、3-待复核、4-已退回、5-已处理
|
|
|
};
|
|
|
@@ -105,6 +109,11 @@ const handleDelete = (row) => {
|
|
|
props.onDelete(row);
|
|
|
};
|
|
|
|
|
|
+const getTimeByTab = (issueTime, createTime) => {
|
|
|
+ if (issueTime) return issueTime;
|
|
|
+ else return createTime;
|
|
|
+}
|
|
|
+
|
|
|
const colorOfState = ({ row, columnIndex }) => {
|
|
|
if (columnIndex === 7) {
|
|
|
if (row.issueState === 4) return { color: "#FF4D4F" };
|