diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js
index 7e0a10b..5096ac6 100644
--- a/src/lang/en/template/dl.js
+++ b/src/lang/en/template/dl.js
@@ -223,4 +223,43 @@ export default {
     gcxps:'观察细胞数目',
     zqxxbs:'中期相细胞数',
   },
+  dl022: {
+    czsj:'操作时间',
+    dlbz: '备注',
+    gcqk: '观察情况',
+
+    xbmc:'细胞名称',
+    xwj:'显微镜',
+    bpbh:'玻片编号',
+    gcxps:'观察细胞数目',
+
+    jgjxjbs:'结构畸形畸变数',
+    lxjbs:'裂隙畸变数',
+    dbtjbs:'多倍体畸变数',
+    nfzjbs:'内复制畸变数',
+    jblx:'畸变类型'
+  },
+  dl023: {
+    czsj:'操作时间',
+    dlbz: '备注',
+    yqsyxx: '仪器使用信息',
+    czjl: '操作记录',
+
+    yqbh:'仪器编号',
+    yqmc:'仪器名称',
+    yqxh:'仪器型号',
+    xcrq:'下次测试/校准/检定日期',
+
+    dwzshxbx:'动物种属或细胞系',
+    dwzs:'动物种属',
+    xbx:'细胞系',
+    sydd:'试验地点',
+    zwbh:'动物编号/细胞培养板名称',
+    uvazsjl:'UVA照射剂量',
+    zszsj:'照射总时间（分:秒）',
+    zskssj:'照射开始时间',
+    zsjssj:'照射结束时间',
+    ksButton:'开始',
+    jsButton:'结束',
+  },
 }
diff --git a/src/lang/zh/template/dl.js b/src/lang/zh/template/dl.js
index c2757c6..84b396e 100644
--- a/src/lang/zh/template/dl.js
+++ b/src/lang/zh/template/dl.js
@@ -223,4 +223,43 @@ export default {
     gcxps:'观察细胞数目',
     zqxxbs:'中期相细胞数',
   },
+  dl022: {
+    czsj:'操作时间',
+    dlbz: '备注',
+    gcqk: '观察情况',
+
+    xbmc:'细胞名称',
+    xwj:'显微镜',
+    bpbh:'玻片编号',
+    gcxps:'观察细胞数目',
+
+    jgjxjbs:'结构畸形畸变数',
+    lxjbs:'裂隙畸变数',
+    dbtjbs:'多倍体畸变数',
+    nfzjbs:'内复制畸变数',
+    jblx:'畸变类型'
+  },
+  dl023: {
+    czsj:'操作时间',
+    dlbz: '备注',
+    yqsyxx: '仪器使用信息',
+    czjl: '操作记录',
+
+    yqbh:'仪器编号',
+    yqmc:'仪器名称',
+    yqxh:'仪器型号',
+    xcrq:'下次测试/校准/检定日期',
+
+    dwzshxbx:'动物种属或细胞系',
+    dwzs:'动物种属',
+    xbx:'细胞系',
+    sydd:'试验地点',
+    zwbh:'动物编号/细胞培养板名称',
+    uvazsjl:'UVA照射剂量',
+    zszsj:'照射总时间（分:秒）',
+    zskssj:'照射开始时间',
+    zsjssj:'照射结束时间',
+    ksButton:'开始',
+    jsButton:'结束',
+  },
 }
diff --git a/src/views/business/comps/template/comps/dl/DL021.vue b/src/views/business/comps/template/comps/dl/DL021.vue
index 32dc8ff..672c56a 100644
--- a/src/views/business/comps/template/comps/dl/DL021.vue
+++ b/src/views/business/comps/template/comps/dl/DL021.vue
@@ -24,8 +24,8 @@
               operationWidth = "80px"
               :prefixKey = "`table`"
               fieldItemLabel = "template.dl.dl021.gcqk"
-              :showAddRow="fillType === 'preFill'"
-              :showOperation="fillType === 'preFill'"
+              :showAddRow="fillType === 'actFill'"
+              :showOperation="fillType === 'actFill'"
             >
               <template slot="operation" slot-scope="{ row, rowIndex, columns }">
                 <TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow" ></TableOpertaionDelete>
