From 37b22903b8a169ae1553c557b5f3a3eca72120f8 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Sat, 31 Jan 2026 09:51:27 +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=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/comps/template/comps/sp/SWYPBQGZYZBB.vue | 2 +- .../business/comps/template/comps/sp/SWYPFXCBYPZB.vue | 2 +- .../comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue | 16 +--------------- .../template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue | 16 +--------------- .../comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue | 16 +--------------- .../comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue | 17 ++--------------- .../comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue | 16 +--------------- .../comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue | 16 +--------------- .../comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue | 16 +--------------- .../comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue | 16 +--------------- .../comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue | 16 +--------------- .../comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue | 16 +--------------- .../business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue | 2 +- .../business/comps/template/comps/sp/SWYPFXRYPZB.vue | 7 ++++--- .../business/comps/template/comps/sp/SWYPNBGZYZBB.vue | 2 +- .../business/comps/template/mixins/templateMixin.js | 10 +++++----- 16 files changed, 24 insertions(+), 162 deletions(-) diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue index b9d3941..74b0277 100644 --- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue index 51a5ea2..e8bf856 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue index 60721c3..53d3b60 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue @@ -10,7 +10,7 @@ :formConfig="baseInfoFormConfig" :formData="formData" /> - @@ -241,20 +241,6 @@ export default { rowIndex:0,//当前表格点击的行数 resource: [], - sysjColumns: [ - { 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.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue index bb6b3e5..ac3a373 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue @@ -10,7 +10,7 @@ :formConfig="baseInfoFormConfig" :formData="formData" /> - @@ -241,20 +241,6 @@ export default { rowIndex:0,//当前表格点击的行数 resource: [], - sysjColumns: [ - { 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.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue index 1206f25..071f959 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue @@ -10,7 +10,7 @@ :formConfig="baseInfoFormConfig" :formData="formData" /> - @@ -239,20 +239,6 @@ export default { rowIndex:0,//当前表格点击的行数 resource: [], - sysjColumns: [ - { 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.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue index 47c75f5..72486d7 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue @@ -10,7 +10,7 @@ :formConfig="baseInfoFormConfig" :formData="formData" /> - @@ -241,20 +241,7 @@ export default { rowIndex:0,//当前表格点击的行数 resource: [], - sysjColumns: [ - { 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.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], + formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue index b444c6b..7de853b 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue @@ -10,7 +10,7 @@ :formConfig="baseInfoFormConfig" :formData="formData" /> - @@ -241,20 +241,6 @@ export default { rowIndex:0,//当前表格点击的行数 resource: [], - sysjColumns: [ - { 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.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue index f166837..0211402 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue @@ -9,7 +9,7 @@ - + @@ -280,20 +280,6 @@ export default { reagentType: '', resource: [], resourceData1: [], - sysjColumns: [ - { 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.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue index 5044062..f838cd3 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue @@ -10,7 +10,7 @@ :formConfig="baseInfoFormConfig" :formData="formData" /> - @@ -241,20 +241,6 @@ export default { rowIndex:0,//当前表格点击的行数 resource: [], - sysjColumns: [ - { 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.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue index f031267..34dc1a7 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue @@ -10,7 +10,7 @@ :formConfig="baseInfoFormConfig" :formData="formData" /> - @@ -241,20 +241,6 @@ export default { rowIndex:0,//当前表格点击的行数 resource: [], - sysjColumns: [ - { 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.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue index fe684eb..e81bd77 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue @@ -10,7 +10,7 @@ :formConfig="baseInfoFormConfig" :formData="formData" /> - @@ -241,20 +241,6 @@ export default { rowIndex:0,//当前表格点击的行数 resource: [], - sysjColumns: [ - { 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.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue index 1026adf..b2881a2 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue @@ -10,7 +10,7 @@ :formConfig="baseInfoFormConfig" :formData="formData" /> - @@ -241,20 +241,6 @@ export default { rowIndex:0,//当前表格点击的行数 resource: [], - sysjColumns: [ - { 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.source', prop: "source" },//来源 - { label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期 - ], - yqsColumns: [ - { label: 'template.common.instrumentName', prop: "instrumentName" }, - { label: 'template.common.instrumentModel', prop: "instrumentModel" }, - { label: 'template.common.instrumentCode', prop: "instrumentCode" }, - { label: 'template.common.nextTestDate', prop: "nextTestDate" }, - ], formData: {} }; }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue index dbf3a0e..8b15adc 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue @@ -10,7 +10,7 @@ :formConfig="baseInfoFormConfig" :formData="formData" /> - diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue index 07ab7cb..4334d54 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue @@ -9,7 +9,8 @@ - + + @@ -25,7 +26,7 @@ ref="remarkRef" :formConfig="remarkConig" :formData="formData" /> - + @@ -304,7 +305,7 @@ export default { kcdw: content.targetActVolumeUnit, syl: null, type: null, - elnType:this.product, + elnType: this.product, syldw: content.targetActVolumeUnit, yxzq: content.effectivePeriod, yxzqdw: content.effectivePeriodUnit, diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue index cc302b4..a29c8ea 100644 --- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index 8848ba0..f12e620 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -51,12 +51,12 @@ export default { id } = v if (v.resource) { - // 试验物质：供试品、给药制剂 - // 试验试剂：试剂 - //试验试剂信息 type 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品 + //type 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品 + //试验试剂信息 试剂 this.resource = _.filter(JSON.parse(v.resource),function(o){ return o.type==1||o.elnType==1 }) + //试验物资信息 供试品、给药制剂 this.resourceWz =_.filter(JSON.parse(v.resource),function(o){ return o.type==3||o.type==7||o.elnType==3||o.elnType==7 }) @@ -125,7 +125,7 @@ export default { templateDetail: {}, product:null,//产物：1：试剂；3：给药制剂；5：麻精药 resource: [], //试验试剂信息 - wzResource: [], //物资信息 + resourceWz: [], //物资信息 yqResource: [], //仪器信息 resourceTmp:[],//试验试剂信息提交用 @@ -145,7 +145,7 @@ export default { { label: 'template.common.wzConcentration', prop: "ndz" },//浓度 { label: 'template.common.wzExpireDate', prop: "sxrq" },//失效日期 ], - yqsColumns: [ + yqColumns: [ { label: 'template.common.instrumentName', prop: "mc" },//仪器名称 { label: 'template.common.instrumentModel', prop: "xh" },//仪器型号 { label: 'template.common.instrumentCode', prop: "bh" },//仪器编号