fix: [模板管理] 非配置字段的赋值使用修改

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()

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()

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()

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 = []