diff --git a/src/views/business/comps/template/comps/dl/DL022.vue b/src/views/business/comps/template/comps/dl/DL022.vue
index 02205f1..a760ee5 100644
--- a/src/views/business/comps/template/comps/dl/DL022.vue
+++ b/src/views/business/comps/template/comps/dl/DL022.vue
@@ -1,23 +1,42 @@
-<!-- 生物样品接收记录表 -->
+<!-- 生物分析生物样品采集管制备表 -->
 <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-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.dl022.gcqk" />
+          <!-- 观察情况 -->
+          <div class="template-form-item">
+						<BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
+							@onRegentSubmit="onRegentSubmit"
+							:formConfig="stepFormConfig" @blur="onHandleBlur"
+							:formData="formData" />
+              <div style="color:#999;font-size:14px;">畸变类型以代号填写：断片(b)、裂隙(g)、互换及射体(t)、环状染色体(r)、多倍体(p)、双着丝点染色体(d)、内复制(e)、染色体碎化(z)、缺失(l)、粘着(s)、微小体(m)。</div>
+						<CustomTable
+              :ref="`tableRef`"
+              :columns="tableColumns"
+              :formData="formData"
+              operationWidth = "80px"
+              :prefixKey = "`table`"
+              fieldItemLabel = "template.dl.dl022.gcqk"
+              :showAddRow="fillType === 'actFill'"
+              :showOperation="fillType === 'actFill'"
+            >
+              <template slot="operation" slot-scope="{ row, rowIndex, columns }">
+                <TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow" ></TableOpertaionDelete>
+              </template>
+            </CustomTable>
+					</div>
+
+
 
-          <LineLabel label="template.dl.dl020.czbz" />
-          <Step ref="stepRef" :formData="formData.stepData"></Step>
-					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
 			</div>
