From 8b2754e1b4d79d7904aa955b8ee6f61bbc2de03a Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Tue, 13 Jan 2026 11:18:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A[=E5=A1=AB=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95]=E7=94=9F=E6=88=90=E6=9C=80=E7=BB=88=E7=9A=84?=
 =?UTF-8?q?=E7=89=A9=E8=B5=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue | 4 +++-
 src/views/business/study/comp/tbbd/Bj.vue                  | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
index 99d2820..2cf4c7e 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
@@ -282,7 +282,7 @@ export default {
 			//配置的试剂
 			tmpResource.push({
 				mc: content.targetName,
-				bh: content.targetCode,
+				bh: content.targetCode+content.targetCodeSn,
 				ph: '',
 				nd: content.targetActConcentration + content.targetActConcentrationUnit,
 				source: '配置',
@@ -293,6 +293,8 @@ export default {
 				kcdw: content.targetActVolumeUnit,
 				syl: null,
 				syldw:content.targetActVolumeUnit,
+				yxzq:content.effectivePeriod,
+				yxzqdw:content.effectivePeriodUnit,
 			})
 			//使用的试剂
 			this.resource=tmpResource
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index 424c51f..b892aa2 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -488,8 +488,12 @@ export default {
         if (valid) {
           that.$modal.loading()
           that.formApprove.resource = JSON.stringify(that.resource)
-          that.formApprove.czlist = JSON.stringify(that.czlist)
+          if(that.czlist.length>0){
+            that.formApprove.czlist = JSON.stringify(that.czlist)
+          }
+          if(that.cclist.length>0){
           that.formApprove.cclist = JSON.stringify(that.cclist)
+          }
           studyFormFill_tj(that.formApprove).then(response => {
             that.openApprove = false
             that.$modal.closeLoading()

From 91c994ac91adb8c8a2799ddf8a8181a038ff1564 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Tue, 13 Jan 2026 12:15:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A[=E5=A1=AB=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95]=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
index 2cf4c7e..23c0020 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
@@ -285,7 +285,7 @@ export default {
 				bh: content.targetCode+content.targetCodeSn,
 				ph: '',
 				nd: content.targetActConcentration + content.targetActConcentrationUnit,
-				source: '配置',
+				source: 'ELN配制',
 				sxrq: content.expireDate,
 				ndz: content.targetActConcentration,
 				nddw: content.targetActConcentrationUnit,