From 98ec06f3f6277bb6fce716b95b100a6942b261b3 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Wed, 21 Jan 2026 22:50:18 +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/BaseInfoFormPcakge.vue     | 52 ++++++++-----
 src/components/Template/CustomTable.vue            | 86 +++++++++++++++++++++-
 src/components/Template/HandleFormItem.vue         |  6 +-
 .../comps/template/comps/sp/SWYPBQGZYZBB.vue       |  4 +-
 .../comps/template/comps/sp/SWYPFXFFXZKPZB.vue     |  2 +
 .../comps/template/comps/sp/SWYPFXRYPZB.vue        |  7 +-
 .../comps/template/comps/sp/SWYPNBGZYZBB.vue       |  1 +
 .../formConfig/SWYPFXFFXYPZBBTableConfig.js        | 10 +--
 .../template/formConfig/paralleAndLadderConfig.js  | 38 ++++++----
 9 files changed, 155 insertions(+), 51 deletions(-)

diff --git a/src/components/Template/BaseInfoFormPcakge.vue b/src/components/Template/BaseInfoFormPcakge.vue
index 30bf265..cf755aa 100644
--- a/src/components/Template/BaseInfoFormPcakge.vue
+++ b/src/components/Template/BaseInfoFormPcakge.vue
@@ -176,6 +176,7 @@
 <script>
 import HandleFormItem from "./HandleFormItem.vue";
 import LineLabel from "./LineLabel.vue";
+import _ from "lodash";
 export default {
     inject: ['templateFillType'],
     components: {
@@ -379,7 +380,15 @@ export default {
                             } else {
                                 result[subKey] = formData[subKey] || formFields[subKey] || '';
                             }
-                            config[subKey] = { label: currentConfig.label, subKey, type: currentConfig.subType, fillType: currentConfig.subFillType || currentConfig.fillType }
+                            config[subKey] = { label: currentConfig.label, subKey, type: currentConfig.subType, fillType: currentConfig.subFillType || currentConfig.fillType, selectTo: currentConfig.selectTo }
+                        }
+                        
+                        // 检查compareTo字段
+                        if (currentConfig.compareTo && formData[currentConfig.compareTo] && result[key]) {
+                            const compareToValue = formData[currentConfig.compareTo];
+                            const currentValue = result[key];
+                            this.compareFieldsIsEqual(currentValue,compareToValue,key)
+                            
                         }
                     });
 
@@ -393,6 +402,17 @@ export default {
             this.formFields = result;
             this.allFieldsConfig = config;
         },