@@ -32,11 +51,18 @@ 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";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import { EventBus } from "@/utils/eventBus";
+import { uniqeResource } from "@/utils/calUnitTools";
+import { debounce } from 'lodash-es'
+import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
 
 export default {
-	name: "DL020",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step },
+	name: "DL022",
+  dicts: [
+        'business_dl_xbmc'
+    ],
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -84,18 +110,7 @@ export default {
 				},
 				{
 					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',
+					label: 'template.dl.dl022.czsj',
 					config: {
 						startDate: {
 							label: 'template.common.startTime',
@@ -109,23 +124,86 @@ export default {
 				}
 			]
 		},
-		// 生物样品移交记录表信息
-		swypyjInfoFormConfig() {
+
+
+    // 观察情况
+		stepFormConfig() {
 			return [
 				{
-					type: "cellItem",
+					type: "step",
 					config: {
-						qxbd: {
-							span:1,
-							label: 'template.dl.dl020.qxbd',
+            xbmc: {
+							label: 'template.dl.dl022.xbmc',
+							type: 'select',
+							fillType: 'actFill',
+							options: this.getDictOptions('business_dl_xbmc'),
+							otherCode: 'xbmcOther',
+              showOtherLabel:false
+						},
+            xwj: {
+							// span:1,
+							label: 'template.dl.dl022.xwj',
 							type: 'qxbd',
 							fillType: 'actFill',
 							filledCodes:['bdmc','bdbh'],
 						},
 					}
-				},
+				}
 			]
 		},
+    // 观察情况
+		tableColumns() {
+			return [{
+				label: 'template.dl.dl022.bpbh',
+				prop: 'bpbh',
+				bodyType: 'input',
+				bodyFillType: 'actFill',
+				width: 100,
+				bodyMaxlength: 50,
+			},{
+				label: 'template.dl.dl022.gcxps',
+				prop: 'gcxps',
+				bodyType: 'inputNumber',
+				bodyFillType: 'actFill',
+				width: 100,
+        bodyMaxlength: 10,
+			},{
+				label: 'template.dl.dl022.jgjxjbs',
+				prop: 'jgjxjbs',
+				bodyType: 'inputNumber',
+				bodyFillType: 'actFill',
+				width: 80,
+        disabled: true
+			},{
+				label: 'template.dl.dl022.lxjbs',
+				prop: 'lxjbs',
+				bodyType: 'inputNumber',
+				bodyFillType: 'actFill',
+				width: 100,
+				disabled: true
+			},{
+				label: 'template.dl.dl022.dbtjbs',
+				prop: 'dbtjbs',
+				bodyType: 'inputNumber',
+				bodyFillType: 'actFill',
+				width: 100,
+        disabled: true
+			},{
+				label: 'template.dl.dl022.nfzjbs',
+				prop: 'nfzjbs',
+				bodyType: 'inputNumber',
+				bodyFillType: 'actFill',
+				width: 80,
+        disabled: true
+			},{
+				label: 'template.dl.dl022.jblx',
+				prop: 'jblx',
+				bodyType: 'input',
+				bodyFillType: 'actFill',
+				width: 100,
+				bodyMaxlength: 50,
+			}]
+		},
 	},
 	data() {
 		return {
@@ -135,71 +213,117 @@ export default {
 	mounted() {
 	},
 	methods: {
-    // 点击按钮
-    // handleClickButton(item,signData){
-		// 	this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
-		// },
+    // 选择显微镜预留
+    onRegentSubmit(e) {
+      const { selectInfo, key, rowIndex } = e
+      const { row } = selectInfo
+      console.log('选择显微镜预留===',row)
+      // if (key === 'yqbh' && this.$refs.yqsyTableRef) {
+      //   const params = {
+      //     yqmc: row.mc,
+      //     yqxh: row.xh,
+      //     xccsjzjdrq: row.jzrq
+      //   }
+      //   this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
+      // }
+    },
+    onFormSelect(fields){
+			this.onHandleBlur(fields)
+		},
+    //选择table header下拉框也要更新体积
+		onHeaderSelectChange(data){
+			const {key, headerSelectFields,dataSource=[]} = data;
+			const keys = [
+				'targetStartSolutionVolumeUnit',
+				'targetDiluentVolumeUnit',
+				'targetSolutionConcentrationUnit',
+				'targetSolutionVolumeUnit',
+			]
+			if(keys.includes(key)){
+				const {targetStartSolution,subTargetStartSolution} = this.$refs.swypyjInfoRef?.getFilledFormData();
+				const params = {
+					subTargetStartSolution,
+					headerSelectFields
+				}
+				this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params)
+			}
+		},
+    beforeSaveRecord(data){
+			const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
+			this.onCommonVerifyNdException(formFields,data);
+		},
+    configComplete(val) {
+			const { rowData, headerSelectFields } = val;
+			//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+			const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
+			let postData = {
+				mc: null,
+				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
+				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
+				nddw: headerSelectFields.actSolutionConcentrationUnit,
+				studySubjectId: this.formData.studySubjectId,
+				studyFormId:this.formData.id,
+				studyId:this.formData.studyId,
+				kc: total,
+				kcdw: unit,
+			}
+			this.configCompleteRequest(postData);
+		},
+    //分装回调
+		subPackageSubmit(data) {
+			const { fzsj, rowData, headerSelectFields } = data;
+			const { fzList = [], dw = "", mybh } = fzsj;
+			if (fzList && fzList.length > 0) {
+				const list = fzList.map((item) => {
+					return {
+						bh: mybh + item.preCode + item.subCode,
+						kc: item.num,
+						kcdw: dw,
+					}
+				})
+				let postData = {
+					studyId: this.formData.studyId,
+					studyFormId: this.formData.id,
+					bh: mybh,
+					nd: rowData.actSolutionConcentration || 0,
+					nddw: headerSelectFields.actSolutionConcentrationUnit,
+					studySubjectId: this.formData.studySubjectId,
+			     	studyFormId:this.formData.id,
+					list: list
+				}
+				this.subPackageRequest(postData);
+			}
+		},
 		//获取已填写的表单数据
-		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,
-			// }
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef","remarkRef","tableRef"])
 		},
 		//获取填写完成的表单数据
 		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);
+			let content = await this.validFormFields(["baseInfoRef",  "swypyjInfoRef","remarkRef","tableRef"]);
+			return content;
 		},
 		getResource() {
-			// let content = this.getFilledFormData();
 			//使用的试剂、仪器
-			const stepResource = this.$refs.stepRef.getStepResource()
-			this.resourceTmp = stepResource.sjResource || []
-			this.yqResourceTmp = stepResource.yqResource || []
+			// stepRef不存在，直接返回空数组
+			this.resourceTmp = []
+			this.yqResourceTmp = []
 			return this.resourceTmp;
 		},
 		//保存
 		async onSave() {
-			const formData = this.getStepResource();
-			console.log(formData, "formData")
+			// stepRef不存在，直接返回空对象
+			console.log({});
+		},
+		// 删除表格行
+		deleteRow(rowIndex) {
+			const tableRef = this.$refs['tableRef'];
+			if (tableRef) {
+				tableRef.deleteRow(rowIndex);
+			}
 		},
 	}
 };
 </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
