diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue index d4cc192..ca09a7f 100644 --- a/src/components/Template/CustomTable.vue +++ b/src/components/Template/CustomTable.vue @@ -609,7 +609,7 @@ export default { this.columns.forEach((col, colIndex) => { const currentValue = row[col.prop]; const compareToValue = row[col.compareTo]; - if (col.compareTo && currentValue && compareToValue) { + if (col.compareTo && !this.isValueEmpty(currentValue) && !this.isValueEmpty(compareToValue)) { // 比较当前值和compareTo值,如果不相等则设置橙色背景 if (!isEqual(currentValue, compareToValue)) { this.setOrangeBg(rowIndex, colIndex, col.prop, true); @@ -624,7 +624,7 @@ export default { const currentValue = row[col.bodySubKey]; const compareToValue = row[col.bodySubCompareTo]; - if (!!currentValue && !!compareToValue) { + if (!this.isValueEmpty(currentValue) && !this.isValueEmpty(compareToValue)) { // 比较当前值和compareTo值,如果不相等则设置橙色背景 if (!isEqual(currentValue, compareToValue)) { this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, true); diff --git a/src/components/Template/StepComponents/ry/xzrq.vue b/src/components/Template/StepComponents/ry/xzrq.vue index 6e3be10..1e8c72d 100644 --- a/src/components/Template/StepComponents/ry/xzrq.vue +++ b/src/components/Template/StepComponents/ry/xzrq.vue @@ -24,11 +24,13 @@ export default { fillType: "preFill", type: "select", options: this.getDictOptions('business_rqcz'), + otherCode:"ytrqczOther", }, sjrqcz: { fillType: "actFill", type: "select", options: this.getDictOptions('business_rqcz'), + otherCode:"sjrqczOther", }, text2: { label: "作为容器。", diff --git a/src/views/business/comps/template/comps/sp/SP003.vue b/src/views/business/comps/template/comps/sp/SP003.vue index bed6fdd..07540cf 100644 --- a/src/views/business/comps/template/comps/sp/SP003.vue +++ b/src/views/business/comps/template/comps/sp/SP003.vue @@ -163,7 +163,8 @@ export default { fillType: "actFill", otherCode: "actOther", multiple: true, - options: this.getDictOptions('business_pztj') + options: this.getDictOptions('business_pztj'), + compareTo: "pre" } } }, @@ -225,6 +226,7 @@ export default { fillType: "actFill", disabled: true, maxlength: 10, + compareTo: "targetStartSolution", }, solution: { label: "template.sp.sp003.xsy", diff --git a/src/views/business/comps/template/dialog/SubPackageDialog.vue b/src/views/business/comps/template/dialog/SubPackageDialog.vue index deaadf8..4278ef0 100644 --- a/src/views/business/comps/template/dialog/SubPackageDialog.vue +++ b/src/views/business/comps/template/dialog/SubPackageDialog.vue @@ -9,7 +9,7 @@