+        //比较值是否相等
+        compareFieldsIsEqual(currentValue,compareToValue,key) {
+            if(!currentValue || !compareToValue) return;
+            // 如果当前值与compareTo字段的值不相等，则设置橙色背景
+            if (_.isEqual(currentValue,compareToValue)) {
+                // 如果相等，移除橙色背景（如果之前设置了的话）
+                this.$set(this.orangeBgFields, key, false);
+            } else {
+                this.$set(this.orangeBgFields, key, true);
+            }
+        },
         //判断是否禁用
         getDisabled() {
             const { item } = this;
@@ -500,34 +520,28 @@ export default {
         },
         onBlur(key, val) {
             // compareTo 功能：当fillType==="actFill"时，判断当前值是否与compareTo字段的值一样，如果不一样则将当前input框的背景色标记成橙色
+            this.onValueChangeCompareTo(key, val);
+
+            this.$emit("blur", { key, value: val, ...this.formFields });
+        },
+        onValueChangeCompareTo(key, val) {
+            // compareTo 功能：当fillType==="actFill"时，判断当前值是否与compareTo字段的值一样，如果不一样则将当前input框的背景色标记成橙色
             const currentFieldConfig = this.allFieldsConfig[key];
             if (currentFieldConfig && currentFieldConfig.fillType === "actFill" && currentFieldConfig.compareTo) {
                 const compareToKey = currentFieldConfig.compareTo;
                 const compareToValue = this.formFields[compareToKey];
-
-                // 比较当前值和compareTo值，如果不相等则设置橙色背景
-                if (val !== compareToValue) {
-                    this.$set(this.orangeBgFields, key, true);
-                } else {
-                    // 相等则移除橙色背景
-                    this.$set(this.orangeBgFields, key, false);
-                }
+                this.compareFieldsIsEqual(val,compareToValue,key);
             }
-
-            this.$emit("blur", { key, value: val, ...this.formFields });
         },
         onSelectChange(key, val) {
             // 获取对应的配置
             const currentConfig = this.allFieldsConfig[key];
-
-            // // 确保多选下拉框的值是数组类型
-            // if (currentConfig && currentConfig.multiple) {
-            //     // 多选情况，确保值为数组类型
-            //     this.formFields[key] = Array.isArray(val) ? val : (val ? [val] : []);
-            // } else {
-            // 单选情况
+            console.log(currentConfig,"currentConfig")
+            if(currentConfig.selectTo){
+                this.formFields[currentConfig.selectTo] = val;
+            }
+            this.onValueChangeCompareTo(key, val);
             this.formFields[key] = val;
-            // }
             this.$emit("select", { key, value: val });
             // 清除该表单项的错误状态
             if (this.errors[key]) {
diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 769b1fe..45d7575 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -205,7 +205,10 @@ export default {
       handler(newData) {
         const { stepTableFormData = [], headerSelectFields = {} } = newData;
         this.updateDataSource(stepTableFormData);
-        this.headerSelectFields = JSON.parse(JSON.stringify(headerSelectFields))
+        this.headerSelectFields = JSON.parse(JSON.stringify(headerSelectFields));
+        
+        // 在数据加载后检查 compareTo 逻辑
+        this.checkCompareToOnDataLoad();
       }
     },
     localDataSource: {
@@ -424,10 +427,71 @@ export default {
           error.field === col.headerSelectKey)
       );
     },
+    // 检查并应用 compareTo 逻辑
+    checkCompareToLogic(rowIndex, colIndex, colKey, value) {
+      const col = this.columns[colIndex];
+      
+      // 检查主字段的 compareTo 逻辑
+      if (col && col.bodyFillType === "actFill" && col.compareTo) {
+        const compareToValue = this.localDataSource[rowIndex][col.compareTo];
+        
+        // 比较当前值和compareTo值，如果不相等则设置橙色背景
+        if (value !== compareToValue) {
+          this.setOrangeBg(rowIndex, colIndex, colKey, true);
+        } else {
+          // 相等则移除橙色背景
+          this.setOrangeBg(rowIndex, colIndex, colKey, false);
+        }
+      }
+    },
+    
+    // 在数据加载时检查 compareTo 逻辑
+    checkCompareToOnDataLoad() {
+      // 遍历所有行和列，检查 compareTo 逻辑
+      this.localDataSource.forEach((row, rowIndex) => {
+        this.columns.forEach((col, colIndex) => {
+          if (col.bodyFillType === "actFill" && col.compareTo) {
+            const currentValue = row[col.prop];
+            const compareToValue = row[col.compareTo];
+            
+            if (currentValue !== undefined && compareToValue !== undefined) {
+              // 比较当前值和compareTo值，如果不相等则设置橙色背景
+              if (currentValue !== compareToValue) {
+                this.setOrangeBg(rowIndex, colIndex, col.prop, true);
+              } else {
+                // 相等则移除橙色背景
+                this.setOrangeBg(rowIndex, colIndex, col.prop, false);
+              }
+            }
+          }
+          
+          // 检查子字段的 compareTo 逻辑
+          if (col.bodySubFillType === "actFill" && col.bodySubCompareTo) {
+            const currentValue = row[col.bodySubKey];
+            const compareToValue = row[col.bodySubCompareTo];
+            
+            if (currentValue !== undefined && compareToValue !== undefined) {
+              // 比较当前值和compareTo值，如果不相等则设置橙色背景
+              if (currentValue !== compareToValue) {
+                this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, true);
+              } else {
+                // 相等则移除橙色背景
+                this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, false);
+              }
+            }
+          }
+        });
+      });
+    },
+    
     // 表体值变化
     onBodyValueChange(rowIndex, colIndex, value) {
       const col = this.columns[colIndex];
       this.localDataSource[rowIndex][col.prop] = value;
+      
+      // 检查并应用 compareTo 逻辑
+      this.checkCompareToLogic(rowIndex, colIndex, col.prop, value);
+      
       // 输入时清除对应表单项的错误状态
       this.formErrors = this.formErrors.filter(error =>
         !(error.rowIndex === rowIndex &&
@@ -440,6 +504,20 @@ export default {
     onBodySubValueChange(rowIndex, colIndex, value) {
       const col = this.columns[colIndex];
       this.localDataSource[rowIndex][col.bodySubKey] = value;
+      
+      // 检查子字段的 compareTo 逻辑
+      if (col && col.bodySubFillType === "actFill" && col.bodySubCompareTo) {
+        const compareToValue = this.localDataSource[rowIndex][col.bodySubCompareTo];
+        
+        // 比较当前值和compareTo值，如果不相等则设置橙色背景
+        if (value !== compareToValue) {
+          this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, true);
+        } else {
+          // 相等则移除橙色背景
+          this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, false);
+        }
+      }
+      
       // 输入时清除对应表单项的错误状态
       this.formErrors = this.formErrors.filter(error =>
         !(error.rowIndex === rowIndex &&
@@ -464,7 +542,7 @@ export default {
         label: this.$t(col.label),
         precision: currentItem[col.bodyPrecisionKey] || col.precision,
         copyFrom: col.copyFrom || "",
-        compareTo: col.bodyCompareTo, // 添加 compareTo 字段
+        compareTo: col.compareTo, // 添加 compareTo 字段
         type: col.bodyType || "input",
       };
       if (col.bodyDisabled) {
@@ -555,8 +633,8 @@ export default {
 
       // 查找对应的列配置
       const col = this.columns.find(c => c.prop === colKey);
-      if (col && col.bodyFillType === "actFill" && col.bodyCompareTo) {
-        const compareToValue = this.localDataSource[rowIndex][col.bodyCompareTo];
+      if (col && col.bodyFillType === "actFill" && col.compareTo) {
+        const compareToValue = this.localDataSource[rowIndex][col.compareTo];
 
         // 比较当前值和compareTo值，如果不相等则设置橙色背景
         if (value !== compareToValue) {
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index a83a8c2..b6e3820 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -352,7 +352,7 @@ export default {
                     const o = records[0];
                     if (!o.reply && templateFillType == 'qc') {//如果填报人员没有回复，qc点击的时候需要回填上次填报的信息
                         content = o.content;
-                    } else if (!o.content && templateFillType == 'actFill') {//如果qc没有复核，填报点击的时候需要回填上次填报的信息
+                    } else if (templateFillType == 'actFill') {//如果qc没有复核，填报点击的时候需要回填上次填报的信息
                         content = o.reply;
                     }
                 }
@@ -367,9 +367,6 @@ export default {
             } else if (!this.error && isEmpty) {
                 this.$emit('update:error', true);
             }
-            console.log(this.oldValue,this.inputValue,"onCommonHandleSaveRecord")
-            // 值发生了变化，需要弹出密码输入框
-            console.log(this.oldValue,this.in)
             // 值发生了变化，需要弹出密码输入框
             const isSame = this.isEqual(this.oldValue, this.inputValue);
             if(isSame){
@@ -395,6 +392,7 @@ export default {
         //处理更新记录
         handleUpdateRecord(data) {
             const baseInfo = this.getCommonRecordInfo();
+            if(!this.oldValue && !this.inputValue) return;
             const record = {
                 ...baseInfo,
                 oldValue: this.oldValue,
diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
index 176f8af..8258944 100644
--- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
@@ -303,7 +303,7 @@ export default {
 					bodyType: "inputNumber",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
-					bodyCompareTo: "targetStartSolutionVolume",//与哪个字段比较
+					compareTo: "targetStartSolutionVolume",//与哪个字段比较
 					copyFrom: "targetStartSolutionVolume",//复制哪个字段
 				},
 				{
@@ -334,7 +334,7 @@ export default {
 					bodyType: "inputNumber",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
-					bodyCompareTo: "targetDiluentVolume",//与哪个字段比较
+					compareTo: "targetDiluentVolume",//与哪个字段比较
 					copyFrom: "targetDiluentVolume",//复制哪个字段
 				},
 				{
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
index a1ba9ab..b5b0607 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
@@ -139,6 +139,7 @@ export default {
 							label: 'template.common.versionNumber',
 							type: "input",
 							fillType: "actFill",
+							prepend:"V",
 							maxlength: 50
 						},
 						//处理批编号
@@ -168,6 +169,7 @@ export default {
 							type: "select",
 							fillType: "actFill",
 							otherCode: "actOther",
+							compareTo: "pre",
 							multiple: true,
 							options: this.getDictOptions('business_pztj')
 						}
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
index 437bd5a..7a15fea 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
@@ -135,6 +135,7 @@ export default {
 							fillType: "actFill",
 							otherCode: "actOther",
 							multiple: true,
+							compareTo: "pre",
 							options: this.getDictOptions('business_pztj')
 						}
 					}
@@ -181,7 +182,8 @@ export default {
 							subKey: "targetPreConcentrationUnit",
 							fillType: "preFill",
 							subOptions: this.getDictOptions('business_nddw'),
-							maxlength: 10
+							maxlength: 10,
+							selectTo:"targetActConcentrationUnit",//下拉选择后，赋值到对应字段
 						},
 						targetActConcentration: {
 							label: 'template.common.targetActConcentration',
@@ -202,7 +204,8 @@ export default {
 							subKey: "targetPreVolumeUnit",
 							subOptions: this.getDictOptions('business_tjdw'),
 							fillType: "preFill",
-							maxlength: 10
+							maxlength: 10,
+							selectTo:"targetActVolumeUnit",//下拉选择后，赋值到对应字段
 						},
 						targetActVolume: {
 							label: 'template.common.targetActVolume',
diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
index 0ba532f..f6dcda8 100644
--- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
@@ -90,6 +90,7 @@
 </template>
 
 <script>
+import { EventBus } from "@/utils/eventBus";
 import BaseInfoFormPcakge from "@/components/Template/BaseInfoFormPcakge";
 import LineLabel from "@/components/Template/LineLabel";
 import TableList from "@/components/Template/Table";
diff --git a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
index 6f45753..edb24ce 100644
--- a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
+++ b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
@@ -56,7 +56,7 @@ export const getSWYPFXFFXYPZBBTableConfig = (
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
-      bodyCompareTo: 'yjryxql',
+      compareTo: 'yjryxql',
       copyFrom: 'yjryxql'
     },
     {
@@ -80,7 +80,7 @@ export const getSWYPFXFFXYPZBBTableConfig = (
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
-      bodyCompareTo: 'yjjzxql',
+      compareTo: 'yjjzxql',
       copyFrom: 'yjjzxql'
     },
     {
@@ -155,7 +155,7 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
-      bodyCompareTo: 'yjryxql',
+      compareTo: 'yjryxql',
       copyFrom: 'yjryxql'
     },
     {
@@ -179,7 +179,7 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
-      bodyCompareTo: 'yjgzyxql',
+      compareTo: 'yjgzyxql',
       copyFrom: 'yjgzyxql'
     },
     {
@@ -203,7 +203,7 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
-      bodyCompareTo: 'yjxsyxql',
+      compareTo: 'yjxsyxql',
       copyFrom: 'yjxsyxql'
     },
     {
diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
index f4c1166..5539455 100644
--- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
+++ b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
@@ -46,7 +46,8 @@ export const getLadderColumnsConfig = ($this) => {
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
-      copyFrom: 'targetStartSolutionVolume' //复制哪个字段
+      copyFrom: 'targetStartSolutionVolume', //复制哪个字段
+      compareTo: 'targetStartSolutionVolume' //比较哪个字段
     },
     {
       label: '预设稀释液体积',
@@ -77,7 +78,8 @@ export const getLadderColumnsConfig = ($this) => {
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
-      copyFrom: 'targetDiluentVolume' //复制哪个字段
+      copyFrom: 'targetDiluentVolume', //复制哪个字段
+      compareTo: 'targetDiluentVolume', //比较哪个字段
     },
     {
       label: '预设目标溶液浓度',
@@ -107,8 +109,8 @@ export const getLadderColumnsConfig = ($this) => {
 
       bodyPrecisionKey: 'actSolutionConcentrationPrecision',
       bodyMaxlength: 10,
-      copyFrom: 'targetSolutionConcentration', //复制哪个字段
-      bodySubPlaceholder: '请输入保留小数位数'
+      bodySubPlaceholder: '请输入保留小数位数',
+      compareTo: 'targetSolutionConcentration', //比较哪个字段
     },
     {
       label: '预设目标溶液体积',
@@ -139,7 +141,8 @@ export const getLadderColumnsConfig = ($this) => {
       bodyPrecisionKey: 'actSolutionVolumePrecision',
       bodyMaxlength: 10,
       copyFrom: 'targetSolutionVolume', //复制哪个字段
-      bodySubPlaceholder: '请输入保留小数位数'
+      bodySubPlaceholder: '请输入保留小数位数',
+      compareTo: 'targetSolutionVolume', //比较哪个字段
     }
   ]
 }
@@ -183,8 +186,8 @@ export const getParallelColumnsConfig = ($this) => {
       showBodySub: $this.fillType === 'preFill',
       bodyPrecisionKey: 'actSolutionConcentrationPrecision',
       bodyMaxlength: 10,
-      copyFrom: 'targetSolutionConcentration', //复制哪个字段
-      bodySubPlaceholder: '请输入保留小数位数'
+      bodySubPlaceholder: '请输入保留小数位数',
+      compareTo: 'targetSolutionConcentration', //比较哪个字段
     },
     {
       label: '预设目标溶液体积',
@@ -211,11 +214,10 @@ export const getParallelColumnsConfig = ($this) => {
       bodyFillType: 'actFill',
       bodySubFillType: 'preFill',
       showBodySub: $this.fillType === 'preFill',
-
       bodyPrecisionKey: 'actSolutionVolumePrecision',
       bodyMaxlength: 10,
-      copyFrom: 'targetSolutionVolume', //复制哪个字段
-      bodySubPlaceholder: '请输入保留小数位数'
+      bodySubPlaceholder: '请输入保留小数位数',
+      compareTo: 'targetSolutionVolume', //比较哪个字段
     },
     {
       label: '目标溶液有效周期',
@@ -249,7 +251,8 @@ export const getParallelColumnsConfig = ($this) => {
       prop: 'actStartSolutionCode',
       width: 280,
       bodyType: 'clickable',
-      bodyFillType: 'actFill'
+      bodyFillType: 'actFill',
+      compareTo: 'startSolutionCode', //比较哪个字段
     },
     {
       label: '预设原始溶液浓度',
@@ -270,7 +273,8 @@ export const getParallelColumnsConfig = ($this) => {
       width: 280,
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
-      bodyDisabled: true
+      bodyDisabled: true,
+      compareTo: 'targetStartSolutionConcentration', //比较哪个字段
     },
     {
       label: '预设原始溶液体积',
@@ -302,7 +306,9 @@ export const getParallelColumnsConfig = ($this) => {
       width: 280,
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
-      bodyMaxlength: 10
+      bodyMaxlength: 10,
+      compareTo: 'targetStartSolutionVolume', //比较哪个字段
+      copyFrom: 'targetStartSolutionVolume' //复制哪个字段
     },
 
     {
@@ -332,7 +338,8 @@ export const getParallelColumnsConfig = ($this) => {
       width: 280,
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
-      bodyMaxlength: 10
+      bodyMaxlength: 10,
+      compareTo: 'targetDiluentVolume' //比较哪个字段
     }
   ]
 }
@@ -366,7 +373,8 @@ export const getLadderFormConfig = ($this) => {
           type: 'input',
           fillType: 'actFill',
           disabled: true,
-          maxlength: 10
+          maxlength: 10,
+          compareTo: 'targetStartSolution', //比较哪个字段
         },
         solution: {
           label: '稀释液',