index 02205f1..18e50ff 100644
--- a/src/views/business/comps/template/comps/dl/DL023.vue
+++ b/src/views/business/comps/template/comps/dl/DL023.vue
@@ -1,23 +1,35 @@
-<!-- 生物样品接收记录表 -->
+<!-- 生物分析生物样品采集管制备表 -->
 <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-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" />
+            <!-- 仪器使用信息 -->
+          <LineLabel label="template.dl.dl023.yqsyxx" />
+          <CustomTable
+              :ref="`tableRef`"
+              :columns="yqsyxxColumns"
+              @onRegentSubmit="(e) => onRegentSubmit(e)"
+              :formData="formData"
+              operationWidth = "80px"
+              :showAddRow="fillType === 'actFill'"
+              :showOperation="fillType === 'actFill'"
+            >
+              <template slot="operation" slot-scope="{ row, rowIndex, columns }">
+                <TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow" ></TableOpertaionDelete>
+              </template>
+            </CustomTable>
 
-          <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"
+          <LineLabel label="template.dl.dl023.czjl" />
+          <!-- 操作记录 -->
+          <BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
+            :formConfig="stepFormConfig" @blur="onHandleBlur"
+            :formData="formData" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
 			</div>
@@ -32,11 +44,18 @@ 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";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import { EventBus } from "@/utils/eventBus";
+import { uniqeResource } from "@/utils/calUnitTools";
+import { debounce } from 'lodash-es'
+import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
 
 export default {
-	name: "DL020",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step },
+	name: "dl023",
+  dicts: [
+        'business_dl_xbmc'
+    ],
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -81,49 +100,106 @@ export default {
 							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() {
+    //yqsyxxColumns仪器使用信息
+    yqsyxxColumns() {
+			return [{
+				label: 'template.dl.dl023.yqbh',
+				prop: 'yqbh',
+				bodyType: 'input',
+				bodyFillType: 'actFill',
+				bodyDisabled: true,
+          disabled: true
+			},{
+				label: 'template.dl.dl023.yqmc',
+				prop: 'yqmc',
+				bodyType: 'input',
+				bodyFillType: 'actFill',
+				bodyDisabled: true,
+          disabled: true
+			},{
+				label: 'template.dl.dl023.yqxh',
+				prop: 'yqxh',
+				bodyType: 'input',
+				bodyFillType: 'actFill',
+				bodyDisabled: true,
+          disabled: true
+			},{
+				label: 'template.dl.dl023.xcrq',
+				prop: 'xcrq',
+				bodyType: 'input',
+				bodyFillType: 'actFill',
+				bodyDisabled: true,
+          disabled: true
+			}]
+		},
+
+    // 操作记录
+		stepFormConfig() {
 			return [
 				{
 					type: "cellItem",
 					config: {
-						qxbd: {
-							span:1,
-							label: 'template.dl.dl020.qxbd',
+            dwzshxbx: {
+							// span:1,
+							label: 'template.dl.dl023.dwzshxbx',
 							type: 'qxbd',
 							fillType: 'actFill',
 							filledCodes:['bdmc','bdbh'],
 						},
+            sydd: {
+							label: 'template.dl.dl023.sydd',
+							type: 'select',
+							fillType: 'actFill',
+							options: this.getDictOptions('business_dl_sydd'),
+							otherCode: 'syddOther',
+              showOtherLabel:false
+						},
+            zwbh:{
+              label: 'template.dl.dl023.zwbh',
+              type: 'input',
+              fillType: 'actFill',
+              bodyMaxlength: 50,
+            },
+            uvazsjl: {
+							label: "template.dl.dl023.uvazsjl",
+							type: "input",
+							fillType: "actFill",
+							subType: "sj",
+							subKey: "subUvazsjl",
+							subFillType: "actFill",
+							maxlength: 20,
+						},
+            zszsj:{
+              span:1,
+              label: 'template.dl.dl023.zszsj',
+              type: 'input',
+              with:100,
+              fillType: 'actFill',
+              bodyMaxlength: 50,
+            },
+            zskssj: {
+              label: 'template.dl.dl023.zskssj',
+              type: 'input',
+              fillType: 'actFill',
+              maxlength: 200,
+              subType: 'button',
+              subKey: 'zskssj',
+              buttonName: 'template.dl.dl023.ksButton',
+            },
+            zsjssj: {
+              label: 'template.dl.dl023.zsjssj',
+              type: 'input',
+              fillType: 'actFill',
+              maxlength: 200,
+              subType: 'button',
+              subKey: 'zsjssj',
+              buttonName: 'template.dl.dl023.jsButton',
+            },
 					}
-				},
+				}
 			]
 		},
 	},
@@ -135,71 +211,117 @@ export default {
 	mounted() {
 	},
 	methods: {
-    // 点击按钮
-    // handleClickButton(item,signData){
-		// 	this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
-		// },
+    // 选择仪器编号预留
+    onRegentSubmit(e) {
+      const { selectInfo, key, rowIndex } = e
+      const { row } = selectInfo
+      console.log('选择仪器编号预留===',row)
+      // if (key === 'yqbh' && this.$refs.yqsyTableRef) {
+      //   const params = {
+      //     yqmc: row.mc,
+      //     yqxh: row.xh,
+      //     xccsjzjdrq: row.jzrq
+      //   }
+      //   this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
+      // }
+    },
+    onFormSelect(fields){
+			this.onHandleBlur(fields)
+		},
+    //选择table header下拉框也要更新体积
+		onHeaderSelectChange(data){
+			const {key, headerSelectFields,dataSource=[]} = data;
+			const keys = [
+				'targetStartSolutionVolumeUnit',
+				'targetDiluentVolumeUnit',
+				'targetSolutionConcentrationUnit',
+				'targetSolutionVolumeUnit',
+			]
+			if(keys.includes(key)){
+				const {targetStartSolution,subTargetStartSolution} = this.$refs.swypyjInfoRef?.getFilledFormData();
+				const params = {
+					subTargetStartSolution,
+					headerSelectFields
+				}
+				this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params)
+			}
+		},
+    beforeSaveRecord(data){
+			const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
+			this.onCommonVerifyNdException(formFields,data);
+		},
+    configComplete(val) {
+			const { rowData, headerSelectFields } = val;
+			//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+			const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
+			let postData = {
+				mc: null,
+				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
+				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
+				nddw: headerSelectFields.actSolutionConcentrationUnit,
+				studySubjectId: this.formData.studySubjectId,
+				studyFormId:this.formData.id,
+				studyId:this.formData.studyId,
+				kc: total,
+				kcdw: unit,
+			}
+			this.configCompleteRequest(postData);
+		},
+    //分装回调
+		subPackageSubmit(data) {
+			const { fzsj, rowData, headerSelectFields } = data;
+			const { fzList = [], dw = "", mybh } = fzsj;
+			if (fzList && fzList.length > 0) {
+				const list = fzList.map((item) => {
+					return {
+						bh: mybh + item.preCode + item.subCode,
+						kc: item.num,
+						kcdw: dw,
+					}
+				})
+				let postData = {
+					studyId: this.formData.studyId,
+					studyFormId: this.formData.id,
+					bh: mybh,
+					nd: rowData.actSolutionConcentration || 0,
+					nddw: headerSelectFields.actSolutionConcentrationUnit,
+					studySubjectId: this.formData.studySubjectId,
+			     	studyFormId:this.formData.id,
+					list: list
+				}
+				this.subPackageRequest(postData);
+			}
+		},
 		//获取已填写的表单数据
-		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,
-			// }
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef","remarkRef","tableRef"])
 		},
 		//获取填写完成的表单数据
 		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);
