|
|
@ -248,16 +248,9 @@ export default { |
|
|
}; |
|
|
}; |
|
|
}, |
|
|
}, |
|
|
mounted() { |
|
|
mounted() { |
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
watch: { |
|
|
|
|
|
formData: { |
|
|
|
|
|
immediate: true, |
|
|
|
|
|
handler(v) { |
|
|
|
|
|
if (!v.targetCodeSn && this.fillType === "actFill") { |
|
|
|
|
|
this.getCode(v); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
const formData = this.getFormDataByTemplateData(); |
|
|
|
|
|
if (!formData.targetCodeSn && this.fillType === "actFill") { |
|
|
|
|
|
this.getCode(formData); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
@ -270,15 +263,15 @@ export default { |
|
|
|
|
|
|
|
|
EventBus.$emit('showTagPrintDialog', { printConfig }) |
|
|
EventBus.$emit('showTagPrintDialog', { printConfig }) |
|
|
}, |
|
|
}, |
|
|
getStepResource(){ |
|
|
|
|
|
|
|
|
getStepResource() { |
|
|
return this.$refs.stepRef.getStepResource() |
|
|
return this.$refs.stepRef.getStepResource() |
|
|
}, |
|
|
}, |
|
|
//获取目标溶液编号 |
|
|
//获取目标溶液编号 |
|
|
async getCode(v) { |
|
|
async getCode(v) { |
|
|
const result = await getLatestSn({ |
|
|
const result = await getLatestSn({ |
|
|
count: 1, |
|
|
count: 1, |
|
|
pre:v.targetCode, |
|
|
|
|
|
type:1 |
|
|
|
|
|
|
|
|
pre: v.targetCode, |
|
|
|
|
|
type: 1 |
|
|
}) |
|
|
}) |
|
|
if (result.code == 200) { |
|
|
if (result.code == 200) { |
|
|
this.$refs.stepFormPackageRef.updateFormData("targetCodeSn", result.data[0]) |
|
|
this.$refs.stepFormPackageRef.updateFormData("targetCodeSn", result.data[0]) |
|
|
@ -301,7 +294,7 @@ export default { |
|
|
ph: '', |
|
|
ph: '', |
|
|
nd: content.targetActConcentration, |
|
|
nd: content.targetActConcentration, |
|
|
nddw: content.targetActConcentrationUnit, |
|
|
nddw: content.targetActConcentrationUnit, |
|
|
ndz: content.targetActConcentration + content.targetActConcentrationUnit, |
|
|
|
|
|
|
|
|
ndz: content.targetActConcentration + content.targetActConcentrationUnit, |
|
|
ly: 'ELN配制', |
|
|
ly: 'ELN配制', |
|
|
sxrq: content.expireDate, |
|
|
sxrq: content.expireDate, |
|
|
kc: content.targetActVolume, |
|
|
kc: content.targetActVolume, |
|
|
@ -316,8 +309,8 @@ export default { |
|
|
} |
|
|
} |
|
|
//使用的试剂、仪器 |
|
|
//使用的试剂、仪器 |
|
|
const stepResource = this.$refs.stepRef.getStepResource() |
|
|
const stepResource = this.$refs.stepRef.getStepResource() |
|
|
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) |
|
|
|
|
|
this.yqResourceTmp = stepResource.yqResource||[] |
|
|
|
|
|
|
|
|
this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || []) |
|
|
|
|
|
this.yqResourceTmp = stepResource.yqResource || [] |
|
|
return content; |
|
|
return content; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|