Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue

@@ -303,15 +303,16 @@ export default {
 					kc: content.targetActVolume,
 					kcdw: content.targetActVolumeUnit,
 					syl: null,
+					type: null,
 					syldw: content.targetActVolumeUnit,
 					yxzq: content.effectivePeriod,
 					yxzqdw: content.effectivePeriodUnit,
 				})
 			}
-			//使用的试剂
-			this.resourceTmp = tmpResource
-			const result = this.getStepResource()
-			debugger
+			//使用的试剂、仪器
+			const stepResource = this.getStepResource()
+			this.resourceTmp = tmpResource.concat(stepResource.sjResource||[])
+			this.yqResourceTmp = stepResource.yqResource||[]
 			return content;
 		},
 		onSave(){

src/views/business/comps/template/mixins/templateMixin.js

@@ -132,7 +132,7 @@ export default {
 				{ label: 'template.common.reagentName', prop: "mc" },//名称
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
-				{ label: 'template.common.concentration', prop: "nd" },//浓度
+				{ label: 'template.common.concentration', prop: "ndz" },//浓度
 				{ label: 'template.common.source', prop: "ly" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
@@ -140,7 +140,7 @@ export default {
 				{ label: 'template.common.wzName', prop: "mc" },//名称
 				{ label: 'template.common.wzCode', prop: "bh" },//编号
 				{ label: 'template.common.wzSource', prop: "ly" },//来源
-				{ label: 'template.common.wzConcentration', prop: "nd" },//浓度
+				{ label: 'template.common.wzConcentration', prop: "ndz" },//浓度
 				{ label: 'template.common.wzExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [