diff --git a/src/lang/en/template/commonTemplate.js b/src/lang/en/template/commonTemplate.js index 3a6dc05..8194440 100644 --- a/src/lang/en/template/commonTemplate.js +++ b/src/lang/en/template/commonTemplate.js @@ -50,6 +50,13 @@ export default { source: 'Source', reagentExpireDate: 'Expiration Date', + // 物资信息列 + wzName: 'Name', + wzCode: 'Item Number', + wzConcentration: 'Concentration', + wzSource: 'Source', + wzExpireDate: 'Expiration Date', + // 仪器使用信息列 instrumentName: 'Instrument Name', instrumentModel: 'Instrument Model', diff --git a/src/lang/zh/template/commonTemplate.js b/src/lang/zh/template/commonTemplate.js index 53e19b5..b4dbddd 100644 --- a/src/lang/zh/template/commonTemplate.js +++ b/src/lang/zh/template/commonTemplate.js @@ -50,6 +50,13 @@ export default { concentration: '浓度/含量/纯度', source: '来源', reagentExpireDate: '失效日', + + // 物资信息列 + wzName: '名称', + wzCode: '编号', + wzConcentration: '浓度', + wzSource: '物资来源', + wzExpireDate: '失效日', // 仪器使用信息列 instrumentName: '仪器名称', diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index dee709e..d41b1ec 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -51,8 +51,15 @@ export default { id } = v if (v.resource) { - //试验试剂信息 - this.resource = JSON.parse(v.resource) + // 试验物质:供试品、给药制剂 + // 试验试剂:试剂 + //试验试剂信息 type 类型:1:试剂;3:给药制剂;5:麻精药;7:供试品 + this.resource = _.filter(JSON.parse(v.resource),function(o){ + return o.type==1 + }) + this.resourceWz =_.filter(JSON.parse(v.resource),function(o){ + return o.type==3||o.type==7 + }) } if (v.yqResource) { //仪器信息 @@ -116,6 +123,7 @@ export default { formData: {}, templateDetail: {}, resource: [], //试验试剂信息 + resourceWz: [], //物资信息 yqResource: [], //仪器信息 resourceTmp:[],//试验试剂信息提交用 yqResourceTmp: [], //仪器信息提交用 @@ -129,6 +137,13 @@ export default { { label: 'template.common.source', prop: "source" },//来源 { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 ], + sywzColumns: [ + { label: 'template.common.wzName', prop: "mc" },//名称 + { label: 'template.common.wzCode', prop: "bh" },//编号 + { label: 'template.common.wzSource', prop: "source" },//来源 + { label: 'template.common.wzConcentration', prop: "nd" },//浓度 + { label: 'template.common.wzExpireDate', prop: "sxrq" },//失效日期 + ], yqsColumns: [ { label: 'template.common.instrumentName', prop: "mc" },//仪器名称 { label: 'template.common.instrumentModel', prop: "xh" },//仪器型号 diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue index 64c25e7..1fa4afe 100644 --- a/src/views/business/study/comp/sqbd/Bj.vue +++ b/src/views/business/study/comp/sqbd/Bj.vue @@ -249,10 +249,10 @@ export default { id: null, studyId: null, bdbh: null, - bdmc: '麻醉/精神药品配制/领取申请单', + bdmc: '麻精药领取申请单', bdsm: null, templateId: 2, - templateMc: '麻醉/精神药品配制/领取申请单', + templateMc: '麻精药领取申请单', templateSn: 'MJYLQSQD', bdnr: null, fzrsh: null,