diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue index 48b6f64..07ab7cb 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue @@ -304,6 +304,7 @@ export default { kcdw: content.targetActVolumeUnit, syl: null, type: null, + elnType:this.product, syldw: content.targetActVolumeUnit, yxzq: content.effectivePeriod, yxzqdw: content.effectivePeriodUnit, diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index cf80ed5..8848ba0 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -55,16 +55,17 @@ export default { // 试验试剂:试剂 //试验试剂信息 type 类型:1:试剂;3:给药制剂;5:麻精药;7:供试品 this.resource = _.filter(JSON.parse(v.resource),function(o){ - return o.type==1 + return o.type==1||o.elnType==1 }) this.resourceWz =_.filter(JSON.parse(v.resource),function(o){ - return o.type==3||o.type==7 + return o.type==3||o.type==7||o.elnType==3||o.elnType==7 }) } if (v.yqResource) { //仪器信息 this.yqResource = JSON.parse(v.yqResource) } + this.product=v.product||null if (v.bdnr) { this.formData = { ...JSON.parse(v.bdnr), @@ -122,6 +123,7 @@ export default { return { formData: {}, templateDetail: {}, + product:null,//产物:1:试剂;3:给药制剂;5:麻精药 resource: [], //试验试剂信息 wzResource: [], //物资信息 yqResource: [], //仪器信息