From ab2429ca5919ee7b41c7086168e3c3b629c51ac6 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Sat, 7 Mar 2026 13:03:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?=
 =?UTF-8?q?ate]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/CustomTable.vue            | 73 +++++++++++++++-------
 src/components/Template/HandleFormItem.vue         |  2 +-
 .../business/comps/template/comps/dl/DL006.vue     |  3 +-
 3 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 6306137..8d7ae3d 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -14,30 +14,34 @@
 					</div>
 					<div v-for="(col, colIndex) in columns" :key="colIndex" class="custom-table-cell header-cell"
 						:style="getCellWidth(col)">
-						<div class="header-cell-content" v-if = "col.headerColumns && col.headerColumns.length > 0">
-							<div class="header-columns-grid" :style="{ 'grid-template-columns': `repeat(${col.span || 2}, 1fr)` }">
-								<div v-for="(headerCol, headerIndex) in col.headerColumns" :key="headerIndex" class="header-column-item">
+						<div class="header-cell-content" v-if="col.headerColumns && col.headerColumns.length > 0">
+							<div class="header-columns-grid"
+								:style="{ 'grid-template-columns': `repeat(${col.span || 2}, 1fr)` }">
+								<div v-for="(headerCol, headerIndex) in col.headerColumns" :key="headerIndex"
+									class="header-column-item">
 									<template v-if="headerCol.type === 'span'">
 										<div class="span-content">{{ $t(headerCol.label) }}</div>
 									</template>
 									<template v-else-if="headerCol.type === 'sj'">
-										<HandleFormItem :fieldKey="prefixKey+colIndex + '_' + headerCol.key + '_' + headerIndex"
-										:fieldItemLabel="fieldItemLabel" :type="headerCol.type" class="body-clickable"
-										sourceFrom="customTable" :item="getHeaderColumnItem(headerCol)"
-										:value="headerFields[`${colIndex}_${headerIndex}`]"
-										@onRegentSubmit="(data, inputValue) => onHeaderRegentSubmit(data, inputValue, colIndex, headerIndex)"
-										/>
+										<HandleFormItem
+											:fieldKey="prefixKey + colIndex + '_' + headerCol.key + '_' + headerIndex"
+											:fieldItemLabel="fieldItemLabel" :type="headerCol.type"
+											class="body-clickable" sourceFrom="customTable"
+											:item="getHeaderColumnItem(headerCol)"
+											:value="headerFields[`${colIndex}_${headerIndex}`]"
+											:error="hasHeaderError(colIndex, headerIndex, headerCol.key)"
+											@update:error="onHeaderColumnErrorUpdate(colIndex, headerIndex, headerCol.key, $event)" 
+											@onRegentSubmit="(data, inputValue) => onHeaderRegentSubmit(data, inputValue, colIndex, headerIndex)" />
 									</template>
 									<template v-else-if="headerCol.type === 'input' || headerCol.type === 'select'">
-										<HandleFormItem 
+										<HandleFormItem
 											:fieldKey="prefixKey + '_header_' + colIndex + '_' + headerIndex"
-											:fieldItemLabel="fieldItemLabel"
-											:type="headerCol.type"
+											:fieldItemLabel="fieldItemLabel" :type="headerCol.type"
 											:item="getHeaderColumnItem(headerCol)"
 											v-model="headerFields[`${colIndex}_${headerIndex}`]"
 											@change="onHeaderColumnChange(colIndex, headerIndex, headerCol, $event)"
-											:error="hasHeaderError(colIndex, headerIndex, `${colIndex}_${headerIndex}`)"
-											@update:error="onHeaderColumnErrorUpdate(colIndex, headerIndex, `${colIndex}_${headerIndex}`, $event)" />
+											:error="hasHeaderError(colIndex, headerIndex, headerCol.key)"
+											@update:error="onHeaderColumnErrorUpdate(colIndex, headerIndex, headerCol.key, $event)" />
 									</template>
 								</div>
 							</div>
@@ -231,7 +235,7 @@ import HandleFormItem from "./HandleFormItem.vue";
 import { isEqual } from "@/utils/index.js";
 import { isShowOther } from "@/utils/formPackageCommon.js";
 import { EventBus } from "@/utils/eventBus";
-import { getuuid,justUpdateFilledFormData } from "@/utils/index.js";
+import { getuuid, justUpdateFilledFormData } from "@/utils/index.js";
 import { isRegent } from "@/utils/index.js";
 import { isValueEmpty } from '@/utils/index.js';
 
