diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue index bd51624..a08c52a 100644 --- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue @@ -568,11 +568,11 @@ export default { mc: null, bh: item.targetSolutionCode + item.subTargetSolutionCode, ph: null, - nd: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit, - source: 'ELN配制', - sxrq: content.expireDate, - ndz: item.actSolutionConcentration, + nd: item.actSolutionConcentration, nddw: content.headerSelectFields.actSolutionConcentrationUnit, + ndz: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit, + ly: 'ELN配制', + sxrq: content.expireDate, kc: total, kcdw: unit, syl: null, @@ -586,11 +586,11 @@ export default { mc: null, bh: item.fzsj.mybh + '-' + item.fzsj.fzList[j].subCode, ph: null, - nd: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit, - source: 'ELN配制', - sxrq: content.expireDate, - ndz: item.actSolutionConcentration, + nd: item.actSolutionConcentration, nddw: content.headerSelectFields.actSolutionConcentrationUnit, + ndz: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit, + ly: 'ELN配制', + sxrq: content.expireDate, kc: item.fzsj.fzList[j].num, kcdw: item.fzsj.dw, syl: null, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue index 56476b9..51a5ea2 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue @@ -296,11 +296,11 @@ export default { mc: content.targetName, bh: content.targetCode + content.targetCodeSn, ph: '', - nd: content.targetActConcentration + content.targetActConcentrationUnit, - source: 'ELN配制', - sxrq: content.expireDate, - ndz: content.targetActConcentration, + nd: content.targetActConcentration, nddw: content.targetActConcentrationUnit, + ndz: content.targetActConcentration + content.targetActConcentrationUnit, + ly: 'ELN配制', + sxrq: content.expireDate, kc: content.targetActVolume, kcdw: content.targetActVolumeUnit, syl: null, 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 7f6fe93..60721c3 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue @@ -354,11 +354,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, 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 41e4c76..bb6b3e5 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue @@ -354,11 +354,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, 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 f7dd611..1206f25 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue @@ -342,11 +342,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, 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 af0150f..47c75f5 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue @@ -354,11 +354,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, 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 4ac1e66..b444c6b 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue @@ -354,11 +354,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, 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 cdae637..f166837 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue @@ -445,11 +445,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, @@ -470,11 +470,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields_1.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields_1.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields_1.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, 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 d42bf24..5044062 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue @@ -354,11 +354,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, 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 135c022..f031267 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue @@ -354,11 +354,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, 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 5956223..fe684eb 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue @@ -354,11 +354,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, 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 16b634c..1026adf 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue @@ -354,11 +354,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue index f76346e..dbf3a0e 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue @@ -340,11 +340,11 @@ export default { mc: null, bh: item.bh+item.bhCode, ph: null, - nd: item.hhwznd + content.headerSelectFields.hhwzndUnit, - source: 'ELN配制', - sxrq: null, - ndz: item.hhwznd, + ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit, + nd: item.hhwznd, nddw: content.headerSelectFields.hhwzndUnit, + ly: 'ELN配制', + sxrq: null, kc: total, kcdw: unit, syl: null, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue index bb69a1e..9d164aa 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue @@ -295,11 +295,11 @@ export default { mc: content.targetName, bh: content.targetCode + content.targetCodeSn, ph: '', - nd: content.targetActConcentration + content.targetActConcentrationUnit, - source: 'ELN配制', - sxrq: content.expireDate, - ndz: content.targetActConcentration, + ndz: content.targetActConcentration + content.targetActConcentrationUnit, + nd: content.targetActConcentration, nddw: content.targetActConcentrationUnit, + ly: 'ELN配制', + sxrq: content.expireDate, kc: content.targetActVolume, kcdw: content.targetActVolumeUnit, syl: null, @@ -310,6 +310,8 @@ export default { } //使用的试剂 this.resourceTmp = tmpResource + const result = this.getStepResource() + debugger return content; }, onSave(){ diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue index e684b65..26369c4 100644 --- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue @@ -587,11 +587,11 @@ export default { mc: null, bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode, ph: null, - nd: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit, - source: 'ELN配制', - sxrq: ladderConfigs.expireDate, - ndz: stepTableFormData[j].actSolutionConcentration, + ndz:stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit, + nd: stepTableFormData[j].actSolutionConcentration, nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit, + ly: 'ELN配制', + sxrq: ladderConfigs.expireDate, kc: total, kcdw: unit, syl: null, @@ -606,11 +606,11 @@ export default { mc: null, bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode, ph: null, - nd: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit, - source: 'ELN配制', - sxrq: ladderConfigs.expireDate, - ndz: stepTableFormData[j].actSolutionConcentration, + nd: stepTableFormData[j].actSolutionConcentration, nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit, + ndz: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit, + ly: 'ELN配制', + sxrq: ladderConfigs.expireDate, kc: fzsj.fzList[k].num, kcdw: fzsj.dw, syl: null, @@ -634,11 +634,11 @@ export default { mc: null, bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode, ph: null, - nd: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit, - source: 'ELN配制', - sxrq: stepTableFormData[j].targetSolutionExpirationDate, - ndz: stepTableFormData[j].actSolutionConcentration, + nd: stepTableFormData[j].actSolutionConcentration, + ndz: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit, nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit, + ly: 'ELN配制', + sxrq: stepTableFormData[j].targetSolutionExpirationDate, kc: total, kcdw: unit, syl: null, @@ -653,11 +653,11 @@ export default { mc: null, bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode, ph: null, - nd: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit, - source: 'ELN配制', - sxrq: paralleConfigs.expireDate, - ndz: stepTableFormData[j].actSolutionConcentration, + ndz: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit, + nd: stepTableFormData[j].actSolutionConcentration, nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit, + ly: 'ELN配制', + sxrq: paralleConfigs.expireDate, kc: fzsj.fzList[k].num, kcdw: fzsj.dw, syl: null, diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index 8153540..658a1c9 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -133,13 +133,13 @@ export default { { 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.source', prop: "ly" },//来源 { 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.wzSource', prop: "ly" },//来源 { label: 'template.common.wzConcentration', prop: "nd" },//浓度 { label: 'template.common.wzExpireDate', prop: "sxrq" },//失效日期 ],