From 5a3ab4c13ce1a3a4b33b62a042fe1daac3c50419 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Mon, 30 Mar 2026 15:20:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E9=9D=9E=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E4=BD=BF=E7=94=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/template/comps/dl/DL006.vue | 7 ++++---
 src/views/business/comps/template/comps/dl/DL011.vue | 7 ++++---
 src/views/business/comps/template/comps/dl/DL012.vue | 7 ++++---
 src/views/business/comps/template/comps/dl/DL022.vue | 7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/views/business/comps/template/comps/dl/DL006.vue b/src/views/business/comps/template/comps/dl/DL006.vue
index 98cfded..ce95c07 100644
--- a/src/views/business/comps/template/comps/dl/DL006.vue
+++ b/src/views/business/comps/template/comps/dl/DL006.vue
@@ -476,6 +476,7 @@ export default {
     },
     getResource() {
       let content = this.getFilledFormData();
+      let formData = this.formData;
       let tmpResource = []
       let tmpYq = []
       let addYq = []
@@ -548,10 +549,10 @@ export default {
           }
         }
         tmpYq.push({
-          mc: content.pyxbhmc,
-          xh: content.pyxbhxh,
+          mc: content.pyxbhmc || formData.pyxbhmc,
+          xh: content.pyxbhxh || formData.pyxbhxh,
           bh: content.pyxbh,
-          jzrq: content.pyxbhjzrq,
+          jzrq: content.pyxbhjzrq || formData.pyxbhjzrq,
         })
       }
       const stepResource = this.$refs.stepRef.getStepResource()
diff --git a/src/views/business/comps/template/comps/dl/DL011.vue b/src/views/business/comps/template/comps/dl/DL011.vue
index aa423b5..fbf0b59 100644
--- a/src/views/business/comps/template/comps/dl/DL011.vue
+++ b/src/views/business/comps/template/comps/dl/DL011.vue
@@ -363,6 +363,7 @@ export default {
     },
     getResource() {
       const content = this.getFilledFormData()
+      let formData = this.formData;
       let tmpResource = []
       let tmpYq = []
       //生成细胞
@@ -405,10 +406,10 @@ export default {
       })
       //使用仪器
       tmpYq.push({
-        mc: content.pyxbh_mc,
-        xh: content.pyxbh_xh,
+        mc: content.pyxbh_mc || formData.pyxbh_mc,
+        xh: content.pyxbh_xh || formData.pyxbh_xh,
         bh: content.pyxbh,
-        jzrq: content.pyxbh_jzrq
+        jzrq: content.pyxbh_jzrq || formData.pyxbh_jzrq,
       })
       //使用的试剂、仪器
       const stepResource = this.$refs.stepRef.getStepResource()
diff --git a/src/views/business/comps/template/comps/dl/DL012.vue b/src/views/business/comps/template/comps/dl/DL012.vue
index 00b6ba4..531f5ea 100644
--- a/src/views/business/comps/template/comps/dl/DL012.vue
+++ b/src/views/business/comps/template/comps/dl/DL012.vue
@@ -369,6 +369,7 @@ export default {
     },
     getResource() {
       const content = this.getFilledFormData()
+      let formData = this.formData;
       let tmpResource = []
       let tmpYq = []
       //生成细胞
@@ -413,10 +414,10 @@ export default {
       })
       //使用仪器
       tmpYq.push({
-        mc: content.pyxbh_mc,
-        xh: content.pyxbh_xh,
+        mc: content.pyxbh_mc || formData.pyxbh_mc,
+        xh: content.pyxbh_xh || formData.pyxbh_xh,
         bh: content.pyxbh,
-        jzrq: content.pyxbh_jzrq,
+        jzrq: content.pyxbh_jzrq || formData.pyxbh_jzrq,
       })
       //使用的试剂、仪器
       const stepResource = this.$refs.stepRef.getStepResource()
diff --git a/src/views/business/comps/template/comps/dl/DL022.vue b/src/views/business/comps/template/comps/dl/DL022.vue
index e9a0aab..6891ae9 100644
--- a/src/views/business/comps/template/comps/dl/DL022.vue
+++ b/src/views/business/comps/template/comps/dl/DL022.vue
@@ -343,12 +343,13 @@ export default {
 		},
 		getResource() {
 			let content = this.getFilledFormData();
+			let formData = this.formData;
 			let tmpYq = []
 			tmpYq.push({
-				mc: content.wxjmc,
-				xh: content.wxjxh,
+				mc: content.wxjmc || formData.wxjmc,
+				xh: content.wxjxh || formData.wxjxh,
 				bh: content.xwj,
-				jzrq: content.wxjjzrq,
+				jzrq: content.wxjjzrq || formData.wxjjzrq,
 			})
 
 			this.resourceTmp = []