+			let content = await this.validFormFields(["baseInfoRef",  "swypyjInfoRef","remarkRef","tableRef"]);
+			return content;
 		},
 		getResource() {
-			// let content = this.getFilledFormData();
 			//使用的试剂、仪器
-			const stepResource = this.$refs.stepRef.getStepResource()
-			this.resourceTmp = stepResource.sjResource || []
-			this.yqResourceTmp = stepResource.yqResource || []
+			// stepRef不存在，直接返回空数组
+			this.resourceTmp = []
+			this.yqResourceTmp = []
 			return this.resourceTmp;
 		},
 		//保存
 		async onSave() {
-			const formData = this.getStepResource();
-			console.log(formData, "formData")
+			// stepRef不存在，直接返回空对象
+			console.log({});
+		},
+		// 删除表格行
+		deleteRow(rowIndex) {
+			const tableRef = this.$refs['tableRef'];
+			if (tableRef) {
+				tableRef.deleteRow(rowIndex);
+			}
 		},
 	}
 };
 </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
index 02205f1..1427a6e 100644
--- a/src/views/business/comps/template/comps/dl/DL024.vue
+++ b/src/views/business/comps/template/comps/dl/DL024.vue
@@ -1,23 +1,41 @@
-<!-- 生物样品接收记录表 -->
+<!-- 生物分析生物样品采集管制备表 -->
 <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-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.dl021.gcqk" />
