diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index 6547350..91c85d3 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -13,13 +13,14 @@ export default { deep: true, handler(v) { if (v) { - let n = { ...v }; - this.formData = n; + const { + studyMc,studySn,templateMc,templateMcEn,templateSn,satrtDate,endDate, + } = v; if (v.resource) {//试验试剂信息 this.resource = JSON.parse(v.resource); } if (v.bdnr) { - this.formData = { ...JSON.parse(v.bdnr), ...n }; + this.formData = { ...JSON.parse(v.bdnr), studyMc,studySn,templateMc,templateMcEn,templateSn,satrtDate,endDate, }; } const { startDate, effectivePeriod, effectivePeriodUnit, expireDate } = this.formData; //实际填报的时候,如果有了开始时间,并且有有效周期,但是没有失效日,就计算失效日为开始时间+有效周期 @@ -28,8 +29,8 @@ export default { const end = start.add(Number(effectivePeriod), effectivePeriodUnit).format("YYYY-MM-DD HH:mm:ss"); this.formData = { ...this.formData, expireDate: end }; } - console.log(v, "formData from templateData") - this.setTemplateData(n); + console.log(this.formData, "formData from templateData") + this.setTemplateData(v); } } }