From c61236b1b166febde71136f139612e00f8b16ab0 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Fri, 23 Jan 2026 12:05:49 +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     |  8 +---
 src/components/Template/CustomTable.vue            | 20 ++++------
 .../Template/operation/TableOpertaion.vue          | 14 +++----
 src/utils/formPackageCommon.js                     | 11 ++++++
 .../comps/template/comps/sp/SWYPBQGZYZBB.vue       |  6 ++-
 .../comps/template/comps/sp/SWYPFXCBYPZB.vue       |  2 +-
 .../comps/template/comps/sp/SWYPFXFFXZKPZB.vue     | 12 ++----
 .../comps/template/comps/sp/SWYPFXRYPZB.vue        |  2 +-
 .../comps/template/comps/sp/SWYPNBGZYZBB.vue       |  2 +-
 .../comps/template/dialog/SubPackageDialog.vue     | 43 ++++++++++++++--------
 10 files changed, 65 insertions(+), 55 deletions(-)
 create mode 100644 src/utils/formPackageCommon.js

diff --git a/src/components/Template/BaseInfoFormPcakge.vue b/src/components/Template/BaseInfoFormPcakge.vue
index 20b84f0..2e5bf76 100644
--- a/src/components/Template/BaseInfoFormPcakge.vue
+++ b/src/components/Template/BaseInfoFormPcakge.vue
@@ -181,6 +181,7 @@
 import HandleFormItem from "./HandleFormItem.vue";
 import LineLabel from "./LineLabel.vue";
 import { isEqual } from "@/utils/index.js";
