diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue index 61386f4..874fd7d 100644 --- a/src/components/Template/CustomTable.vue +++ b/src/components/Template/CustomTable.vue @@ -295,7 +295,7 @@ export default { if (col.bodyFillType === this.templateFillType || col.bodySubFillType === this.templateFillType) { // 检查主字段 const mainValue = row[col.prop]; - if (this.isValueEmpty(mainValue) && !col.bodyDisabled) { + if (this.isValueEmpty(mainValue) && !col.bodyDisabled && col.bodyType!=='span') { const errorItem = { rowIndex, colIndex, @@ -308,7 +308,7 @@ export default { } // 检查子字段(如果有) - if (col.bodySubKey && !col.bodySubDisabled) { + if (col.bodySubKey && !col.bodySubDisabled && col.bodySubType!=='span') { const subValue = row[col.bodySubKey]; console.log(col, subValue, "subValue") if (this.isValueEmpty(subValue)) { @@ -326,7 +326,7 @@ export default { } }); }); - + console.log(errors,this.localDataSource,"errors") return { valid: errors.length === 0, errors: errors @@ -411,6 +411,7 @@ export default { placeholder: col.bodySubPlaceholder || "请输入", precision: col.subPrecision || 0, compareTo: col.bodySubCompareTo, // 添加 compareTo 字段 + type: col.bodySubType || "input", } if (col.bodySubDisabled) { item.disabled = col.bodySubDisabled; diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue index 58fe15f..749a0ca 100644 --- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue @@ -301,6 +301,7 @@ export default { refsToValidate.push(`paralleStepRef_${i}`); } } + console.log(refsToValidate,"refsToValidate") return await this.validFormFields(refsToValidate); }, getFilledFormData() { diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js index 9212f52..c2c928f 100644 --- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js +++ b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js @@ -307,7 +307,6 @@ export const getParallelColumnsConfig = ($this) => { bodyType: "inputNumber", bodyFillType: "actFill", bodyMaxlength: 10, - bodyDisabled: true, }, { @@ -338,7 +337,6 @@ export const getParallelColumnsConfig = ($this) => { bodyType: "inputNumber", bodyFillType: "actFill", bodyMaxlength: 10, - bodyDisabled: true, }, ] }