From b272a99172988b2bc700bc5f9af36ddb855717b8 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Sat, 28 Feb 2026 21:26:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/CustomTable.vue            | 67 ++++++++++++++++------
 src/components/Template/HandleFormItem.vue         | 14 ++---
 .../Template/operation/TableOpertaion.vue          | 10 +++-
 .../Template/operation/TableOpertaionDelete.vue    | 12 +++-
 .../business/comps/template/comps/yp/YP003.vue     |  6 +-
 .../comps/template/mixins/templateMixin.js         | 11 ++++
 6 files changed, 91 insertions(+), 29 deletions(-)

diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 31b77e6..83026c2 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -111,15 +111,13 @@
 								</template>
 								<template v-else-if="col.bodyType === 'checkboxTag'">
 									<div class="flex flex-wrap"
-										:class="{ 'error-border': hasError(rowIndex, colIndex, col.prop) }">
+										:class="{ 'row-error-border': hasError(rowIndex, colIndex, col.prop) }">
 										<HandleFormItem v-for="(tag, tagIndex) in row[col.prop]" :key="tagIndex"
 											:fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex + '_' + tagIndex"
 											:fieldItemLabel="fieldItemLabel" type="checkboxTag" :value="tag"
 											:item="getBodyItem(col, rowIndex)"
-											@change="onCheckboxTagChange(rowIndex, col, tagIndex, $event)"
-											@deleteTag="onDeleteCheckboxTag(rowIndex, col, tagIndex)"
-											:error="hasError(rowIndex, colIndex, col.prop)"
-											@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)" />
+											@change="onCheckboxTagChange(rowIndex, colIndex,col, tagIndex, $event)"
+											@deleteTag="onDeleteCheckboxTag(rowIndex, col, tagIndex)" />
 									</div>
 
 								</template>
@@ -324,15 +322,11 @@ export default {
 		onDeleteCheckboxTag(rowIndex, col, tagIndex) {
 			this.localDataSource[rowIndex][col.prop].splice(tagIndex, 1);
 			this.$emit("onDeleteTag", rowIndex, col, tagIndex);
-			const params = {
-				type: "fieldChanged",
-				newRecord: null,
-				resourceList: null,
-			}
-			EventBus.$emit('onModifyRecord', params,)
+			this.justUpdateFilledFormData();
 		},
-		onCheckboxTagChange(rowIndex, col, tagIndex, value) {
+		onCheckboxTagChange(rowIndex, colIndex, col, tagIndex, value) {
 			this.localDataSource[rowIndex][col.prop][tagIndex] = value;
+			this.onErrorUpdate(rowIndex, colIndex, col.prop, value?false:true);
 			this.$emit("onCheckboxTagChange", rowIndex, col, tagIndex, value)
 		},
 		handleClickButton(e, data, key, rowIndex, colIndex) {
@@ -487,10 +481,35 @@ export default {
 						// 检查主字段
 						const mainValue = row[col.prop];
 						if (col.bodyType === "checkboxTag") {
-							if(this.templateFillType === "actFill"){
-
-							}else if(this.templateFillType === "preFill"){
-								
+							// checkboxTag类型的校验逻辑
+							if (this.templateFillType === "actFill") {
+								// actFill时，检查是否有checked为true的项
+								const hasChecked = mainValue && mainValue.some(tag => tag.checked === true);
+								if (!hasChecked && !col.bodyDisabled) {
+									const errorItem = {
+										rowIndex,
+										colIndex,
+										field: col.prop,
+										label: this.$t(col.label),
+										error: `请勾选${this.$t(col.label)}`
+									};
+									errors.push(errorItem);
+									this.formErrors.push(errorItem);
+								}
+							} else if (this.templateFillType === "preFill") {
+								// preFill时，检查所有tagValue是否不为空
+								const allTagValuesFilled = mainValue && mainValue.every(tag => tag.tagValue && tag.tagValue.trim() !== '');
+								if (!allTagValuesFilled && !col.bodyDisabled) {
+									const errorItem = {
+										rowIndex,
+										colIndex,
+										field: col.prop,
+										label: this.$t(col.label),
+										error: `请填写${this.$t(col.label)}`
+									};
+									errors.push(errorItem);
+									this.formErrors.push(errorItem);
+								}
 							}
 						} else {
 							if (this.isValueEmpty(mainValue) && !col.bodyDisabled && col.bodyType !== 'span' && col.bodyType !== 'button') {
@@ -761,6 +780,15 @@ export default {
 
 			return true;
 		},
+		// 只是更新已填写的表单数据，不触发校验
+		justUpdateFilledFormData(){
+			const params = {
+				type: "fieldChanged",
+				newRecord: null,
+				resourceList: null,
+			}
+			EventBus.$emit('onModifyRecord', params,)
+		},
 		onAddRow() {
 			if (this.$listeners && this.$listeners['onAddRow']) {
 				this.$emit('onAddRow');
@@ -772,6 +800,7 @@ export default {
 				targetDiluentVolumePrecision: 3,//小数点精度默认为3
 				targetStartSolutionVolumePrecision: 3,//小数点精度默认为3
 			});
+			this.justUpdateFilledFormData()
 		},
 
 		// 添加行
@@ -1055,13 +1084,13 @@ export default {
 
 .flex-wrap {
 	flex-wrap: wrap;
+    gap:10px;
 }
 
-.error-border {
-	border-color: #ff5d5d;
+.row-error-border {
 	box-shadow: 0 0 6px #ffc3c3;
 	padding: 8px;
 	border-radius: 4px;
-	border: 1px solid;
+	border: 1px solid #ff5d5d;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index df49189..a42a2f4 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -820,6 +820,7 @@ export default {
         // checkboxTag的checkbox变化处理
         onCheckboxTagChange() {
             this.emitCheckboxTagValue();
+            this.onCommonHandleSaveRecord();
         },
 
         // tag输入框失去焦点
@@ -827,10 +828,7 @@ export default {
             const value = e.target.value;
             this.tagValue = value;
             this.emitCheckboxTagValue();
-            // 触发保存记录
-            if (this.tagValue) {
-                this.onCommonHandleSaveRecord(this.tagValue);
-            }
+            this.onCommonHandleSaveRecord(this.tagValue);
         },
         // 删除tag
         onDeleteTag() {
@@ -961,7 +959,9 @@ export default {
         //处理更新记录
         handleUpdateRecord(data,recordData) {
             const baseInfo = this.getCommonRecordInfo();
-            if (!this.oldValue && !this.inputValue) return;
+            if (!this.oldValue && !this.inputValue){
+                return
+            }
             if(recordData){
                 this.oldValue = recordData.oldValue;
                 this.inputValue = recordData.inputValue;
@@ -1647,8 +1647,8 @@ export default {
 .checkbox-tag-container {
     border-radius: 4px;
     // transition: all 0.3s;
-    margin-bottom: 10px;
-    margin-right: 10px;
+    // margin-bottom: 10px;
+    // margin-right: 10px;
 
     &.error-border {
         border-color: #ff5d5d !important;
diff --git a/src/components/Template/operation/TableOpertaion.vue b/src/components/Template/operation/TableOpertaion.vue
index 1483bad..7cdc64b 100644
--- a/src/components/Template/operation/TableOpertaion.vue
+++ b/src/components/Template/operation/TableOpertaion.vue
@@ -162,7 +162,15 @@ export default {
         },
         // 删除行
         deleteRow(index) {
-            this.$emit("deleteRow", index)
+            this.$emit("deleteRow", index);
+                setTimeout(() => {
+                    const params = {
+                    type: "fieldChanged",
+                    newRecord: null,
+                    resourceList: null,
+                }
+                EventBus.$emit('onModifyRecord', params,)
+            }, 30);
         }
     }
 }
diff --git a/src/components/Template/operation/TableOpertaionDelete.vue b/src/components/Template/operation/TableOpertaionDelete.vue
index c9f6562..54b3401 100644
--- a/src/components/Template/operation/TableOpertaionDelete.vue
+++ b/src/components/Template/operation/TableOpertaionDelete.vue
@@ -10,6 +10,8 @@
 </template>
 
 <script>
+import { EventBus } from "@/utils/eventBus";
+
 export default {
     name: "TableOpertaionDelete",
     props: {
@@ -25,7 +27,15 @@ export default {
     methods: {
         // 删除行
         deleteRow(index) {
-            this.$emit("deleteRow", index)
+            this.$emit("deleteRow", index);
+            setTimeout(() => {
+                    const params = {
+                    type: "fieldChanged",
+                    newRecord: null,
+                    resourceList: null,
+                }
+                EventBus.$emit('onModifyRecord', params,)
+            }, 30);
         }
     }
 }
diff --git a/src/views/business/comps/template/comps/yp/YP003.vue b/src/views/business/comps/template/comps/yp/YP003.vue
index 471c569..41c0aca 100644
--- a/src/views/business/comps/template/comps/yp/YP003.vue
+++ b/src/views/business/comps/template/comps/yp/YP003.vue
@@ -171,7 +171,7 @@ export default {
 				bodySubFillType:"preFill",
 				bodySubButtonName:"template.common.importTemplate",
 				bodySubKey:"exportBtn",
-				showBodySub:true,
+				showBodySub:this.fillType === "preFill",
 				width: 280,
 			},{
 				label: 'template.yp.yp003.ypsl',
@@ -240,7 +240,11 @@ export default {
 				}
 			})
 			this.$refs.tableRef.updateDataSourceByRowIndex(this.currentRowIndex,{dwbh:tagData});
+			this.$refs.tableRef.onErrorUpdate(this.currentRowIndex, 1, 'dwbh', false)
 			this.$refs.ImportExcelDialog.cancel()
+			setTimeout(() => {
+				this.justUpdateFilledFormData();
+			}, 100);
 		},
 		downloadExcelTemplate(arr){
 			this.exportExcel(arr)
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 8bfcb8f..e36aaaf 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -6,6 +6,8 @@ import { sj_subpackage, sj_startConfiguration, sj_configurationCompleted } from
 import {convertConcentration} from "@/utils/conConverter";//浓度单位转换
 import {volumeConverter} from "@/utils/volConverter";//体积单位转换
 import * as XLSX from 'xlsx'
+import { EventBus } from "@/utils/eventBus";
+
 export default {
 	dicts: [
 		'business_pztj',
@@ -226,6 +228,15 @@ export default {
 		this.setTemplateData({})
 	},
 	methods: {
+		// 只是更新已填写的表单数据，不触发校验
+		justUpdateFilledFormData(){
+			const params = {
+				type: "fieldChanged",
+				newRecord: null,
+				resourceList: null,
+			}
+			EventBus.$emit('onModifyRecord', params,)
+		},
 		//试剂弹窗确认前
 		onBeforeReagentSubmit(data){
 			const {selectData, callback, key, formFields} = data;