From 28c68c75bf02be25d8039591bea577b3876872c2 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 28 Jan 2026 15:03:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=E8=89=B2=E8=B0=B103,04,05,06?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/sp/SWYPBQGZYZBB.vue    |  9 +++++----
 .../business/comps/template/comps/sp/SWYPNBGZYZBB.vue    | 16 +++++++++-------
 src/views/business/study/comp/tbbd/Qrfz.vue              |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
index cac1b6e..85962a5 100644
--- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
@@ -553,6 +553,8 @@ export default {
 			if (tableList && tableList.length > 0) {
 				for (let i = 0; i < tableList.length; i++) {
 					let item = tableList[i]
+					//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+			        const { total, unit } = addTj([item.actStartSolutionVolume, item.actDiluentVolumeUnit], [content.headerSelectFields.actStartSolutionVolumeUnit, content.headerSelectFields.actDiluentVolumeUnit])
 					tmpResource.push({
 						mc: null,
 						bh: item.targetSolutionCode + item.subTargetSolutionCode,
@@ -562,10 +564,10 @@ export default {
 						sxrq: content.expireDate,
 						ndz: item.actSolutionConcentration,
 						nddw: content.headerSelectFields.actSolutionConcentrationUnit,
-						kc: item.actStartSolutionVolume + item.actDiluentVolume,//todo 单位不一致-计算
-						kcdw: content.headerSelectFields.actStartSolutionVolumeUnit || content.headerSelectFields.actDiluentVolumeUnit,//todo 单位不一致-计算-按最小算
+						kc: total,
+						kcdw: unit,
 						syl: null,
-						syldw: content.headerSelectFields.actStartSolutionVolumeUnit || content.headerSelectFields.actDiluentVolumeUnit,//todo 单位不一致-计算-按最小算,
+						syldw: unit,
 						yxzq: content.effectivePeriod,
 						yxzqdw: content.effectivePeriodUnit,
 					})
@@ -591,7 +593,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			this.resourceTmp = tmpResource
 
 			return content;
diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
index 5e80177..64b2de9 100644
--- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
@@ -577,6 +577,8 @@ export default {
 					let ladderConfigs = content.ladderConfigs[i]
 					let stepTableFormData = ladderConfigs.stepTableFormData
 					for (let j = 0; j < stepTableFormData.length; j++) {
+						//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+			            const { total, unit } = addTj([stepTableFormData[j].actStartSolutionVolume, stepTableFormData[j].actDiluentVolume], [ladderConfigs.headerSelectFields.actStartSolutionVolumeUnit, ladderConfigs.headerSelectFields.actDiluentVolumeUnit])
 						tmpResource.push({
 							mc: null,
 							bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
@@ -586,10 +588,10 @@ export default {
 							sxrq: ladderConfigs.expireDate,
 							ndz: stepTableFormData[j].actSolutionConcentration,
 							nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
-							kc: stepTableFormData[j].actSolutionVolume,
-							kcdw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit,
+							kc: total,
+							kcdw: unit,
 							syl: null,
-							syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit,
+							syldw: unit,
 							yxzq: ladderConfigs.effectivePeriod,
 							yxzqdw: ladderConfigs.effectivePeriodUnit,
 						})
@@ -623,6 +625,7 @@ export default {
 					let paralleConfigs = content.paralleConfigs[i]
 					let stepTableFormData = paralleConfigs.stepTableFormData
 					for (let j = 0; j < stepTableFormData.length; j++) {
+						 const { total, unit } = addTj([stepTableFormData[j].actSolutionVolume, stepTableFormData[j].actDiluentVolume], [paralleConfigs.headerSelectFields.actSolutionVolumeUnit, paralleConfigs.headerSelectFields.actDiluentVolumeUnit])
 						tmpResource.push({
 							mc: null,
 							bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
@@ -632,10 +635,10 @@ export default {
 							sxrq: stepTableFormData[j].targetSolutionExpirationDate,
 							ndz: stepTableFormData[j].actSolutionConcentration,
 							nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
-							kc: stepTableFormData[j].actSolutionVolume,
-							kcdw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit,
+							kc: total,
+							kcdw: unit,
 							syl: null,
-							syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit,
+							syldw: unit,
 							yxzq: stepTableFormData[j].targetSolutionCycle,
 							yxzqdw: stepTableFormData[j].targetSolutionCyclePrecision,
 						})
@@ -663,7 +666,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			this.resourceTmp = tmpResource
 			return content;
 		},
diff --git a/src/views/business/study/comp/tbbd/Qrfz.vue b/src/views/business/study/comp/tbbd/Qrfz.vue
index 1de5bad..5c213b6 100644
--- a/src/views/business/study/comp/tbbd/Qrfz.vue
+++ b/src/views/business/study/comp/tbbd/Qrfz.vue
@@ -88,7 +88,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        qmyymc: $t('page.business.study.studyFormFill.fztgjj'),
+        qmyymc: this.$t('page.business.study.studyFormFill.fztgjj'),
         qmyy: null,
         remark: null,
         qmrmm: null