From 074be6189a53e15f1114a57edaf0930fd5dab43f Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Wed, 28 Jan 2026 14:43:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E6=8F=90=E5=8D=87=E5=9B=9E=E6=94=B6=E7=8E=87=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue  | 24 +++++++++++++---------
 .../formConfig/SWYPFXFFXYPZBBTableConfig.js        |  8 ++++----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
index 3181e37..5140d4b 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
@@ -2,7 +2,7 @@
 <template>
 	<div>
 		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.templateMc ||
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc ||
 				$t('template.sp.sp009.title') }}<img src="@/assets/images/detail-title.png" /></div>
 			<div class="detail-content">
 				<div class="content">
@@ -78,6 +78,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
+import { addTj } from "@/utils/calUnitTools";
 export default {
 	name: "SWYPFXRYPZB",
 	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog },
@@ -380,7 +381,6 @@ export default {
 						resourceList: null,
 					}
 					setTimeout(() => {
-						debugger
 						EventBus.$emit('onModifyRecord', params,)
 					}, 10);
 				}
@@ -428,6 +428,9 @@ export default {
 				for(let i=0;i<tableList.length;i++){
 					//配置的试剂
 					let item = tableList[i]
+
+					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
+
 					tmpResource.push({
 						mc: null,
 						bh: item.bh+item.bhCode,
@@ -437,10 +440,10 @@ export default {
 						sxrq: null,
 						ndz: item.hhwznd,
 						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: item.sjjzxql+item.sjryxql,//todo 单位不一致-计算
-						kcdw: content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+						kc: total,
+						kcdw: unit,
 						syl: null,
-						syldw:content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算,
+						syldw:unit,
 						yxzq:null,
 						yxzqdw:null,
 					})
@@ -452,19 +455,20 @@ export default {
 				for(let i=0;i<tableList.length;i++){
 					//配置的试剂
 					let item = tableList[i]
+					const { total, unit } = addTj([item.sjryxql, item.sjgzyxql,item.sjxsyxql], [content.headerSelectFields_1.sjryxqlUnit, content.headerSelectFields_1.sjgzyxqlUnit,content.headerSelectFields_1.sjxsyxqlUnit])
 					tmpResource.push({
 						mc: null,
 						bh: item.bh+item.bhCode,
 						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+						nd: item.hhwznd + content.headerSelectFields_1.hhwzndUnit,
 						source: 'ELN配制',
 						sxrq: null,
 						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: item.sjryxql+item.sjgzyxql + item.sjxsyxql,//todo 单位不一致-计算
-						kcdw: content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+						nddw: content.headerSelectFields_1.hhwzndUnit,
+						kc: total,
+						kcdw: unit,
 						syl: null,
-						syldw:content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算,
+						syldw:unit,
 						yxzq:null,
 						yxzqdw:null,
 					})
diff --git a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
index 20e145e..41c453c 100644
--- a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
+++ b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
@@ -21,8 +21,8 @@ export const getSWYPFXFFXYPZBBTableConfig = (
       bodyFillType: 'preFill',
       width: 280,
       myCodeFields: ['bh', 'bhOther', 'bhCode'],
-      maxVolumeField: 'sjryxql', //分装的最大量字段
-      maxVolumeFieldUnit: 'sjryxqlUnit' //分装的最大量单位字段
+      maxVolumeField: 'sjryxql,sjjzxql', //分装的最大量字段
+      maxVolumeFieldUnit: 'sjryxqlUnit,sjjzxqlUnit' //分装的最大量单位字段
     },
     {
       label: 'template.sp.sp008.ysry',
@@ -123,8 +123,8 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       bodyFillType: 'preFill',
       width: 280,
       myCodeFields: ['bh', 'bhCode'],
-      maxVolumeField: 'sjryxql', //分装的最大量字段
-      maxVolumeFieldUnit: 'sjryxqlUnit' //分装的最大量单位字段
+      maxVolumeField: 'sjryxql,sjgzyxql,sjxsyxql', //分装的最大量字段
+      maxVolumeFieldUnit: 'sjryxqlUnit,sjgzyxqlUnit,sjxsyxqlUnit' //分装的最大量单位字段
     },
     {
       label: 'template.sp.sp008.ysry',