+          <!-- 观察情况 -->
+          <div class="template-form-item">
+						<BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
+							@onRegentSubmit="onRegentSubmit"
+							:formConfig="stepFormConfig" @blur="onHandleBlur"
+							:formData="formData" />
+						<CustomTable
+              :ref="`tableRef`"
+              :columns="tableColumns"
+              :formData="formData"
+              operationWidth = "80px"
+              :prefixKey = "`table`"
+              fieldItemLabel = "template.dl.dl021.gcqk"
+              :showAddRow="fillType === 'actFill'"
+              :showOperation="fillType === 'actFill'"
+            >
+              <template slot="operation" slot-scope="{ row, rowIndex, columns }">
+                <TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow" ></TableOpertaionDelete>
+              </template>
+            </CustomTable>
+					</div>
+
+
 
-          <LineLabel label="template.dl.dl020.czbz" />
-          <Step ref="stepRef" :formData="formData.stepData"></Step>
-					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
 			</div>
@@ -32,11 +50,18 @@ 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";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import { EventBus } from "@/utils/eventBus";
+import { uniqeResource } from "@/utils/calUnitTools";
+import { debounce } from 'lodash-es'
+import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
 
 export default {
-	name: "DL020",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step },
+	name: "DL024",
+  dicts: [
+        'business_dl_xbmc'
+    ],
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -84,18 +109,7 @@ export default {
 				},
 				{
 					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',
+					label: 'template.dl.dl021.czsj',
 					config: {
 						startDate: {
 							label: 'template.common.startTime',
@@ -109,21 +123,55 @@ export default {
 				}
 			]
 		},
-		// 生物样品移交记录表信息
-		swypyjInfoFormConfig() {
+
+    // 观察情况
+		tableColumns() {
+			return [{
+				label: 'template.dl.dl021.bpbh',
+				prop: 'bpbh',
+				bodyType: 'input',
+				bodyFillType: 'actFill',
+				width: 100,
+				bodyMaxlength: 50,
+			},{
+				label: 'template.dl.dl021.gcxps',
+				prop: 'gcxps',
+				bodyType: 'input',
+				bodyFillType: 'actFill',
+				width: 100,
+        bodyMaxlength: 50,
+			},{
+				label: 'template.dl.dl021.zqxxbs',
+				prop: 'zqxxbs',
+				bodyType: 'input',
+				bodyFillType: 'actFill',
+				width: 80,
+        bodyMaxlength: 50,
+			}]
+		},
+    // 观察情况
+		stepFormConfig() {
 			return [
 				{
-					type: "cellItem",
+					type: "step",
 					config: {
-						qxbd: {
-							span:1,
-							label: 'template.dl.dl020.qxbd',
+            xbmc: {
+							label: 'template.dl.dl021.xbmc',
+							type: 'select',
+							fillType: 'actFill',
+							options: this.getDictOptions('business_dl_xbmc'),
+							otherCode: 'xbmcOther',
+              showOtherLabel:false
+						},
+            xwj: {
+							// span:1,
+							label: 'template.dl.dl021.xwj',
 							type: 'qxbd',
 							fillType: 'actFill',
 							filledCodes:['bdmc','bdbh'],
 						},
 					}
-				},
+				}
 			]
 		},
 	},
@@ -135,71 +183,117 @@ export default {
 	mounted() {
 	},
 	methods: {
-    // 点击按钮
-    // handleClickButton(item,signData){
-		// 	this.$refs.ypjsInfoRef.updateFormData("jssj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
-		// },
+    // 选择显微镜预留
+    onRegentSubmit(e) {
+      const { selectInfo, key, rowIndex } = e
+      const { row } = selectInfo
+      console.log('选择显微镜预留===',row)
+      // if (key === 'yqbh' && this.$refs.yqsyTableRef) {
+      //   const params = {
+      //     yqmc: row.mc,
+      //     yqxh: row.xh,
+      //     xccsjzjdrq: row.jzrq
+      //   }
+      //   this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
+      // }
+    },
+    onFormSelect(fields){
+			this.onHandleBlur(fields)
+		},
+    //选择table header下拉框也要更新体积
+		onHeaderSelectChange(data){
+			const {key, headerSelectFields,dataSource=[]} = data;
+			const keys = [
+				'targetStartSolutionVolumeUnit',
+				'targetDiluentVolumeUnit',
+				'targetSolutionConcentrationUnit',
+				'targetSolutionVolumeUnit',
+			]
+			if(keys.includes(key)){
+				const {targetStartSolution,subTargetStartSolution} = this.$refs.swypyjInfoRef?.getFilledFormData();
+				const params = {
+					subTargetStartSolution,
+					headerSelectFields
+				}
+				this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params)
+			}
+		},
+    beforeSaveRecord(data){
+			const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
+			this.onCommonVerifyNdException(formFields,data);
+		},
+    configComplete(val) {
+			const { rowData, headerSelectFields } = val;
+			//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+			const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
+			let postData = {
+				mc: null,
+				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
+				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
+				nddw: headerSelectFields.actSolutionConcentrationUnit,
+				studySubjectId: this.formData.studySubjectId,
+				studyFormId:this.formData.id,
+				studyId:this.formData.studyId,
+				kc: total,
+				kcdw: unit,
+			}
+			this.configCompleteRequest(postData);
+		},
+    //分装回调
+		subPackageSubmit(data) {
+			const { fzsj, rowData, headerSelectFields } = data;
+			const { fzList = [], dw = "", mybh } = fzsj;
+			if (fzList && fzList.length > 0) {
+				const list = fzList.map((item) => {
+					return {
+						bh: mybh + item.preCode + item.subCode,
+						kc: item.num,
+						kcdw: dw,
+					}
+				})
+				let postData = {
+					studyId: this.formData.studyId,
+					studyFormId: this.formData.id,
+					bh: mybh,
+					nd: rowData.actSolutionConcentration || 0,
+					nddw: headerSelectFields.actSolutionConcentrationUnit,
+					studySubjectId: this.formData.studySubjectId,
+			     	studyFormId:this.formData.id,
+					list: list
+				}
+				this.subPackageRequest(postData);
+			}
+		},
 		//获取已填写的表单数据
-		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,
-			// }
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef","remarkRef","tableRef"])
 		},
 		//获取填写完成的表单数据
 		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);
+			let content = await this.validFormFields(["baseInfoRef",  "swypyjInfoRef","remarkRef","tableRef"]);
+			return content;
 		},
 		getResource() {
-			// let content = this.getFilledFormData();
 			//使用的试剂、仪器
-			const stepResource = this.$refs.stepRef.getStepResource()
-			this.resourceTmp = stepResource.sjResource || []
-			this.yqResourceTmp = stepResource.yqResource || []
+			// stepRef不存在，直接返回空数组
+			this.resourceTmp = []
+			this.yqResourceTmp = []
 			return this.resourceTmp;
 		},
 		//保存
 		async onSave() {
-			const formData = this.getStepResource();
-			console.log(formData, "formData")
+			// stepRef不存在，直接返回空对象
+			console.log({});
+		},
+		// 删除表格行
+		deleteRow(rowIndex) {
+			const tableRef = this.$refs['tableRef'];
+			if (tableRef) {
+				tableRef.deleteRow(rowIndex);
+			}
 		},
 	}
 };
 </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>