From 48ab2567c602a519b14e856cec1e8ecb3d9e1316 Mon Sep 17 00:00:00 2001
From: dk <1260500659@qq.com>
Date: Tue, 21 Jul 2026 09:15:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(test-report):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aireport/testReport/interface/index.ts    |  1 +
 .../src/views/aireport/testReport/index.vue   | 22 ++++++-------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/frontend/src/api/aireport/testReport/interface/index.ts b/frontend/src/api/aireport/testReport/interface/index.ts
index 7edb995..8a2a657 100644
--- a/frontend/src/api/aireport/testReport/interface/index.ts
+++ b/frontend/src/api/aireport/testReport/interface/index.ts
@@ -26,6 +26,7 @@ export namespace ReportTask {
         checkerName?: string | null
         checkTime?: string | null
         checkResult?: string | null
+        state?: ReportTaskState | string | null
         status?: number
         pointCount?: number | null
         groupCount?: number | null
diff --git a/frontend/src/views/aireport/testReport/index.vue b/frontend/src/views/aireport/testReport/index.vue
index 9d90b40..cc265bc 100644
--- a/frontend/src/views/aireport/testReport/index.vue
+++ b/frontend/src/views/aireport/testReport/index.vue
@@ -85,7 +85,7 @@
 
 <script setup lang="tsx">
 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 type { Dict, ResPage } from '@/api/interface'
 import ProTable from '@/components/ProTable/index.vue'
@@ -119,6 +119,8 @@ import {
     buildDictSelectOptions,
     buildOptionLabelMap,
     getReportTaskErrorMessage,
+    getReportTaskStateTagType,
+    getReportTaskStateText,
     normalizeReportTaskGroupReportList,
     normalizeReportTaskListParams,
     normalizeReportTaskPage,
@@ -208,24 +210,14 @@ const columns = reactive<ColumnProps<ReportTask.ReportTaskRecord>[]>([
         minWidth: 160,
         render: ({ row }) => resolveReportTaskCreateUnitText(row.createUnit, companyLabelMap.value)
     },
-    { prop: 'contractNumber', label: '合同编号', minWidth: 150, render: ({ row }) => resolveReportTaskText(row.contractNumber) },
     {
-        prop: 'standard',
-        label: '测试依据',
-        minWidth: 220,
-        showOverflowTooltip: true,
-        render: ({ row }) => resolveReportTaskStandardText(row.standard, standardLabelMap.value)
+    prop: 'state',
+    label: '报告状态',
+    minWidth: 120,
+    render: ({ row }) => <ElTag type={getReportTaskStateTagType(row.state)}>{getReportTaskStateText(row.state)}</ElTag>
     },
-    { 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: '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 }
 ])