diff --git a/src/views/business/comps/template/comps/dl/DL011.vue b/src/views/business/comps/template/comps/dl/DL011.vue index e7c8480..2369d9e 100644 --- a/src/views/business/comps/template/comps/dl/DL011.vue +++ b/src/views/business/comps/template/comps/dl/DL011.vue @@ -125,7 +125,9 @@ export default { return { getMybh: () => { const data = this.$refs[refConf.xbxx].getFilledFormData() - return { mybh: data.fshxbbh + data.fshxbbhCodeSn, maxVolume: data.fshxbsjtj, maxVolumeUnit: data.fshxbsjtjUnit } + return { mybh: data.fshxbbh + data.fshxbbhCodeSn, maxVolume: data.fshxbsjtj, maxVolumeUnit: data.fshxbsjtjUnit, + nd:null,ndz:null,nddw:null,sxrq:null,elnType:this.product,yxzq:null,yxzqdw:null + } } } }, diff --git a/src/views/business/comps/template/comps/dl/DL012.vue b/src/views/business/comps/template/comps/dl/DL012.vue index 725122d..a41f110 100644 --- a/src/views/business/comps/template/comps/dl/DL012.vue +++ b/src/views/business/comps/template/comps/dl/DL012.vue @@ -79,7 +79,9 @@ export default { getMybh: () => { const data = this.$refs[refConf.xbxx].getFilledFormData(); const mybhs = this.transformMybh(data); - return { mybhOptions:mybhs, maxVolume: data.zbhxbsjtj, maxVolumeUnit: data.zbhxbsjtjUnit } + return { mybhOptions:mybhs, maxVolume: data.zbhxbsjtj, maxVolumeUnit: data.zbhxbsjtjUnit, + nd:null,ndz:null,nddw:null,sxrq:null,elnType:this.product,yxzq:null,yxzqdw:null + } } } }, diff --git a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue index 26e231e..187f123 100644 --- a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue +++ b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue @@ -76,7 +76,9 @@ export default { return { getMybhByIndex: (index) => { const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData() - return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit } + return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit, + nd:data.targetActConcentration,ndz:`${data.targetActConcentration}${data.targetActConcentrationUnit}`,nddw:data.targetActConcentrationUnit,sxrq:data.expireDate,elnType:this.product,yxzq:data.effectivePeriod,yxzqdw:data.effectivePeriodUnit + } } } }, diff --git a/src/views/business/comps/template/comps/gsp/GSP001.vue b/src/views/business/comps/template/comps/gsp/GSP001.vue index 4aaaa51..ea89737 100644 --- a/src/views/business/comps/template/comps/gsp/GSP001.vue +++ b/src/views/business/comps/template/comps/gsp/GSP001.vue @@ -79,7 +79,9 @@ export default { return { getMybhByIndex: (index) => { const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData() - return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit } + return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit, + nd:data.targetActConcentration,ndz:`${data.targetActConcentration}${data.targetActConcentrationUnit}`,nddw:data.targetActConcentrationUnit,sxrq:data.expireDate,elnType:this.product,yxzq:data.effectivePeriod,yxzqdw:data.effectivePeriodUnit + } } } }, diff --git a/src/views/business/comps/template/comps/gsp/GSP003.vue b/src/views/business/comps/template/comps/gsp/GSP003.vue index 058a5c3..a9fdf2e 100644 --- a/src/views/business/comps/template/comps/gsp/GSP003.vue +++ b/src/views/business/comps/template/comps/gsp/GSP003.vue @@ -81,7 +81,9 @@ export default { return { getMybhByIndex: (index) => { const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData() - return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit } + return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit, + nd:data.targetActConcentration,ndz:`${data.targetActConcentration}${data.targetActConcentrationUnit}`,nddw:data.targetActConcentrationUnit,sxrq:data.expireDate,elnType:this.product,yxzq:data.effectivePeriod,yxzqdw:data.effectivePeriodUnit + } } } }, diff --git a/src/views/business/comps/template/comps/gsp/GSP005.vue b/src/views/business/comps/template/comps/gsp/GSP005.vue index 1fb40d5..e5547f3 100644 --- a/src/views/business/comps/template/comps/gsp/GSP005.vue +++ b/src/views/business/comps/template/comps/gsp/GSP005.vue @@ -119,11 +119,15 @@ export default { getMybhByIndex: (index, type) => { if (type === 'formZl') { const data = this.$refs[`formZlConfigFormPackageRef_${index}`][0].getFilledFormData() - return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit } + return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit, + nd:data.targetActConcentration,ndz:`${data.targetActConcentration}${data.targetActConcentrationUnit}`,nddw:data.targetActConcentrationUnit,sxrq:data.expireDate,elnType:this.product,yxzq:data.effectivePeriod,yxzqdw:data.effectivePeriodUnit + } } else { const data = this.$refs[`formRyConfigFormPackageRef_${index}`][0].getFilledFormData() - return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit } + return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit, + nd:data.targetActConcentration,ndz:`${data.targetActConcentration}${data.targetActConcentrationUnit}`,nddw:data.targetActConcentrationUnit,sxrq:data.expireDate,elnType:this.product,yxzq:data.effectivePeriod,yxzqdw:data.effectivePeriodUnit + } } } } diff --git a/src/views/business/comps/template/comps/gsp/GSP010.vue b/src/views/business/comps/template/comps/gsp/GSP010.vue index c1ba8bd..f2fb506 100644 --- a/src/views/business/comps/template/comps/gsp/GSP010.vue +++ b/src/views/business/comps/template/comps/gsp/GSP010.vue @@ -72,7 +72,9 @@ export default { return { getMybhByIndex: (index) => { const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData() - return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit } + return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit, + nd:data.targetActConcentration,ndz:`${data.targetActConcentration}${data.targetActConcentrationUnit}`,nddw:data.targetActConcentrationUnit,sxrq:data.expireDate,elnType:this.product,yxzq:data.effectivePeriod,yxzqdw:data.effectivePeriodUnit + } } } }, diff --git a/src/views/business/comps/template/comps/sp/SP001.vue b/src/views/business/comps/template/comps/sp/SP001.vue index c1e2673..4f3981d 100644 --- a/src/views/business/comps/template/comps/sp/SP001.vue +++ b/src/views/business/comps/template/comps/sp/SP001.vue @@ -50,7 +50,9 @@ export default { return { getMybh: ()=>{ const data = this.$refs['stepFormPackageRef'].getFilledFormData() - return {mybh:data.targetCode+data.targetCodeSn,maxVolume:data.targetActVolume,maxVolumeUnit:data.targetActVolumeUnit} + return {mybh:data.targetCode+data.targetCodeSn,maxVolume:data.targetActVolume,maxVolumeUnit:data.targetActVolumeUnit, + nd:data.targetActConcentration,ndz:`${data.targetActConcentration}${data.targetActConcentrationUnit}`,nddw:data.targetActConcentrationUnit,sxrq:data.expireDate,elnType:this.product,yxzq:data.effectivePeriod,yxzqdw:data.effectivePeriodUnit + } } } },