From 5439618b08af4894d4e004c847f5840197fa39a8 Mon Sep 17 00:00:00 2001
From: lslaiwy <1209768238@qq.com>
Date: Fri, 27 Feb 2026 22:47:05 +0800
Subject: [PATCH] =?UTF-8?q?fix[=E8=A1=A8=E5=8D=95=E6=A8=A1=E6=9D=BF]?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/dl/DL020.vue     | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

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 || []