From 331f1061565a8b4a554c72eabbca564f27a80546 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Tue, 3 Feb 2026 16:30:24 +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                               | 4 ++--
 src/components/Template/StepComponents/ry/xzrq.vue                    | 2 ++
 src/views/business/comps/template/comps/sp/SP003.vue                  | 4 +++-
 src/views/business/comps/template/dialog/SubPackageDialog.vue         | 3 ++-
 .../business/comps/template/formConfig/paralleAndLadderConfig.js      | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

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 @@
                 </div>
                 <div class="header-item">
                     <div class="header-title">分装数量</div>
-                    <HandleFormItem :isFieldsRecord="false" @blur="onBlurFzsl" :item="integerInputNumberItem"
+                    <HandleFormItem :fieldKey = "formData.mybh+'_fzsl'" @blur="onBlurFzsl" :item="integerInputNumberItem"
                     type = "inputNumber"    
                     :error="formErrors.fzsl" v-model="formData.fzsl" />
                 </div>
@@ -70,6 +70,7 @@ export default {
                 type: "inputNumber",
                 fillType: "actFill",
                 precision: 0,
+                label:"分装数量",
                 maxlength: 3
             },
             inputNumberItem: {
diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
index 1a1d8a6..b89c69a 100644
--- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
+++ b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
@@ -472,7 +472,8 @@ export const getBaseInfoFormConfig = ($this) => {
           fillType: 'actFill',
           otherCode: 'actOther',
           multiple: true,
-          options: $this.getDictOptions('business_pztj')
+          options: $this.getDictOptions('business_pztj'),
+          compareTo: 'pre'
         }
       }
     },