@@ -355,24 +359,25 @@ export default {
 				options: headerCol.options,
 				maxlength: headerCol.maxlength,
 				checkType: headerCol.checkType,
-                regentFillType: headerCol.regentFillType,
-				type:headerCol.type,
+				regentFillType: headerCol.regentFillType,
+				type: headerCol.type,
 			};
 		},
 
 		onHeaderColumnChange(colIndex, headerIndex, headerCol, value) {
 			const fieldKey = `${colIndex}_${headerIndex}`;
 			this.headerFields[fieldKey] = value;
-			this.$emit('headerColumnChange', { 
+			this.$emit('headerColumnChange', {
 				colIndex,
 				headerIndex,
-				key: fieldKey, 
-				value, 
-				headerFields: this.headerFields 
+				key: fieldKey,
+				value,
+				headerFields: this.headerFields
 			});
 		},
 
 		hasHeaderError(colIndex, headerIndex, key) {
+			console.log(colIndex, headerIndex, key,this.formErrors,"headerError")
 			return this.formErrors.some(error =>
 				error.rowIndex === -1 &&
 				error.colIndex === colIndex &&
@@ -484,7 +489,9 @@ export default {
 		},
 		onHeaderRegentSubmit(data, inputValue, colIndex, headerIndex) {
 			this.headerFields[`${colIndex}_${headerIndex}`] = inputValue;
-			this.$emit("onHeaderRegentSubmit", { selectInfo: data, key: col.prop, col, rowIndex, colIndex, rowData: row })
+			console.log("onHeaderRegentSubmit", data, inputValue, colIndex, headerIndex,this.headerFields)
+
+			this.$emit("onHeaderRegentSubmit", { selectInfo: data, headerIndex, colIndex, headerFields: this.headerFields })
 		},
 		onRegentSubmit(data, inputValue, col, rowIndex, colIndex, row) {
 			// if (this.templateFillType !== 'actFill') {
@@ -558,6 +565,7 @@ export default {
 
 			// 校验表头的 HandleFormItem
 			this.columns.forEach((col, colIndex) => {
+				console.log(col.headerColumns, col, "ttt")
 				if (col.headerSelectKey && col.headerOptions && col.fillType === this.templateFillType) {
 					const headerValue = this.headerSelectFields[col.headerSelectKey];
 					if (isValueEmpty(headerValue)) {
@@ -571,6 +579,26 @@ export default {
 						errors.push(errorItem);
 						this.formErrors.push(errorItem);
 					}
+				} else if (col.headerColumns && col.headerColumns.length > 0) {
+					col.headerColumns.forEach((headerCol, headerColIndex) => {
+						const headerValue = this.headerFields[`${colIndex}_${headerColIndex}`];
+						if (headerCol.fillType === this.templateFillType) {
+							if (isValueEmpty(headerValue) && headerCol.type !== "span") {
+								const errorItem = {
+									rowIndex: -1, // 表头特殊标记
+									colIndex,
+									field: headerCol.key,
+									label: this.$t(headerCol.label),
+									headerIndex: headerColIndex,
+									error: `请选择${this.$t(headerCol.label)}`
+								};
+								errors.push(errorItem);
+								this.formErrors.push(errorItem);
+							}
+						}
+
+					});
+
 				}
 			});
 
@@ -1293,6 +1321,7 @@ export default {
 .c-cell {
 	width: 50px;
 }
+
 .span-content {
 	width: -webkit-fill-available;
 	text-align: center;
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index f42f2ed..03b3a59 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -1802,7 +1802,7 @@ export default {
     font-weight: normal;
     color: #606266;
     flex: 1;
-
+    background-color: #fff;
     &.disabled {
         cursor: not-allowed;
         color: #c0c4cc;
diff --git a/src/views/business/comps/template/comps/dl/DL006.vue b/src/views/business/comps/template/comps/dl/DL006.vue
index cb406fe..ace8e5b 100644
--- a/src/views/business/comps/template/comps/dl/DL006.vue
+++ b/src/views/business/comps/template/comps/dl/DL006.vue
@@ -91,7 +91,6 @@ import moment from 'moment'
 const refConf = {
   base: 'baseInfoRef',
   czInfo: 'czInfoRef',
-  gyzj: 'gyzjTableRef',
   remark: 'remarkRef',
   jzjz: 'jlzpzxxTableRef',
   bz: 'stepRef',
@@ -139,7 +138,7 @@ export default {
             {
               type:"sj",
               fillType: 'preFill',
-              key:"bh"
+              key:"bh",
             },
             {
               type: 'input',