diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index 19c13ac..be5cc43 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -88,7 +88,14 @@ import DL013 from './comps/dl/DL013.vue'
 import DL014 from './comps/dl/DL014.vue'
 import DL015 from './comps/dl/DL015.vue'
 import DL016 from "./comps/dl/DL016.vue";
+import DL017 from "./comps/dl/DL017.vue";
+import DL018 from "./comps/dl/DL018.vue";
+import DL019 from "./comps/dl/DL019.vue";
 import DL020 from "./comps/dl/DL020.vue";
+import DL021 from "./comps/dl/DL021.vue";
+import DL022 from "./comps/dl/DL022.vue";
+import DL023 from "./comps/dl/DL023.vue";
+import DL024 from "./comps/dl/DL024.vue";
 
 
 export default {
@@ -127,7 +134,14 @@ export default {
     DL014,
     DL015,
     DL016,
-    DL020
+    DL017,
+    DL018,
+    DL019,
+    DL020,
+    DL021,
+    DL022,
+    DL023,
+    DL024
   },
   data() {
     return {
@@ -244,7 +258,14 @@ export default {
           'DL014': 'DL014',
           'DL015': 'DL015',
           'DL016': 'DL016',
+          'DL017': 'DL017',
+          'DL018': 'DL018',
+          'DL019': 'DL019',
           'DL020': 'DL020',
+          'DL021': 'DL021',
+          'DL022': 'DL022',
+          'DL023': 'DL023',
+          'DL024': 'DL024',
         }
       }
       return this.componentMap || "Demo"
diff --git a/src/views/business/comps/template/comps/dl/DL016.vue b/src/views/business/comps/template/comps/dl/DL016.vue
index a219d68..3e59c66 100644
--- a/src/views/business/comps/template/comps/dl/DL016.vue
+++ b/src/views/business/comps/template/comps/dl/DL016.vue
@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
-					<LineLabel label="template.yp.yp004.zbxx" />
+          <LineLabel label="template.dl.dl016.qcxjjyqk" />
 
 					<CustomTable
 						:ref="`tableRef`"
@@ -26,7 +26,11 @@
 						</template>
 					</CustomTable>
 
-					<LineLabel label="template.yp.yp004.zbbz" />
+          <BaseInfoFormPackage fieldItemLabel="template.dl.dl016.xbxx" label="template.dl.dl016.xbxx"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						/>
+
+					<LineLabel label="template.dl.dl016.zbbz" />
 					<Step ref="stepRef" :formData="formData.stepData"></Step>
 
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
@@ -99,31 +103,19 @@ export default {
 					}
 				},
 				{
-					type: "conditionItem",
-					label: 'template.yp.yp004.pztj',
+					type: "cellItem",
+					label: 'template.dl.dl016.sydd',
 					config: {
 						pre: {
-							label: 'template.common.preFill',
-							type: "select",
-							multiple: true,
-							fillType: "preFill",
-							options: this.getDictOptions('business_pztj'),
-							otherCode: "preOther",
-						},
-						act: {
-							label: 'template.common.actualFill',
-							type: "select",
+							label: 'template.dl.dl016.sydd',
+							type: "input",
 							fillType: "actFill",
-							otherCode: "actOther",
-							multiple: true,
-							compareTo: "pre",
-							options: this.getDictOptions('business_pztj')
-						}
+						},
 					}
 				},
 				{
 					type: "cellItem",
-					label: 'template.lba.lba002.czsj',
+					label: 'template.dl.dl016.czsj',
 					config: {
 						startDate: {
 							label: 'template.common.startTime',
@@ -137,24 +129,48 @@ export default {
 				}
 			]
 		},
+    // 生物样品移交记录表信息
+		swypyjInfoFormConfig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						qxbd: {
+							span:1,
+							label: 'template.dl.dl016.qxbd',
+							type: 'qxbd',
+							fillType: 'actFill',
+							filledCodes:['bdmc','bdbh'],
+						},
+            pre: {
+							label: 'template.dl.dl016.preFill',
+							type: "select",
+							fillType: "preFill",
+							options: this.getDictOptions('business_dl_qsxjbltj'),
+							otherCode: "preOther",
+						},
+					}
+				},
+			]
+		},
 		// 制备信息
 		tableColumns() {
 			return [{
-				label: 'template.yp.yp004.zbdx',
+				label: 'template.dl.dl016.zbdx',
 				prop: 'zbdx',
 				bodyType: 'input',
 				bodyFillType: 'preFill',
 				width: 280,
 				bodyMaxlength: 50,
 			},{
-				label: 'template.yp.yp004.yjzbs',
+				label: 'template.dl.dl016.yjzbs',
 				prop: 'yjzbs',
 				bodyType: 'inputNumber',
 				bodyFillType: 'preFill',
 				width: 280,
 				bodyMaxlength: 10,
 			},{
-				label: 'template.yp.yp004.sjzbs',
+				label: 'template.dl.dl016.sjzbs',
 				prop: 'sjzbs',
 				bodyType: 'inputNumber',
 				bodyFillType: 'actFill',
diff --git a/src/views/business/comps/template/comps/dl/DL017.vue b/src/views/business/comps/template/comps/dl/DL017.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL017.vue
@@ -0,0 +1,205 @@
+<!-- 生物样品接收记录表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.xbxx" label="template.dl.dl020.xbxx"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						/>
+
+          <LineLabel label="template.dl.dl020.czbz" />
+          <Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import moment from "moment";
+
+export default {
+	name: "DL020",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.sydd',
+					config: {
+						pre: {
+							label: 'template.dl.dl020.sydd',
+							type: "input",
+							fillType: "actFill",
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.czsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 生物样品移交记录表信息
+		swypyjInfoFormConfig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						qxbd: {
+							span:1,
+							label: 'template.dl.dl020.qxbd',
+							type: 'qxbd',
+							fillType: 'actFill',
+							filledCodes:['bdmc','bdbh'],
+						},
+					}
+				},
+			]
+		},
+	},
+	data() {
+		return {
+			formData: {},
+		};
+	},
+	mounted() {
+	},
+	methods: {
+    // 点击按钮
+    // handleClickButton(item,signData){
+		// 	this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
+		// },
+		//获取已填写的表单数据
+		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,
+			// }
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			//先校验再获取值
+			const validFlag = await this.validFields();
+			if (!validFlag) {
+				return false;
+			}
+			let content = this.getFilledFormData();
+			return content
+		},
+		//只做校验
+		async validFields() {
+			// 构建需要验证的引用数组
+			let refsToValidate = ["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"];
+			return await this.validFormFields(refsToValidate);
+		},
+		getResource() {
+			// let content = this.getFilledFormData();
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = stepResource.sjResource || []
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			const formData = this.getStepResource();
+			console.log(formData, "formData")
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+.config-header-end {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	margin-bottom: 15px;
+	font-weight: bold;
+	font-size: 16px;
+	color: #303133;
+}
+</style>
diff --git a/src/views/business/comps/template/comps/dl/DL018.vue b/src/views/business/comps/template/comps/dl/DL018.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL018.vue
@@ -0,0 +1,205 @@
+<!-- 生物样品接收记录表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.xbxx" label="template.dl.dl020.xbxx"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						/>
+
+          <LineLabel label="template.dl.dl020.czbz" />
+          <Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import moment from "moment";
+
+export default {
+	name: "DL020",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.sydd',
+					config: {
+						pre: {
+							label: 'template.dl.dl020.sydd',
+							type: "input",
+							fillType: "actFill",
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.czsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 生物样品移交记录表信息
+		swypyjInfoFormConfig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						qxbd: {
+							span:1,
+							label: 'template.dl.dl020.qxbd',
+							type: 'qxbd',
+							fillType: 'actFill',
+							filledCodes:['bdmc','bdbh'],
+						},
+					}
+				},
+			]
+		},
+	},
+	data() {
+		return {
+			formData: {},
+		};
+	},
+	mounted() {
+	},
+	methods: {
+    // 点击按钮
+    // handleClickButton(item,signData){
+		// 	this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
+		// },
+		//获取已填写的表单数据
+		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,
+			// }
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			//先校验再获取值
+			const validFlag = await this.validFields();
+			if (!validFlag) {
+				return false;
+			}
+			let content = this.getFilledFormData();
+			return content
+		},
+		//只做校验
+		async validFields() {
+			// 构建需要验证的引用数组
+			let refsToValidate = ["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"];
+			return await this.validFormFields(refsToValidate);
+		},
+		getResource() {
+			// let content = this.getFilledFormData();
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = stepResource.sjResource || []
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			const formData = this.getStepResource();
+			console.log(formData, "formData")
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+.config-header-end {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	margin-bottom: 15px;
+	font-weight: bold;
+	font-size: 16px;
+	color: #303133;
+}
+</style>
diff --git a/src/views/business/comps/template/comps/dl/DL019.vue b/src/views/business/comps/template/comps/dl/DL019.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL019.vue
@@ -0,0 +1,205 @@
+<!-- 生物样品接收记录表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.xbxx" label="template.dl.dl020.xbxx"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						/>
+
+          <LineLabel label="template.dl.dl020.czbz" />
+          <Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import moment from "moment";
+
+export default {
+	name: "DL020",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.sydd',
+					config: {
+						pre: {
+							label: 'template.dl.dl020.sydd',
+							type: "input",
+							fillType: "actFill",
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.czsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 生物样品移交记录表信息
+		swypyjInfoFormConfig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						qxbd: {
+							span:1,
+							label: 'template.dl.dl020.qxbd',
+							type: 'qxbd',
+							fillType: 'actFill',
+							filledCodes:['bdmc','bdbh'],
+						},
+					}
+				},
+			]
+		},
+	},
+	data() {
+		return {
+			formData: {},
+		};
+	},
+	mounted() {
+	},
+	methods: {
+    // 点击按钮
+    // handleClickButton(item,signData){
+		// 	this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
+		// },
+		//获取已填写的表单数据
+		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,
+			// }
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			//先校验再获取值
+			const validFlag = await this.validFields();
+			if (!validFlag) {
+				return false;
+			}
+			let content = this.getFilledFormData();
+			return content
+		},
+		//只做校验
+		async validFields() {
+			// 构建需要验证的引用数组
+			let refsToValidate = ["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"];
+			return await this.validFormFields(refsToValidate);
+		},
+		getResource() {
+			// let content = this.getFilledFormData();
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = stepResource.sjResource || []
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			const formData = this.getStepResource();
+			console.log(formData, "formData")
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+.config-header-end {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	margin-bottom: 15px;
+	font-weight: bold;
+	font-size: 16px;
+	color: #303133;
+}
+</style>
diff --git a/src/views/business/comps/template/comps/dl/DL020.vue b/src/views/business/comps/template/comps/dl/DL020.vue
index 083ab4d..02205f1 100644
--- a/src/views/business/comps/template/comps/dl/DL020.vue
+++ b/src/views/business/comps/template/comps/dl/DL020.vue
@@ -140,18 +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();
-			const stepData = this.$refs.stepRef.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,
-				...stepData,
-			}
+			// return {
+			// 	...baseData,
+			// 	...swypyjData,
+			// 	...remarkData,
+			// }
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
@@ -170,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 || []
diff --git a/src/views/business/comps/template/comps/dl/DL021.vue b/src/views/business/comps/template/comps/dl/DL021.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL021.vue
@@ -0,0 +1,205 @@
+<!-- 生物样品接收记录表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.xbxx" label="template.dl.dl020.xbxx"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						/>
+
+          <LineLabel label="template.dl.dl020.czbz" />
+          <Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import moment from "moment";
+
+export default {
+	name: "DL020",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.sydd',
+					config: {
+						pre: {
+							label: 'template.dl.dl020.sydd',
+							type: "input",
+							fillType: "actFill",
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.czsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 生物样品移交记录表信息
+		swypyjInfoFormConfig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						qxbd: {
+							span:1,
+							label: 'template.dl.dl020.qxbd',
+							type: 'qxbd',
+							fillType: 'actFill',
+							filledCodes:['bdmc','bdbh'],
+						},
+					}
+				},
+			]
+		},
+	},
+	data() {
+		return {
+			formData: {},
+		};
+	},
+	mounted() {
+	},
+	methods: {
+    // 点击按钮
+    // handleClickButton(item,signData){
+		// 	this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
+		// },
+		//获取已填写的表单数据
+		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,
+			// }
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			//先校验再获取值
+			const validFlag = await this.validFields();
+			if (!validFlag) {
+				return false;
+			}
+			let content = this.getFilledFormData();
+			return content
+		},
+		//只做校验
+		async validFields() {
+			// 构建需要验证的引用数组
+			let refsToValidate = ["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"];
+			return await this.validFormFields(refsToValidate);
+		},
+		getResource() {
+			// let content = this.getFilledFormData();
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = stepResource.sjResource || []
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			const formData = this.getStepResource();
+			console.log(formData, "formData")
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+.config-header-end {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	margin-bottom: 15px;
+	font-weight: bold;
+	font-size: 16px;
+	color: #303133;
+}
+</style>
diff --git a/src/views/business/comps/template/comps/dl/DL022.vue b/src/views/business/comps/template/comps/dl/DL022.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL022.vue
@@ -0,0 +1,205 @@
+<!-- 生物样品接收记录表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.xbxx" label="template.dl.dl020.xbxx"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						/>
+
+          <LineLabel label="template.dl.dl020.czbz" />
+          <Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import moment from "moment";
+
+export default {
+	name: "DL020",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.sydd',
+					config: {
+						pre: {
+							label: 'template.dl.dl020.sydd',
+							type: "input",
+							fillType: "actFill",
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.czsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 生物样品移交记录表信息
+		swypyjInfoFormConfig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						qxbd: {
+							span:1,
+							label: 'template.dl.dl020.qxbd',
+							type: 'qxbd',
+							fillType: 'actFill',
+							filledCodes:['bdmc','bdbh'],
+						},
+					}
+				},
+			]
+		},
+	},
+	data() {
+		return {
+			formData: {},
+		};
+	},
+	mounted() {
+	},
+	methods: {
+    // 点击按钮
+    // handleClickButton(item,signData){
+		// 	this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
+		// },
+		//获取已填写的表单数据
+		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,
+			// }
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			//先校验再获取值
+			const validFlag = await this.validFields();
+			if (!validFlag) {
+				return false;
+			}
+			let content = this.getFilledFormData();
+			return content
+		},
+		//只做校验
+		async validFields() {
+			// 构建需要验证的引用数组
+			let refsToValidate = ["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"];
+			return await this.validFormFields(refsToValidate);
+		},
+		getResource() {
+			// let content = this.getFilledFormData();
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = stepResource.sjResource || []
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			const formData = this.getStepResource();
+			console.log(formData, "formData")
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+.config-header-end {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	margin-bottom: 15px;
+	font-weight: bold;
+	font-size: 16px;
+	color: #303133;
+}
+</style>
diff --git a/src/views/business/comps/template/comps/dl/DL023.vue b/src/views/business/comps/template/comps/dl/DL023.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL023.vue
@@ -0,0 +1,205 @@
+<!-- 生物样品接收记录表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.xbxx" label="template.dl.dl020.xbxx"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						/>
+
+          <LineLabel label="template.dl.dl020.czbz" />
+          <Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import moment from "moment";
+
+export default {
+	name: "DL020",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.sydd',
+					config: {
+						pre: {
+							label: 'template.dl.dl020.sydd',
+							type: "input",
+							fillType: "actFill",
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.czsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 生物样品移交记录表信息
+		swypyjInfoFormConfig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						qxbd: {
+							span:1,
+							label: 'template.dl.dl020.qxbd',
+							type: 'qxbd',
+							fillType: 'actFill',
+							filledCodes:['bdmc','bdbh'],
+						},
+					}
+				},
+			]
+		},
+	},
+	data() {
+		return {
+			formData: {},
+		};
+	},
+	mounted() {
+	},
+	methods: {
+    // 点击按钮
+    // handleClickButton(item,signData){
+		// 	this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
+		// },
+		//获取已填写的表单数据
+		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,
+			// }
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			//先校验再获取值
+			const validFlag = await this.validFields();
+			if (!validFlag) {
+				return false;
+			}
+			let content = this.getFilledFormData();
+			return content
+		},
+		//只做校验
+		async validFields() {
+			// 构建需要验证的引用数组
+			let refsToValidate = ["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"];
+			return await this.validFormFields(refsToValidate);
+		},
+		getResource() {
+			// let content = this.getFilledFormData();
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = stepResource.sjResource || []
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			const formData = this.getStepResource();
+			console.log(formData, "formData")
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+.config-header-end {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	margin-bottom: 15px;
+	font-weight: bold;
+	font-size: 16px;
+	color: #303133;
+}
+</style>
diff --git a/src/views/business/comps/template/comps/dl/DL024.vue b/src/views/business/comps/template/comps/dl/DL024.vue
new file mode 100644
index 0000000..02205f1
--- /dev/null
+++ b/src/views/business/comps/template/comps/dl/DL024.vue
@@ -0,0 +1,205 @@
+<!-- 生物样品接收记录表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.xbxx" label="template.dl.dl020.xbxx"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						/>
+
+          <LineLabel label="template.dl.dl020.czbz" />
+          <Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import moment from "moment";
+
+export default {
+	name: "DL020",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.sydd',
+					config: {
+						pre: {
+							label: 'template.dl.dl020.sydd',
+							type: "input",
+							fillType: "actFill",
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.dl.dl020.czsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 生物样品移交记录表信息
+		swypyjInfoFormConfig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						qxbd: {
+							span:1,
+							label: 'template.dl.dl020.qxbd',
+							type: 'qxbd',
+							fillType: 'actFill',
+							filledCodes:['bdmc','bdbh'],
+						},
+					}
+				},
+			]
+		},
+	},
+	data() {
+		return {
+			formData: {},
+		};
+	},
+	mounted() {
+	},
+	methods: {
+    // 点击按钮
+    // handleClickButton(item,signData){
+		// 	this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
+		// },
+		//获取已填写的表单数据
+		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,
+			// }
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			//先校验再获取值
+			const validFlag = await this.validFields();
+			if (!validFlag) {
+				return false;
+			}
+			let content = this.getFilledFormData();
+			return content
+		},
+		//只做校验
+		async validFields() {
+			// 构建需要验证的引用数组
+			let refsToValidate = ["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"];
+			return await this.validFormFields(refsToValidate);
+		},
+		getResource() {
+			// let content = this.getFilledFormData();
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = stepResource.sjResource || []
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			const formData = this.getStepResource();
+			console.log(formData, "formData")
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+.config-header-end {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	margin-bottom: 15px;
+	font-weight: bold;
+	font-size: 16px;
+	color: #303133;
+}
+</style>