From 96ae9709cdc528f52f1446277b3f276d702a3885 Mon Sep 17 00:00:00 2001
From: yuance <182865460@qq.com>
Date: Sun, 23 Nov 2025 18:09:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E5=86=85=E5=AE=B91-=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=85=AB=E9=A1=B9=E8=A7=84=E5=AE=9A=E7=9B=B8=E5=85=B3=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/data/table1Columns.ts          | 39 +++++++++++--------
 .../pwlProject/components/reportContent.vue   |  2 +-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/views/pwl/pwlProject/components/data/table1Columns.ts b/src/views/pwl/pwlProject/components/data/table1Columns.ts
index cfec70b..76f18e4 100644
--- a/src/views/pwl/pwlProject/components/data/table1Columns.ts
+++ b/src/views/pwl/pwlProject/components/data/table1Columns.ts
@@ -345,34 +345,39 @@ export const columns2 = [
 ];
 
 export const columns3 = [
-  {
-    title: '审计内容',
-    dataIndex: 'title',
-    key: '',
-    align: 'center',
-    customCell: (_, index) => {
-      if (index === 0) return { rowSpan: 8 };
-      else if (index === 8) return { rowSpan: 30 };
-      return { rowSpan: 0 };
-    }
-  },
+    {
+      title: '审计内容',
+      dataIndex: 'title',
+      key: 'title',
+      align: 'center',
+      width: 120,
+      // customCell: (_, index) => {
+      //   // 保持原有的行合并逻辑
+      //   if (index === 0) return { rowSpan: 8 };
+      //   else if (index === 8) return { rowSpan: 30 };
+      //   return { rowSpan: 0 };
+      // }
+    },
   {
     title: '审计内容',
     dataIndex: 'content',
-    key: '',
-    align: 'center'
+    key: 'content',
+    align: 'center',
+    width: 200
   },
   {
     title: '检查的证据及测试内容',
     dataIndex: 'testContent',
-    key: '',
-    align: 'center'
+    key: 'testContent',
+    align: 'center',
+    width: 300
   },
   {
     title: '测试结果',
     dataIndex: 'result',
-    key: '',
-    align: 'center'
+    key: 'result',
+    align: 'center',
+    width: 100
   },
   {
     title: '工作底稿索引',
diff --git a/src/views/pwl/pwlProject/components/reportContent.vue b/src/views/pwl/pwlProject/components/reportContent.vue
index 612e3ed..257a7d9 100644
--- a/src/views/pwl/pwlProject/components/reportContent.vue
+++ b/src/views/pwl/pwlProject/components/reportContent.vue
@@ -1306,7 +1306,7 @@
   const mapEightRegData = (data: any[]) => {
     return data.map((item, index) => ({
       key: index,
-      title: item.title || '',
+      title: item.categoryOrder || item.title || '',
       content: item.content || '',
       testContent: item.testContent || '',
       result: item.result || '待检查',