feat(test-report): 添加报告任务状态字段,移除列表中多余的字段。
This commit is contained in:
@@ -26,6 +26,7 @@ export namespace ReportTask {
|
|||||||
checkerName?: string | null
|
checkerName?: string | null
|
||||||
checkTime?: string | null
|
checkTime?: string | null
|
||||||
checkResult?: string | null
|
checkResult?: string | null
|
||||||
|
state?: ReportTaskState | string | null
|
||||||
status?: number
|
status?: number
|
||||||
pointCount?: number | null
|
pointCount?: number | null
|
||||||
groupCount?: number | null
|
groupCount?: number | null
|
||||||
|
|||||||
@@ -85,7 +85,7 @@
|
|||||||
|
|
||||||
<script setup lang="tsx">
|
<script setup lang="tsx">
|
||||||
import { Delete, Download, Edit, Plus, Upload, View } from '@element-plus/icons-vue'
|
import { Delete, Download, Edit, Plus, Upload, View } from '@element-plus/icons-vue'
|
||||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
import { ElMessage, ElMessageBox, ElTag } from 'element-plus'
|
||||||
import { computed, onMounted, reactive, ref } from 'vue'
|
import { computed, onMounted, reactive, ref } from 'vue'
|
||||||
import type { Dict, ResPage } from '@/api/interface'
|
import type { Dict, ResPage } from '@/api/interface'
|
||||||
import ProTable from '@/components/ProTable/index.vue'
|
import ProTable from '@/components/ProTable/index.vue'
|
||||||
@@ -119,6 +119,8 @@ import {
|
|||||||
buildDictSelectOptions,
|
buildDictSelectOptions,
|
||||||
buildOptionLabelMap,
|
buildOptionLabelMap,
|
||||||
getReportTaskErrorMessage,
|
getReportTaskErrorMessage,
|
||||||
|
getReportTaskStateTagType,
|
||||||
|
getReportTaskStateText,
|
||||||
normalizeReportTaskGroupReportList,
|
normalizeReportTaskGroupReportList,
|
||||||
normalizeReportTaskListParams,
|
normalizeReportTaskListParams,
|
||||||
normalizeReportTaskPage,
|
normalizeReportTaskPage,
|
||||||
@@ -208,24 +210,14 @@ const columns = reactive<ColumnProps<ReportTask.ReportTaskRecord>[]>([
|
|||||||
minWidth: 160,
|
minWidth: 160,
|
||||||
render: ({ row }) => resolveReportTaskCreateUnitText(row.createUnit, companyLabelMap.value)
|
render: ({ row }) => resolveReportTaskCreateUnitText(row.createUnit, companyLabelMap.value)
|
||||||
},
|
},
|
||||||
{ prop: 'contractNumber', label: '合同编号', minWidth: 150, render: ({ row }) => resolveReportTaskText(row.contractNumber) },
|
|
||||||
{
|
{
|
||||||
prop: 'standard',
|
prop: 'state',
|
||||||
label: '测试依据',
|
label: '报告状态',
|
||||||
minWidth: 220,
|
minWidth: 120,
|
||||||
showOverflowTooltip: true,
|
render: ({ row }) => <ElTag type={getReportTaskStateTagType(row.state)}>{getReportTaskStateText(row.state)}</ElTag>
|
||||||
render: ({ row }) => resolveReportTaskStandardText(row.standard, standardLabelMap.value)
|
|
||||||
},
|
},
|
||||||
{ prop: 'pointCount', label: '监测点数', minWidth: 100, render: ({ row }) => resolveReportTaskText(row.pointCount) },
|
|
||||||
{ prop: 'groupCount', label: '分组数', minWidth: 100, render: ({ row }) => resolveReportTaskText(row.groupCount) },
|
|
||||||
{ prop: 'phonenumber', label: '联系电话', minWidth: 140, render: ({ row }) => resolveReportTaskText(row.phonenumber) },
|
|
||||||
{ prop: 'checkerName', label: '审核人', minWidth: 120, render: ({ row }) => resolveReportTaskText(row.checkerName) },
|
|
||||||
{ prop: 'checkTime', label: '审核时间', minWidth: 120, render: ({ row }) => resolveReportTaskText(row.checkTime) },
|
|
||||||
{ prop: 'checkResult', label: '审核意见', minWidth: 200, showOverflowTooltip: true, render: ({ row }) => resolveReportTaskText(row.checkResult) },
|
|
||||||
{ prop: 'createByName', label: '创建人', minWidth: 120, render: ({ row }) => resolveReportTaskText(row.createByName || row.createBy) },
|
{ prop: 'createByName', label: '创建人', minWidth: 120, render: ({ row }) => resolveReportTaskText(row.createByName || row.createBy) },
|
||||||
{ prop: 'createTime', label: '创建时间', minWidth: 170, render: ({ row }) => resolveReportTaskText(row.createTime) },
|
{ prop: 'createTime', label: '创建时间', minWidth: 170, render: ({ row }) => resolveReportTaskText(row.createTime) },
|
||||||
{ prop: 'updateByName', label: '更新人', minWidth: 120, isShow: false, render: ({ row }) => resolveReportTaskText(row.updateByName || row.updateBy) },
|
|
||||||
{ prop: 'updateTime', label: '更新时间', minWidth: 170, isShow: false, render: ({ row }) => resolveReportTaskText(row.updateTime) },
|
|
||||||
{ prop: 'operation', label: '操作', fixed: 'right', width: 360 }
|
{ prop: 'operation', label: '操作', fixed: 'right', width: 360 }
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user