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 || '待检查',