fix[表单模板]dl020解决冲突

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',

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