diff --git a/src/views/business/comps/template/comps/dl/DL020.vue b/src/views/business/comps/template/comps/dl/DL020.vue index ba36f9e..02205f1 100644 --- a/src/views/business/comps/template/comps/dl/DL020.vue +++ b/src/views/business/comps/template/comps/dl/DL020.vue @@ -140,16 +140,18 @@ export default { // this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData}); // }, //获取已填写的表单数据 - getFilledFormData() { - const baseData = this.$refs.baseInfoRef.getFilledFormData(); - const swypyjData = this.$refs.swypyjInfoRef.getFilledFormData(); - const remarkData = this.$refs.remarkRef.getFilledFormData(); + async getFilledFormData() { + let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"]); + return content; + // const baseData = this.$refs.baseInfoRef.getFilledFormData(); + // const swypyjData = this.$refs.swypyjInfoRef.getFilledFormData(); + // const remarkData = this.$refs.remarkRef.getFilledFormData(); - return { - ...baseData, - ...swypyjData, - ...remarkData, - } + // return { + // ...baseData, + // ...swypyjData, + // ...remarkData, + // } }, //获取填写完成的表单数据 async getFormData() { @@ -168,7 +170,7 @@ export default { return await this.validFormFields(refsToValidate); }, getResource() { - let content = this.getFilledFormData(); + // let content = this.getFilledFormData(); //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() this.resourceTmp = stepResource.sjResource || []