From b08589b22d2b9291cfde3386cc57ae457680a9a6 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 30 Jan 2026 22:27:01 +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]=E4=BB=AA=E5=99=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue | 9 +++++---- src/views/business/comps/template/mixins/templateMixin.js | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue index 3915ad1..48b6f64 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue +++ b/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(){ diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index 658a1c9..cf80ed5 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/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: [