Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/components/Template/CustomTable.vue

@@ -123,17 +123,15 @@
 								</div>
 							</template>
 							<template v-else-if="col.bodyType === 'checkbox'">
-								<div class="flex flex-wrap">
-									<HandleFormItem
-										:fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
-										:fieldItemLabel="fieldItemLabel" 
-										type="checkbox" 
-										v-model="row[col.prop]"
-										:item="getBodyItem(col, rowIndex)"
-										@change="onCheckboxChange(rowIndex, colIndex, col, $event)"
-										:error="hasError(rowIndex, colIndex, col.prop)"
-										@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)" />
-								</div>
+								<HandleFormItem
+									:fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+									:fieldItemLabel="fieldItemLabel" 
+									type="checkbox" 
+									v-model="row[col.prop]"
+									:item="getBodyItem(col, rowIndex)"
+									@change="onCheckboxChange(rowIndex, colIndex, col, $event)"
+									:error="hasError(rowIndex, colIndex, col.prop)"
+									@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)" />
 							</template>
 
 							</div>
@@ -550,17 +548,19 @@ export default {
 								}
 							}
 						} else if (col.bodyType === "checkbox") {
-							// checkbox类型的校验逻辑 - 通常checkbox不需要必填校验，除非明确指定
-							// 如果需要必填，可以检查是否至少选中一个
-							if (col.required && !col.bodyDisabled) {
-								const hasChecked = Array.isArray(mainValue) ? mainValue.length > 0 : mainValue;
+							// checkbox类型的校验逻辑
+							// checkbox只在actFill时进行必填校验
+							if (!col.bodyDisabled && this.templateFillType === 'actFill') {
+								// 单个checkbox：值必须为true
+								// checkbox组：至少选中一个
+								const hasChecked = Array.isArray(mainValue) ? mainValue.length > 0 : mainValue === true;
 								if (!hasChecked) {
 									const errorItem = {
 										rowIndex,
 										colIndex,
 										field: col.prop,
 										label: this.$t(col.label),
-										error: `请选择${this.$t(col.label)}`
+										error: `请勾选${this.$t(col.label)}`
 									};
 									errors.push(errorItem);
 									this.formErrors.push(errorItem);

src/components/Template/HandleFormItem.vue

@@ -1726,7 +1726,8 @@ export default {
     textarea,
     .el-select,
     .clickable,
-    .el-date-editor {
+    .el-date-editor,
+    .el-checkbox__inner {
         border-color: #ff5d5d;
         box-shadow: 0 0 6px #ffc3c3 !important;
 

src/views/business/comps/template/comps/dl/DL008.vue

@@ -313,7 +313,7 @@ export default {
     }
   },
   mounted() {
-    // 模拟数据已移除，使用真实数据回显
+
   },
   methods: {
     // 删除表格行
@@ -359,8 +359,14 @@ export default {
         }
         this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
       }
-      if (key === 'qxbd') {
-        this.$refs.cxqkqxbbInfoRef.updateFormData('pykssj', row.startDate)
+      if (key === 'cxqkqxbd') {
+        // MOCK:模拟数据回显
+        const mockData = [
+          {"jlzb":"A","jzbh1":undefined,"jzbh2":undefined,"jzbh3":undefined,"jzbh4":undefined,"jzbh1Label":"001","jzbh2Label":"004","jzbh3Label":"007","jzbh4Label":"010"},
+          {"jlzb":"A","jzbh1":undefined,"jzbh2":undefined,"jzbh3":undefined,"jzbh4":undefined,"jzbh1Label":"002","jzbh2Label":"005","jzbh3Label":"008","jzbh4Label":"011"},
+          {"jlzb":"A","jzbh1":undefined,"jzbh2":undefined,"jzbh3":undefined,"jzbh4":undefined,"jzbh1Label":"003","jzbh2Label":"006","jzbh3Label":"009","jzbh4Label":"012"}
+        ]
+        this.$refs[refConf.cxqk].updateDataSource(mockData)
       }
     },
     // 保存