+import { isShowOther } from "@/utils/formPackageCommon.js";
 export default {
     inject: ['templateFillType'],
     components: {
@@ -218,6 +219,7 @@ export default {
             errors: {},//存储表单错误信息，用于标红提示
             orangeBgFields: {},// 存储需要橙色背景的字段
             oldFormFields: {},// 存储旧的表单数据，用于比较变化
+            isShowOther,
         };
     },
     watch: {
@@ -339,12 +341,6 @@ export default {
                 parentLabel: sItem.label,
             }
         },
-        isShowOther(v = []) {
-            // 确保v是数组类型，以避免类型错误
-            const arr = Array.isArray(v) ? v : [v];
-            //和凡哥商量，只要value为负数都显示其他
-            return arr.some(item => item < 0);
-        },
         // 根据formConfig回填form表单数据
         handleFormField(update = false) {
             const result = {};
diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 134f347..aa3e4f2 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -127,7 +127,7 @@
           <!-- 默认操作栏 -->
           <div class="custom-table-cell body-cell" :style="{ width: '245px' }" v-if="showOperation">
             <div class="inner-table-cell">
-              <slot name="operation" :row="row" :rowIndex="rowIndex" :columns = "columns"></slot>
+              <slot name="operation" :row="row" :rowIndex="rowIndex" :columns = "getOperationColumns()" ></slot>
             </div>
           </div>
         </div>
@@ -147,6 +147,7 @@
 <script>
 import HandleFormItem from "./HandleFormItem.vue";
 import { isEqual } from "@/utils/index.js";
+import { isShowOther } from "@/utils/formPackageCommon.js";
 export default {
   inject: ['templateFillType'],
   name: 'CustomTable',
@@ -201,7 +202,8 @@ export default {
       localDataSource: [],
       headerSelectFields: {},
       formErrors: [], // 表单错误状态管理
-      orangeBgCells: {} // 存储需要橙色背景的单元格 {rowIndex-colIndex: true/false}
+      orangeBgCells: {}, // 存储需要橙色背景的单元格 {rowIndex-colIndex: true/false}
+      isShowOther,
     }
   },
   watch: {
@@ -231,6 +233,10 @@ export default {
     // this.initHeaderSelectValues();
   },
   methods: {
+    //获取操作栏的列
+    getOperationColumns(){
+      return {columnsData:this.columns,headerSelectFields:this.headerSelectFields}
+    },
     //获取其他下拉框的配置
     getOtherItem(sItem) {
       return {
@@ -241,16 +247,6 @@ export default {
         type: "input"
       }
     },
-    //判断是否显示其他输入框
-    isShowOther(v = [],col) {
-      if(!col.otherCode){
-        return false;
-      }
-      // 确保v是数组类型，以避免类型错误
-      const arr = Array.isArray(v) ? v : [v];
-      //和凡哥商量，只要value为负数都显示其他
-      return arr.some(item => item < 0);
-    },
     isShowBodySub(col, row) {
       if (col.hasOwnProperty("disabled")) {
         return col.showBodySub
diff --git a/src/components/Template/operation/TableOpertaion.vue b/src/components/Template/operation/TableOpertaion.vue
index 2140b67..123b205 100644
--- a/src/components/Template/operation/TableOpertaion.vue
+++ b/src/components/Template/operation/TableOpertaion.vue
@@ -27,8 +27,8 @@ export default {
             default: () => { },
         },
         columns: {
-            type: Array,
-            default: [],
+            type: Object,
+            default: () => { },
         },
         rowIndex: {
             type: Number,
@@ -60,19 +60,19 @@ export default {
         },
         // 分装
         onSubPackage() {
-            console.log(this.row,this.columns,"this.row")
             const {columns,row} = this;
-            const col = columns.find((item)=>item.myCodeFields);
-            const {myCodeFields} = col;
+            const {headerSelectFields,columnsData} = columns;
+            const col = columnsData.find((item)=>item.myCodeFields);
+            const {myCodeFields,maxVolumeField,maxVolumeFieldUnit} = col;
+            console.log(row,col,"ooooo")
             const fields = [];
             myCodeFields.forEach((key)=>{
                 fields.push(row[key])
             })
-            EventBus.$emit("showSubPackageDialog",{mybh:fields.join(""),maxVolume:10,volumeUnit:"ml",rowIndex:this.rowIndex})
+            EventBus.$emit("showSubPackageDialog",{mybh:fields.join(""),maxVolume:row[maxVolumeField],maxVolumeUnit:headerSelectFields[maxVolumeFieldUnit],rowIndex:this.rowIndex})
         },
         onSubPackageSubmit(data){
             if(data.rowIndex === this.rowIndex){
-                console.log(data,"onSubPackageSubmit")
                 this.$emit("subPackageSubmit", data)
             }
         },
diff --git a/src/utils/formPackageCommon.js b/src/utils/formPackageCommon.js
new file mode 100644
index 0000000..3e0eee1
--- /dev/null
+++ b/src/utils/formPackageCommon.js
@@ -0,0 +1,11 @@
+//判断是否显示其他输入框
+export const isShowOther=(v = [],col)=> {
+    if(col &&!col.otherCode){
+        return false;
+    }
+    // 确保v是数组类型，以避免类型错误
+    const arr = Array.isArray(v) ? v : [v];
+    const otherArr = ["其他","遮光","CA-QC Dilution_"]
+    //和凡哥商量，只要value为负数都显示其他
+    return arr.some(item => otherArr.includes(item));
+}
\ No newline at end of file
diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
index a3fa772..b3c38ca 100644
--- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
@@ -269,7 +269,9 @@ export default {
 					bodySubKey: "subTargetSolutionCode",
 					bodyFillType: "preFill",
 					width: 280,
-					myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],
+					myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
+					maxVolumeField: "actSolutionVolume",//分装的最大量字段
+					maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
 				},
 				{
 					label: "起始溶液编号",
@@ -425,7 +427,7 @@ export default {
 			}
 			const snList = await this.getLatestSn(stepTableFormData.length);
 			stepTableFormData.forEach((item, index) => {
-				this.$refs.stepTableRef.updateDataSourceByRowIndex(index, { subTargetSolutionCode: stepTableFormData.length == 1 ? snList : snList[index] });
+				this.$refs.stepTableRef.updateDataSourceByRowIndex(index, { subTargetSolutionCode:snList[index] });
 			})
 			this.$nextTick(() => {
 				//通知后端保存数据
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue
index 0437a13..0cd7792 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue
@@ -275,7 +275,7 @@ export default {
 				count: 1,
 			})
 			if(result.code == 200){
-				this.$refs.stepFormPackageRef.updateFormData("targetCodeSn",result.data)
+				this.$refs.stepFormPackageRef.updateFormData("targetCodeSn",result.data[0])
 			}
 		},
 		//获取已填写的表单数据
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
index a1da2ec..4331e11 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
@@ -305,16 +305,10 @@ export default {
 					count: stepTableFormData.length,
 				})
 				if(result.code == 200){
-					if(stepTableFormData.length===1){
-						this.$refs.tableRef.updateDataSourceByRowIndex(0,{
-							bhCode: result.data,
+					for(let i=0;i<stepTableFormData.length;i++){
+						this.$refs.tableRef.updateDataSourceByRowIndex(i,{
+							bhCode: result.data[i],
 						})
-					}else{
-						for(let i=0;i<stepTableFormData.length;i++){
-							this.$refs.tableRef.updateDataSourceByRowIndex(i,{
-								bhCode: result.data[i],
-							})
-						}
 					}
 
 					const params = {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
index 7a15fea..03742eb 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
@@ -278,7 +278,7 @@ export default {
 				count: 1,
 			})
 			if(result.code == 200){
-				this.$refs.stepFormPackageRef.updateFormData("targetCodeSn",result.data)
+				this.$refs.stepFormPackageRef.updateFormData("targetCodeSn",result.data[0])
 			}
 		},
 		//获取已填写的表单数据
diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
index c86be93..aadf8dc 100644
--- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
@@ -200,7 +200,7 @@ export default {
 											targetSolutionExpirationDate: date
 										}
 									}
-									this.$refs[ref][0]?.updateDataSourceByRowIndex(idx,{subTargetSolutionCode: length==1?snList:snList[idx],...expDate});
+									this.$refs[ref][0]?.updateDataSourceByRowIndex(idx,{subTargetSolutionCode:snList[idx],...expDate});
 								});
 								Promise.resolve();
 							}
diff --git a/src/views/business/comps/template/dialog/SubPackageDialog.vue b/src/views/business/comps/template/dialog/SubPackageDialog.vue
index 646c4bb..b1553a9 100644
--- a/src/views/business/comps/template/dialog/SubPackageDialog.vue
+++ b/src/views/business/comps/template/dialog/SubPackageDialog.vue
@@ -30,7 +30,7 @@
                 </div>
                 <div class="header-container">
                     <div v-for="(item, index) in fzList" class="list-item" :key="index">
-                        <div class="list-label">{{ formData.mybh }}-set01</div>
+                        <div class="list-label">{{ formData.mybh }}-set{{ item.subCode }}</div>
                         <HandleFormItem :isFieldsRecord="false" :item="inputNumberItem" :error="fzListErrors[index]"
                             @blur="onBlurFzNum(index)" v-model="item.num" />
                         <el-button type="primary" plain @click="onPrint">打印</el-button>
@@ -48,7 +48,8 @@
 <script>
 import HandleFormItem from '@/components/Template/HandleFormItem.vue';
 import { compareVolume } from '@/utils/volumeTools.js';
-import { EventBus } from '@/utils/eventBus'
+import { EventBus } from '@/utils/eventBus';
+import { getLatestSn } from '@/api/template';
 export default {
     dicts: [
         'business_tjdw',
@@ -102,6 +103,8 @@ export default {
     methods: {
         close() {
             this.visible = false;
+            this.fzList = [];
+            this.formData = {};
             this.resetErrors();
         },
         show(data) {
@@ -122,10 +125,10 @@ export default {
                 return;
             } else {
                 const errMsg = "分装后小份容量之和大于母液容量，是否确认分装？"
-                const {maxVolume,volumeUnit,dw} = this.formData;
+                const {maxVolume,maxVolumeUnit,dw} = this.formData;
                 const totalVolume = this.fzList.reduce((acc, cur) => acc + Number(cur.num), 0);
-                const compareResult = compareVolume(totalVolume,dw,maxVolume, volumeUnit);
-                if(compareResult > 0){
+                const compareResult = compareVolume(totalVolume,dw,maxVolume, maxVolumeUnit);
+                if(compareResult > 0||!maxVolume){//没有填写实际溶液体积的也需要提示错误信息
                     this.$modal.confirm(errMsg, '提示', {
                         confirmButtonText: this.$t('form.saveConfirm'),
                         cancelButtonText: this.$t('form.cancel'),
@@ -144,9 +147,9 @@ export default {
 
         },
         submitEmit(){
+            console.log({...this.formData, fzList: this.fzList})
             EventBus.$emit('subPackageSubmit', {...this.formData, fzList: this.fzList});
-            this.fzList = [];
-            this.formData = {};
+
             this.close();
         },
         validateFormData() {
@@ -199,7 +202,7 @@ export default {
             });
         },
         // 分装数量失去焦点时，根据数量生成分装列表
-        onBlurFzsl(e) {
+        async onBlurFzsl(e) {
             // 清除当前字段的错误状态
             if (e) {
                 this.formErrors.fzsl = false;
@@ -207,15 +210,23 @@ export default {
             // 清空现有列表
             this.fzList = [];
             this.fzListErrors = [];
-
-            // 根据输入的数量生成新列表
-            for (let i = 0; i < e; i++) {
-                this.fzList.push({
-                    num: "",
-                });
-                // 同步初始化错误状态数组
-                this.fzListErrors.push(false);
+            const result = await getLatestSn({
+                my: this.formData.mybh,
+                count: e,
+            })
+            if(result.code === 200){
+                const codes = result.data;
+                // 根据输入的数量生成新列表
+                for (let i = 0; i < e; i++) {
+                    this.fzList.push({
+                        num: "",
+                        subCode: codes[i],
+                    });
+                    // 同步初始化错误状态数组
+                    this.fzListErrors.push(false);
+                }
             }
+            
         },
         onAverage() {
             const { mfbzl } = this.formData;