From 07b9cc86e4c3402dc8c08dd53123f8f7109bd7f0 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Sat, 31 Jan 2026 11:10:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]sp00456?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/TemplateTable.vue      |   4 +-
 .../business/comps/template/comps/sp/SP004.vue     | 727 ---------------------
 .../business/comps/template/comps/sp/SP00456.vue   | 727 +++++++++++++++++++++
 vue.config.js                                      |   2 +-
 4 files changed, 730 insertions(+), 730 deletions(-)
 delete mode 100644 src/views/business/comps/template/comps/sp/SP004.vue
 create mode 100644 src/views/business/comps/template/comps/sp/SP00456.vue

diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index 03cdb51..e4f1713 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -25,7 +25,7 @@ import EditSign from "./dialog/EditSign.vue";//电子签名弹窗
 import SP001 from "./comps/sp/SP001.vue";
 import SP002 from "./comps/sp/SP002.vue";
 import SP003 from "./comps/sp/SP003.vue";
-import SP004 from "./comps/sp/SP004.vue";
+import SP00456 from "./comps/sp/SP00456.vue";
 //色谱生物样品分析方法学样品制备表-10个类似
 import ZQDYJMD from "./comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue";
 import QXWDX from "./comps/sp/SWYPFXFFXYPZBB/QXWDX.vue";
@@ -53,7 +53,7 @@ export default {
     //供试品
     MJYLQSQD, SYWZPZJHB,
     //色谱
-    SP001, SP002, SP003, SP004,ZQDYJMD,QXWDX,CBYHGZYWDX,Recovery,RXJZXY,JZXY,XZXHTYX,ZDYBS,XSKKX,CBYDB,SWYPFXFFXZKPZB
+    SP001, SP002, SP003, SP00456,ZQDYJMD,QXWDX,CBYHGZYWDX,Recovery,RXJZXY,JZXY,XZXHTYX,ZDYBS,XSKKX,CBYDB,SWYPFXFFXZKPZB
   },
   props: {
     sn: {
diff --git a/src/views/business/comps/template/comps/sp/SP004.vue b/src/views/business/comps/template/comps/sp/SP004.vue
deleted file mode 100644
index 161ff63..0000000
--- a/src/views/business/comps/template/comps/sp/SP004.vue
+++ /dev/null
@@ -1,727 +0,0 @@
-<!-- 生物样品内标工作液制备表 -->
-<template>
-	<div>
-		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc || getTemplateName()
-			}}<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.common.storageCondition"
-						label="template.common.storageCondition" ref="storageConditionRef"
-						:formConfig="storageFormConfig" :formData="formData" />
-					<LineLabel label="template.common.operationSteps" />
-					<div v-if="fillType === 'preFill'" class="mt-20">
-						<el-button type="primary" @click="handleAddParalle">新增平行配制</el-button>
-						<el-button type="primary" @click="handleAddLadder">新增阶梯配制</el-button>
-					</div>
-
-					<!-- 阶梯配制区域 -->
-					<div v-for="(ladderConfig, ladderIndex) in formData.ladderConfigs" :key="'ladder_' + ladderIndex">
-
-						<div class="template-form-item">
-							<div class="config-header">
-								<div>阶梯配制</div>
-								<el-button v-if="fillType === 'preFill'" type="text" icon="el-icon-delete"
-									@click="deleteLadderConfig(ladderIndex)">删除</el-button>
-							</div>
-							<BaseInfoFormPackage @clickable="(e) => handleClickable('ladder', ladderIndex, e)"
-								@resetRecord="(e) => resetRecord('ladder', ladderIndex, e)"
-								:ref="`ladderStepFormPackageRef_${ladderIndex}`" :formConfig="ladderStepFormConfig"
-								@blur="onHandleBlur" :formData="ladderConfig" fieldItemLabel="阶梯配制"
-								:prefixKey="'ladder_' + ladderIndex" />
-							<CustomTable @blur="(e) => onHandleTableBlur('ladder', ladderIndex, e)"
-								:ref="`ladderStepTableRef_${ladderIndex}`" :columns="ladderStepColumns"
-								:formData="ladderConfig" :prefixKey="'ladder_' + ladderIndex" fieldItemLabel="阶梯配制">
-								<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-									<TableOpertaion @printTag="(e) => printTag(e, 'ladderConfigs', ladderIndex)"
-										@startConfig="(val) => startConfig(val, 'ladderConfigs', ladderIndex)"
-										@configComplete="(val) => configComplete(val, 'ladderConfigs', ladderIndex)"
-										@subPackageSubmit="(val) => subPackageSubmit(val, 'ladderConfigs', ladderIndex)"
-										:fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
-										@deleteRow="(rowIndex) => deleteRow(rowIndex, 'ladder', ladderIndex)">
-									</TableOpertaion>
-								</template>
-							</CustomTable>
-
-							<Step class="mt-0 s-container" :ref="`ladderStepRef_${ladderIndex}`"
-								:formData="ladderConfig.ladderStepData" fieldItemLabel="阶梯配制"
-								:prefixKey="'ladder_' + ladderIndex"></Step>
-						</div>
-					</div>
-
-					<!-- 平行配制区域 -->
-					<div label="平行配制" v-for="(paralleConfig, paralleIndex) in formData.paralleConfigs"
-						:key="'paralle_' + paralleIndex">
-
-						<div class="template-form-item">
-							<div class="config-header">
-								<div>平行配制</div>
-								<el-button v-if="fillType === 'preFill'" type="text" icon="el-icon-delete"
-									@click="deleteParalleConfig(paralleIndex)">删除</el-button>
-							</div>
-							<BaseInfoFormPackage @clickable="(e) => handleClickable('paralle', paralleIndex, e)"
-								:ref="`paralleStepFormPackageRef_${paralleIndex}`" :formConfig="paralleStepFormConfig"
-								@blur="onHandleBlur" :formData="paralleConfig" :prefixKey="'paralle' + paralleIndex"
-								fieldItemLabel="平行配制" />
-							<CustomTable @blur="(e) => onHandleTableBlur('paralle', paralleIndex, e)"
-								:ref="`paralleStepTableRef_${paralleIndex}`" :columns="paralleStepColumns"
-								@clickable="(e, tableRowIndex, rowData) => handleTableClickable('paralle', paralleIndex, e, tableRowIndex, rowData)"
-								:formData="paralleConfig" :prefixKey="'paralle' + paralleIndex" fieldItemLabel="平行配制">
-								<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-									<TableOpertaion @printTag="(e) => printTag(e, 'paralleConfigs', paralleIndex)"
-										@startConfig="(val) => startConfig(val, 'paralleConfigs', paralleIndex)"
-										@configComplete="(val) => configComplete(val, 'paralleConfigs', paralleIndex)"
-										@subPackageSubmit="(val) => subPackageSubmit(val, 'paralleConfigs', paralleIndex)"
-										:fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
-										@deleteRow="(rowIndex) => deleteRow(rowIndex, 'paralle', paralleIndex)">
-									</TableOpertaion>
-								</template>
-							</CustomTable>
-
-							<Step class="mt-0 s-container" :ref="`paralleStepRef_${paralleIndex}`"
-								:formData="paralleConfig.paralleStepData" fieldItemLabel="平行配制"
-								:prefixKey="'paralle' + paralleIndex"></Step>
-						</div>
-					</div>
-					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
-						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
-
-				</div>
-			</div>
-			<!-- <button @click="onSave">保存</button> -->
-		</div>
-		<SelectReagentDialog @submit="onSelectReagentSubmit" ref="selectReagentDialogRef">
-		</SelectReagentDialog>
-	</div>
-</template>
-
-<script>
-import { EventBus } from "@/utils/eventBus";
-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.js";
-import CustomTable from '@/components/Template/CustomTable.vue';
-import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
-import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue";
-import { getExpireDate } from "@/utils/index.js";
-import moment from "moment";
-import { addTj } from "@/utils/calUnitTools";
-import { getLadderColumnsConfig, getParallelColumnsConfig, getLadderFormConfig, getBaseInfoFormConfig, getRemarkFormConfig, getStorageConditionFormConfig, getParalleStepFormConfig } from "../../formConfig/paralleAndLadderConfig.js";
-export default {
-	name: "SWYPBQGZYZBB",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, SelectReagentDialog, TableOpertaion },
-	mixins: [templateMixin],
-	props: {
-		fillType: {
-			type: String,
-			default: 'preFill',
-		},
-		sn: {
-			type: String,
-			default: '',
-		},
-	},
-	watch: {
-		fillType: {
-			immediate: true,
-			handler(v) {
-				console.log(v, "fillType")
-			}
-		},
-		formData: {
-			immediate: true,
-			handler(v) {
-				if (v && this.fillType === "actFill") {
-					this.handleUpdateCode();
-				}
-			}
-		}
-	},
-	computed: {
-		// 存储条件表单配置
-		storageFormConfig() {
-			return getStorageConditionFormConfig(this);
-		},
-		// 备注表单配置
-		remarkConig() {
-			return getRemarkFormConfig();
-		},
-		// 试验基本信息表单配置
-		baseInfoFormConfig() {
-			return getBaseInfoFormConfig(this);
-		},
-		paralleStepFormConfig() {
-			return getParalleStepFormConfig(this);
-		},
-		// 操作步骤表单配置
-		ladderStepFormConfig() {
-			return getLadderFormConfig(this);
-		},
-		paralleStepColumns() {
-			return getParallelColumnsConfig(this);
-		},
-		// 阶梯配置表格列配置
-		ladderStepColumns() {
-			return getLadderColumnsConfig(this);
-		},
-	},
-	data() {
-		return {
-			subSolutionVisible: false,
-			currentSubKey: "",//当前点击的子项key
-			currentType: "",//当前点击的类型
-			currentRowIndex: "",//当前点击的行索引
-			dataSource: [],
-			currentTableIndex: "",//当前点击的表格索引
-			currentTableKey: "",//当前点击的表格key
-			targetAcSolutionFromTable: true,//是否从表格中获取实际原始溶液浓度
-			currentRowData: {},//当前点击的行数据
-		};
-	},
-	mounted() {
-	},
-	methods: {
-		resetRecord(type, index, e) {
-			this.$refs[`ladderStepTableRef_${index}`][0].resetRecord();
-		},
-		//分装
-		subPackageSubmit(data, configType, index) {
-			const { fzsj, rowData, headerSelectFields } = data;
-			const { fzList = [], dw = "", mybh } = fzsj;
-			if (fzList && fzList.length > 0) {
-				const list = fzList.map((item) => {
-					return {
-						bh: mybh + 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,
-					list: list
-				}
-				this.subPackageRequest(postData);
-			}
-		},
-		startConfig(val) {
-			const { rowData } = val;
-			let postData = {
-				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
-			}
-			this.startConfigRequest(postData);
-		},
-		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,
-				kc: total,
-				kcdw: unit,
-			}
-			this.configCompleteRequest(postData);
-		},
-		getTemplateName() {
-			if (this.templateData&&this.templateData.templateMc) {
-				return this.templateData.templateMc
-			}
-			const o = {
-				"SP004": "生物样品内标工作液制备表",
-				"SP005": "生物样品质控工作液制备表",
-				"SP006": "生物样品标准曲线/质控样品制备表",
-			}
-			return o[this.sn];
-		},
-		//标签打印
-		printTag(e, configType, index) {
-			const { nickName, name } = this.$store.getters;
-			const { printCode, row, type } = e;
-			const currentForm = this.formData[configType][index];
-			const { stepStorageCondition, startDate, expireDate, paralleStepStorageCondition } = currentForm;
-			const targetSolutionExpirationDate = row.targetSolutionExpirationDate;
-			const lang = this.$i18n.locale;
-			const printConfig = {
-				"品名": "暂时还不知道品名是哪个字段",
-				"存储条件": stepStorageCondition || paralleStepStorageCondition,
-				"配制日期": moment(startDate).format("YYYY-MM-DD"),
-				"有效期至": moment(targetSolutionExpirationDate || expireDate).format("YYYY-MM-DD HH:mm"),
-				"配置者": lang === "zh_CN" ? nickName : name,
-				//type==="subPackage"从分装打印过来的，
-				//type==="row" 从列表上点过来的
-				"编号": type === "subPackage" ? printCode : (row.targetSolutionCode + row.subTargetSolutionCode),
-			}
-			console.log(printConfig, "printConfig")
-			EventBus.$emit('showTagPrintDialog', { printConfig })
-		},
-		// 为指定的表单数据数组分配编号
-		async assignNumbersToTableData(config) {
-			const configs = this.formData[config]
-			const { startDate } = this.formData;
-			// 检查paralleConfigs中的paralleTableFormData数组
-			if (configs && configs.length > 0) {
-				for (let i = 0; i < configs.length; i++) {
-					const ref = config === "paralleConfigs" ? `paralleStepTableRef_${i}` : `ladderStepTableRef_${i}`;
-					const { stepTableFormData = [], effectivePeriod, effectivePeriodUnit, expireDate } = configs[i];
-					if (!expireDate && config === "ladderConfigs") {
-						const date = getExpireDate(startDate, effectivePeriod, effectivePeriodUnit);
-						configs[i].expireDate = date;
-					}
-					if (stepTableFormData && stepTableFormData.length > 0) {
-						const tableDataArray = stepTableFormData;
-						// 检查表单数据中是否有任何一行的subTargetSolutionCode有值
-						const hasAnyWithValue = tableDataArray.some(row =>
-							row.subTargetSolutionCode && row.subTargetSolutionCode.trim() !== '');
-						// 如果没有任何一行有值，则为所有行分配编号
-						if (!hasAnyWithValue) {
-							const length = tableDataArray.length;
-							const snList = await this.getLatestSn(length);
-							tableDataArray.forEach((row, idx) => {
-								let expDate = {};
-								if (config === "paralleConfigs" && !row.targetSolutionExpirationDate) {
-									let date = getExpireDate(startDate, row.targetSolutionCycle, row.targetSolutionCyclePrecision);
-									expDate = {
-										targetSolutionExpirationDate: date
-									}
-								}
-								this.$refs[ref][0]?.updateDataSourceByRowIndex(idx, { subTargetSolutionCode: snList[idx], ...expDate });
-							});
-							Promise.resolve();
-						}
-					}
-				}
-			}
-
-		},
-
-		async handleUpdateCode() {
-			Promise.all([this.assignNumbersToTableData("ladderConfigs"), this.assignNumbersToTableData("paralleConfigs")
-			]).then(() => {
-				//通知后端保存数据
-				const params = {
-					type: "fieldChanged",
-					newRecord: null,
-					resourceList: null,
-				}
-				EventBus.$emit('onModifyRecord', params,)
-			})
-		},
-		//新增平行配制
-		handleAddParalle() {
-			// 初始化平行配制配置列表
-			if (!this.formData.paralleConfigs) {
-				this.$set(this.formData, 'paralleConfigs', []);
-			}
-			// 添加新的平行配制配置
-			this.formData.paralleConfigs.push({
-				paralleStepData: [],
-				paralleTableFormData: [],
-				showParalleConfig: true
-			});
-		},
-		//新增阶梯配制
-		handleAddLadder() {
-			// 初始化阶梯配制配置列表
-			if (!this.formData.ladderConfigs) {
-				this.$set(this.formData, 'ladderConfigs', []);
-			}
-
-			// 添加新的阶梯配制配置
-			this.formData.ladderConfigs.push({
-				ladderStepData: [],
-				ladderTableFormData: [],
-				showLadderConfig: true
-			});
-		},
-		// 删除阶梯配制配置
-		deleteLadderConfig(index) {
-			this.formData.ladderConfigs.splice(index, 1);
-		},
-		// 删除平行配制配置
-		deleteParalleConfig(index) {
-			this.formData.paralleConfigs.splice(index, 1);
-		},
-		// 添加表格行
-		handleAddRow(type, rowIndex, configIndex = 0) {
-			const tableRef = type === 'ladder' ?
-				this.$refs[`ladderStepTableRef_${configIndex}`] :
-				this.$refs[`paralleStepTableRef_${configIndex}`];
-			if (tableRef && tableRef[0].addRow) {
-				tableRef[0].addRow({});
-			}
-		},
-		// 删除表格行
-		deleteRow(rowIndex, type, configIndex = 0) {
-			// 根据类型删除对应的表格行
-			if (type === 'ladder') {
-				const tableRef = this.$refs[`ladderStepTableRef_${configIndex}`];
-				if (tableRef) {
-					tableRef.deleteRow(rowIndex);
-				}
-			} else if (type === 'paralle') {
-				const tableRef = this.$refs[`paralleStepTableRef_${configIndex}`];
-				if (tableRef) {
-					tableRef.deleteRow(rowIndex);
-				}
-			}
-		},
-
-		// 表格失去焦点事件
-		onHandleTableBlur(type, configIndex, e) {
-			const { colKey = "", item, rowIndex } = e;
-			if (colKey === "targetStartSolutionConcentration" || colKey === "targetSolutionVolume" || colKey === "targetSolutionConcentration" || colKey === "targetStartSolutionVolumePrecision" || colKey === "targetDiluentVolumePrecision") {
-				if (type === "ladder") {
-					const volume = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetStartSolution") || 0;
-					if (volume) {
-						this.updateTargetStartSolutionVolume(item, volume);
-					}
-				} else if (type === "paralle") {
-					const volumne = item.targetStartSolutionConcentration || 0;
-					if (volumne) {
-						this.updateTargetStartSolutionVolume(item, volumne);
-					}
-				}
-			} else if (colKey === "actStartSolutionVolume" || colKey === "actDiluentVolume") {//实际起始溶液体积和实际目标溶液体积
-				if (type === "ladder") {
-					const targetAcSolution = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetAcSolution") || 0;//获取实际起始溶液浓度
-					if (targetAcSolution) {
-						const { actVol, actNd } = this.updateSjmbrynd(item, targetAcSolution);
-						this.$refs[`ladderStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
-							actSolutionVolume: actVol,
-							actSolutionConcentration: actNd,
-						});
-					}
-				} else if (type === "paralle") {
-					const targetAcSolution = item.targetAcSolution || 0;//获取实际起始溶液浓度
-					if (targetAcSolution) {
-						this.updateSjmbrynd(item, targetAcSolution);
-						const { actVol, actNd } = this.updateSjmbrynd(item, targetAcSolution);
-						this.$refs[`paralleStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
-							actSolutionVolume: actVol,
-							actSolutionConcentration: actNd,
-						});
-					}
-				}
-
-			}
-		},
-		//表格点击事件
-		handleTableClickable(type, rowIndex, col, tableRowIndex, rowData) {
-			if (col.prop === "actStartSolutionCode") {//实际原始溶液编号点击事件
-				this.currentTableKey = col.prop;
-				this.currentType = type;
-				this.currentRowIndex = rowIndex;
-				this.currentTableIndex = tableRowIndex;
-				this.currentRowData = rowData;
-				this.$refs.selectReagentDialogRef.show(this.formData.id);
-			}
-		},
-		//form表单点击事件
-		handleClickable(type, rowIndex, item) {
-			if (this.fillType === "preFill") {
-				return;
-			}
-			console.log(type, rowIndex, item, "handle")
-			const { subKey = "" } = item;
-			if (subKey === "subStartSolution" || subKey === "subSolution") {//起始源溶液点击事件
-				this.$refs.selectReagentDialogRef.show(this.formData.id)
-				this.currentSubKey = subKey;
-				this.currentType = type;
-				this.currentRowIndex = rowIndex;
-			}
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code, row) {
-			const { currentSubKey, currentTableKey, currentRowIndex, currentTableIndex } = this;
-			if (currentSubKey) {
-				const ref = this.currentType === "ladder" ? "ladderStepFormPackageRef_" : "paralleStepFormPackageRef_"
-				const packageRef = this.$refs[`${ref}${this.currentRowIndex}`][0];
-				if (currentSubKey === "subStartSolution") {
-					packageRef.updateFormData("targetAcSolution", row.nd);
-					packageRef.onValueChangeCompareTo("targetAcSolution", row.nd, "targetStartSolution");
-					this.updateTableNd(row);
-				}
-				packageRef.updateFormData(currentSubKey, code);
-				this.currentSubKey = "";
-			} else if (currentTableKey === "actStartSolutionCode") {//实际原始溶液编号点击事件
-				const tableRef = this.$refs[`paralleStepTableRef_${currentRowIndex}`][0];
-				if (tableRef) {
-					const { actVol, actNd } = this.updateSjmbrynd(this.currentRowData, row.nd);
-					tableRef.updateDataSourceByRowIndex(currentTableIndex, {
-						actStartSolutionCode: code,
-						targetAcSolution: row.nd,
-						actSolutionVolume: actVol,
-						actSolutionConcentration: actNd,
-					})
-
-				}
-			}
-			this.$refs.selectReagentDialogRef.onCancel();
-		},
-		updateRecord() {
-			this.$nextTick(() => {
-				EventBus.$emit('onModifyRecord', {
-					type: "fieldChanged",
-					newRecord: null,
-					resourceList: null,
-				},)
-			})
-		},
-		//选择实际的时候更新table的浓度
-		updateTableNd(row) {
-			const { stepTableFormData = [] } = this.$refs[`ladderStepTableRef_${this.currentRowIndex}`][0].getFilledFormData();
-			const newData = JSON.parse(JSON.stringify(stepTableFormData));
-			// 遍历数据，按要求更新起始溶液编号
-			newData.forEach((item, index) => {
-				const { actVol, actNd } = this.updateSjmbrynd(item, row.nd);
-				console.log(actNd, "actNd")
-				item.actSolutionVolume = actVol;
-				item.actSolutionConcentration = actNd;
-				const o = {
-					actSolutionVolume: actVol,
-					actSolutionConcentration: actNd,
-				}
-				// 更新stepTableRef组件的数据
-				this.$refs[`ladderStepTableRef_${this.currentRowIndex}`][0].updateDataSourceByRowIndex(index, o);
-			})
-		},
-		//只做校验
-		async validFields() {
-			// 构建需要验证的引用数组
-			let refsToValidate = ["baseInfoRef", "storageConditionRef", "remarkRef"];
-
-			// 添加阶梯配制相关的引用
-			if (this.formData.ladderConfigs && this.formData.ladderConfigs.length > 0) {
-				for (let i = 0; i < this.formData.ladderConfigs.length; i++) {
-					refsToValidate.push(`ladderStepFormPackageRef_${i}`);
-					refsToValidate.push(`ladderStepTableRef_${i}`);
-					refsToValidate.push(`ladderStepRef_${i}`);
-				}
-			}
-
-			// 添加平行配制相关的引用
-			if (this.formData.paralleConfigs && this.formData.paralleConfigs.length > 0) {
-				for (let i = 0; i < this.formData.paralleConfigs.length; i++) {
-					refsToValidate.push(`paralleStepFormPackageRef_${i}`);
-					refsToValidate.push(`paralleStepTableRef_${i}`);
-					refsToValidate.push(`paralleStepRef_${i}`);
-				}
-			}
-			return await this.validFormFields(refsToValidate);
-		},
-		getFilledFormData() {
-			const baseData = this.$refs.baseInfoRef.getFilledFormData();
-			const conditionData = this.$refs.storageConditionRef.getFilledFormData();
-
-			// 获取所有阶梯配制数据
-			const ladderConfigsData = [];
-			if (this.formData.ladderConfigs && this.formData.ladderConfigs.length > 0) {
-				for (let i = 0; i < this.formData.ladderConfigs.length; i++) {
-					const ladderFormData = this.$refs[`ladderStepFormPackageRef_${i}`][0].getFilledFormData();
-					const ladderTableFormData = this.$refs[`ladderStepTableRef_${i}`][0].getFilledFormData();
-					const ladderStepData = this.$refs[`ladderStepRef_${i}`][0].getFilledFormData();
-
-					ladderConfigsData.push({
-						...ladderFormData,
-						...ladderTableFormData,
-						ladderStepData: ladderStepData.stepData,
-						showLadderConfig: true
-					});
-				}
-			}
-
-			// 获取所有平行配制数据
-			const paralleConfigsData = [];
-			if (this.formData.paralleConfigs && this.formData.paralleConfigs.length > 0) {
-				for (let i = 0; i < this.formData.paralleConfigs.length; i++) {
-					const paralleFormData = this.$refs[`paralleStepFormPackageRef_${i}`][0].getFilledFormData();
-					const paralleTableFormData = this.$refs[`paralleStepTableRef_${i}`][0].getFilledFormData();
-					const paralleStepData = this.$refs[`paralleStepRef_${i}`][0].getFilledFormData();
-
-					paralleConfigsData.push({
-						...paralleFormData,
-						...paralleTableFormData,
-						paralleStepData: paralleStepData.stepData,
-						showParalleConfig: true
-					});
-				}
-			}
-
-			const remarkData = this.$refs.remarkRef.getFilledFormData();
-			return {
-				...baseData,
-				...conditionData,
-				ladderConfigs: ladderConfigsData,
-				paralleConfigs: paralleConfigsData,
-				...remarkData
-			}
-		},
-		async getFormData() {
-			//先校验再获取值
-			const validFlag = await this.validFields();
-			if (!validFlag) {
-				return false;
-			}
-			let content = this.getFilledFormData();
-			//生成resource
-			let tmpResource = []
-			if (this.fillType === "actFill") {
-				//平行配置
-				if (content.ladderConfigs && content.ladderConfigs.length > 0) {
-					for (let i = 0; i < content.ladderConfigs.length; i++) {
-						let ladderConfigs = content.ladderConfigs[i]
-						let stepTableFormData = ladderConfigs.stepTableFormData
-						for (let j = 0; j < stepTableFormData.length; j++) {
-							//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
-							const { total, unit } = addTj([stepTableFormData[j].actStartSolutionVolume, stepTableFormData[j].actDiluentVolume], [ladderConfigs.headerSelectFields.actStartSolutionVolumeUnit, ladderConfigs.headerSelectFields.actDiluentVolumeUnit])
-							tmpResource.push({
-								mc: null,
-								bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
-								ph: null,
-								ndz:stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
-								nd: stepTableFormData[j].actSolutionConcentration,
-								nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
-								ly: 'ELN配制',
-								sxrq: ladderConfigs.expireDate,
-								kc: total,
-								kcdw: unit,
-								syl: null,
-								syldw: unit,
-								yxzq: ladderConfigs.effectivePeriod,
-								yxzqdw: ladderConfigs.effectivePeriodUnit,
-							})
-							let fzsj = stepTableFormData[j].fzsj
-							if (fzsj && fzsj.fzList) {
-								for (let k = 0; k < fzsj.fzList.length; k++) {
-									tmpResource.push({
-										mc: null,
-										bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
-										ph: null,
-										nd: stepTableFormData[j].actSolutionConcentration,
-										nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
-										ndz: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
-										ly: 'ELN配制',
-										sxrq: ladderConfigs.expireDate,
-										kc: fzsj.fzList[k].num,
-										kcdw: fzsj.dw,
-										syl: null,
-										syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit,
-										yxzq: ladderConfigs.effectivePeriod,
-										yxzqdw: ladderConfigs.effectivePeriodUnit,
-									})
-								}
-							}
-						}
-					}
-				}
-				//阶梯配置
-				if (content.paralleConfigs && content.paralleConfigs.length > 0) {
-					for (let i = 0; i < content.paralleConfigs.length; i++) {
-						let paralleConfigs = content.paralleConfigs[i]
-						let stepTableFormData = paralleConfigs.stepTableFormData
-						for (let j = 0; j < stepTableFormData.length; j++) {
-							const { total, unit } = addTj([stepTableFormData[j].actSolutionVolume, stepTableFormData[j].actDiluentVolume], [paralleConfigs.headerSelectFields.actSolutionVolumeUnit, paralleConfigs.headerSelectFields.actDiluentVolumeUnit])
-							tmpResource.push({
-								mc: null,
-								bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
-								ph: null,
-								nd: stepTableFormData[j].actSolutionConcentration,
-								ndz: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
-								nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
-								ly: 'ELN配制',
-								sxrq: stepTableFormData[j].targetSolutionExpirationDate,
-								kc: total,
-								kcdw: unit,
-								syl: null,
-								syldw: unit,
-								yxzq: stepTableFormData[j].targetSolutionCycle,
-								yxzqdw: stepTableFormData[j].targetSolutionCyclePrecision,
-							})
-							let fzsj = stepTableFormData[j].fzsj
-							if (fzsj && fzsj.fzList) {
-								for (let k = 0; k < fzsj.fzList.length; k++) {
-									tmpResource.push({
-										mc: null,
-										bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
-										ph: null,
-										ndz: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
-										nd: stepTableFormData[j].actSolutionConcentration,
-										nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
-										ly: 'ELN配制',
-										sxrq: paralleConfigs.expireDate,
-										kc: fzsj.fzList[k].num,
-										kcdw: fzsj.dw,
-										syl: null,
-										syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit,
-										yxzq: paralleConfigs.effectivePeriod,
-										yxzqdw: paralleConfigs.effectivePeriodUnit,
-									})
-								}
-							}
-						}
-					}
-				}
-			}
-			this.resourceTmp = tmpResource
-			return content;
-		},
-		async onSave() {
-			const formData = await this.getFormData();
-			console.log(formData, "formData")
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss">
-.mt-20 {
-	margin-top: 20px;
-}
-
-.config-section {
-	margin-bottom: 20px;
-	padding: 15px;
-	border: 1px solid #ebeef5;
-	border-radius: 4px;
-	background-color: #fafafa;
-}
-
-.config-header {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	margin-bottom: 15px;
-	font-weight: bold;
-	font-size: 16px;
-	color: #303133;
-}
-
-.config-header .el-button {
-	color: #f56c6c;
-	font-size: 14px;
-}
-
-.config-header .el-button:hover {
-	color: #f78989;
-}
-
-.mt-0 {
-	margin-top: 0;
-}
-
-.s-container {
-	box-shadow: none !important;
-	padding: 24px 0 !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/comps/sp/SP00456.vue b/src/views/business/comps/template/comps/sp/SP00456.vue
new file mode 100644
index 0000000..5108d95
--- /dev/null
+++ b/src/views/business/comps/template/comps/sp/SP00456.vue
@@ -0,0 +1,727 @@
+<!-- 生物样品内标工作液制备表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc || getTemplateName()
+			}}<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.common.storageCondition"
+						label="template.common.storageCondition" ref="storageConditionRef"
+						:formConfig="storageFormConfig" :formData="formData" />
+					<LineLabel label="template.common.operationSteps" />
+					<div v-if="fillType === 'preFill'" class="mt-20">
+						<el-button type="primary" @click="handleAddParalle">新增平行配制</el-button>
+						<el-button type="primary" @click="handleAddLadder">新增阶梯配制</el-button>
+					</div>
+
+					<!-- 阶梯配制区域 -->
+					<div v-for="(ladderConfig, ladderIndex) in formData.ladderConfigs" :key="'ladder_' + ladderIndex">
+
+						<div class="template-form-item">
+							<div class="config-header">
+								<div>阶梯配制</div>
+								<el-button v-if="fillType === 'preFill'" type="text" icon="el-icon-delete"
+									@click="deleteLadderConfig(ladderIndex)">删除</el-button>
+							</div>
+							<BaseInfoFormPackage @clickable="(e) => handleClickable('ladder', ladderIndex, e)"
+								@resetRecord="(e) => resetRecord('ladder', ladderIndex, e)"
+								:ref="`ladderStepFormPackageRef_${ladderIndex}`" :formConfig="ladderStepFormConfig"
+								@blur="onHandleBlur" :formData="ladderConfig" fieldItemLabel="阶梯配制"
+								:prefixKey="'ladder_' + ladderIndex" />
+							<CustomTable @blur="(e) => onHandleTableBlur('ladder', ladderIndex, e)"
+								:ref="`ladderStepTableRef_${ladderIndex}`" :columns="ladderStepColumns"
+								:formData="ladderConfig" :prefixKey="'ladder_' + ladderIndex" fieldItemLabel="阶梯配制">
+								<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+									<TableOpertaion @printTag="(e) => printTag(e, 'ladderConfigs', ladderIndex)"
+										@startConfig="(val) => startConfig(val, 'ladderConfigs', ladderIndex)"
+										@configComplete="(val) => configComplete(val, 'ladderConfigs', ladderIndex)"
+										@subPackageSubmit="(val) => subPackageSubmit(val, 'ladderConfigs', ladderIndex)"
+										:fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
+										@deleteRow="(rowIndex) => deleteRow(rowIndex, 'ladder', ladderIndex)">
+									</TableOpertaion>
+								</template>
+							</CustomTable>
+
+							<Step class="mt-0 s-container" :ref="`ladderStepRef_${ladderIndex}`"
+								:formData="ladderConfig.ladderStepData" fieldItemLabel="阶梯配制"
+								:prefixKey="'ladder_' + ladderIndex"></Step>
+						</div>
+					</div>
+
+					<!-- 平行配制区域 -->
+					<div label="平行配制" v-for="(paralleConfig, paralleIndex) in formData.paralleConfigs"
+						:key="'paralle_' + paralleIndex">
+
+						<div class="template-form-item">
+							<div class="config-header">
+								<div>平行配制</div>
+								<el-button v-if="fillType === 'preFill'" type="text" icon="el-icon-delete"
+									@click="deleteParalleConfig(paralleIndex)">删除</el-button>
+							</div>
+							<BaseInfoFormPackage @clickable="(e) => handleClickable('paralle', paralleIndex, e)"
+								:ref="`paralleStepFormPackageRef_${paralleIndex}`" :formConfig="paralleStepFormConfig"
+								@blur="onHandleBlur" :formData="paralleConfig" :prefixKey="'paralle' + paralleIndex"
+								fieldItemLabel="平行配制" />
+							<CustomTable @blur="(e) => onHandleTableBlur('paralle', paralleIndex, e)"
+								:ref="`paralleStepTableRef_${paralleIndex}`" :columns="paralleStepColumns"
+								@clickable="(e, tableRowIndex, rowData) => handleTableClickable('paralle', paralleIndex, e, tableRowIndex, rowData)"
+								:formData="paralleConfig" :prefixKey="'paralle' + paralleIndex" fieldItemLabel="平行配制">
+								<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+									<TableOpertaion @printTag="(e) => printTag(e, 'paralleConfigs', paralleIndex)"
+										@startConfig="(val) => startConfig(val, 'paralleConfigs', paralleIndex)"
+										@configComplete="(val) => configComplete(val, 'paralleConfigs', paralleIndex)"
+										@subPackageSubmit="(val) => subPackageSubmit(val, 'paralleConfigs', paralleIndex)"
+										:fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
+										@deleteRow="(rowIndex) => deleteRow(rowIndex, 'paralle', paralleIndex)">
+									</TableOpertaion>
+								</template>
+							</CustomTable>
+
+							<Step class="mt-0 s-container" :ref="`paralleStepRef_${paralleIndex}`"
+								:formData="paralleConfig.paralleStepData" fieldItemLabel="平行配制"
+								:prefixKey="'paralle' + paralleIndex"></Step>
+						</div>
+					</div>
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+
+				</div>
+			</div>
+			<!-- <button @click="onSave">保存</button> -->
+		</div>
+		<SelectReagentDialog @submit="onSelectReagentSubmit" ref="selectReagentDialogRef">
+		</SelectReagentDialog>
+	</div>
+</template>
+
+<script>
+import { EventBus } from "@/utils/eventBus";
+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.js";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
+import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue";
+import { getExpireDate } from "@/utils/index.js";
+import moment from "moment";
+import { addTj } from "@/utils/calUnitTools";
+import { getLadderColumnsConfig, getParallelColumnsConfig, getLadderFormConfig, getBaseInfoFormConfig, getRemarkFormConfig, getStorageConditionFormConfig, getParalleStepFormConfig } from "../../formConfig/paralleAndLadderConfig.js";
+export default {
+	name: "SP00456",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, SelectReagentDialog, TableOpertaion },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+		sn: {
+			type: String,
+			default: '',
+		},
+	},
+	watch: {
+		fillType: {
+			immediate: true,
+			handler(v) {
+				console.log(v, "fillType")
+			}
+		},
+		formData: {
+			immediate: true,
+			handler(v) {
+				if (v && this.fillType === "actFill") {
+					this.handleUpdateCode();
+				}
+			}
+		}
+	},
+	computed: {
+		// 存储条件表单配置
+		storageFormConfig() {
+			return getStorageConditionFormConfig(this);
+		},
+		// 备注表单配置
+		remarkConig() {
+			return getRemarkFormConfig();
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return getBaseInfoFormConfig(this);
+		},
+		paralleStepFormConfig() {
+			return getParalleStepFormConfig(this);
+		},
+		// 操作步骤表单配置
+		ladderStepFormConfig() {
+			return getLadderFormConfig(this);
+		},
+		paralleStepColumns() {
+			return getParallelColumnsConfig(this);
+		},
+		// 阶梯配置表格列配置
+		ladderStepColumns() {
+			return getLadderColumnsConfig(this);
+		},
+	},
+	data() {
+		return {
+			subSolutionVisible: false,
+			currentSubKey: "",//当前点击的子项key
+			currentType: "",//当前点击的类型
+			currentRowIndex: "",//当前点击的行索引
+			dataSource: [],
+			currentTableIndex: "",//当前点击的表格索引
+			currentTableKey: "",//当前点击的表格key
+			targetAcSolutionFromTable: true,//是否从表格中获取实际原始溶液浓度
+			currentRowData: {},//当前点击的行数据
+		};
+	},
+	mounted() {
+	},
+	methods: {
+		resetRecord(type, index, e) {
+			this.$refs[`ladderStepTableRef_${index}`][0].resetRecord();
+		},
+		//分装
+		subPackageSubmit(data, configType, index) {
+			const { fzsj, rowData, headerSelectFields } = data;
+			const { fzList = [], dw = "", mybh } = fzsj;
+			if (fzList && fzList.length > 0) {
+				const list = fzList.map((item) => {
+					return {
+						bh: mybh + 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,
+					list: list
+				}
+				this.subPackageRequest(postData);
+			}
+		},
+		startConfig(val) {
+			const { rowData } = val;
+			let postData = {
+				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
+			}
+			this.startConfigRequest(postData);
+		},
+		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,
+				kc: total,
+				kcdw: unit,
+			}
+			this.configCompleteRequest(postData);
+		},
+		getTemplateName() {
+			if (this.templateData&&this.templateData.templateMc) {
+				return this.templateData.templateMc
+			}
+			const o = {
+				"SP004": "生物样品内标工作液制备表",
+				"SP005": "生物样品质控工作液制备表",
+				"SP006": "生物样品标准曲线/质控样品制备表",
+			}
+			return o[this.sn];
+		},
+		//标签打印
+		printTag(e, configType, index) {
+			const { nickName, name } = this.$store.getters;
+			const { printCode, row, type } = e;
+			const currentForm = this.formData[configType][index];
+			const { stepStorageCondition, startDate, expireDate, paralleStepStorageCondition } = currentForm;
+			const targetSolutionExpirationDate = row.targetSolutionExpirationDate;
+			const lang = this.$i18n.locale;
+			const printConfig = {
+				"品名": "暂时还不知道品名是哪个字段",
+				"存储条件": stepStorageCondition || paralleStepStorageCondition,
+				"配制日期": moment(startDate).format("YYYY-MM-DD"),
+				"有效期至": moment(targetSolutionExpirationDate || expireDate).format("YYYY-MM-DD HH:mm"),
+				"配置者": lang === "zh_CN" ? nickName : name,
+				//type==="subPackage"从分装打印过来的，
+				//type==="row" 从列表上点过来的
+				"编号": type === "subPackage" ? printCode : (row.targetSolutionCode + row.subTargetSolutionCode),
+			}
+			console.log(printConfig, "printConfig")
+			EventBus.$emit('showTagPrintDialog', { printConfig })
+		},
+		// 为指定的表单数据数组分配编号
+		async assignNumbersToTableData(config) {
+			const configs = this.formData[config]
+			const { startDate } = this.formData;
+			// 检查paralleConfigs中的paralleTableFormData数组
+			if (configs && configs.length > 0) {
+				for (let i = 0; i < configs.length; i++) {
+					const ref = config === "paralleConfigs" ? `paralleStepTableRef_${i}` : `ladderStepTableRef_${i}`;
+					const { stepTableFormData = [], effectivePeriod, effectivePeriodUnit, expireDate } = configs[i];
+					if (!expireDate && config === "ladderConfigs") {
+						const date = getExpireDate(startDate, effectivePeriod, effectivePeriodUnit);
+						configs[i].expireDate = date;
+					}
+					if (stepTableFormData && stepTableFormData.length > 0) {
+						const tableDataArray = stepTableFormData;
+						// 检查表单数据中是否有任何一行的subTargetSolutionCode有值
+						const hasAnyWithValue = tableDataArray.some(row =>
+							row.subTargetSolutionCode && row.subTargetSolutionCode.trim() !== '');
+						// 如果没有任何一行有值，则为所有行分配编号
+						if (!hasAnyWithValue) {
+							const length = tableDataArray.length;
+							const snList = await this.getLatestSn(length);
+							tableDataArray.forEach((row, idx) => {
+								let expDate = {};
+								if (config === "paralleConfigs" && !row.targetSolutionExpirationDate) {
+									let date = getExpireDate(startDate, row.targetSolutionCycle, row.targetSolutionCyclePrecision);
+									expDate = {
+										targetSolutionExpirationDate: date
+									}
+								}
+								this.$refs[ref][0]?.updateDataSourceByRowIndex(idx, { subTargetSolutionCode: snList[idx], ...expDate });
+							});
+							Promise.resolve();
+						}
+					}
+				}
+			}
+
+		},
+
+		async handleUpdateCode() {
+			Promise.all([this.assignNumbersToTableData("ladderConfigs"), this.assignNumbersToTableData("paralleConfigs")
+			]).then(() => {
+				//通知后端保存数据
+				const params = {
+					type: "fieldChanged",
+					newRecord: null,
+					resourceList: null,
+				}
+				EventBus.$emit('onModifyRecord', params,)
+			})
+		},
+		//新增平行配制
+		handleAddParalle() {
+			// 初始化平行配制配置列表
+			if (!this.formData.paralleConfigs) {
+				this.$set(this.formData, 'paralleConfigs', []);
+			}
+			// 添加新的平行配制配置
+			this.formData.paralleConfigs.push({
+				paralleStepData: [],
+				paralleTableFormData: [],
+				showParalleConfig: true
+			});
+		},
+		//新增阶梯配制
+		handleAddLadder() {
+			// 初始化阶梯配制配置列表
+			if (!this.formData.ladderConfigs) {
+				this.$set(this.formData, 'ladderConfigs', []);
+			}
+
+			// 添加新的阶梯配制配置
+			this.formData.ladderConfigs.push({
+				ladderStepData: [],
+				ladderTableFormData: [],
+				showLadderConfig: true
+			});
+		},
+		// 删除阶梯配制配置
+		deleteLadderConfig(index) {
+			this.formData.ladderConfigs.splice(index, 1);
+		},
+		// 删除平行配制配置
+		deleteParalleConfig(index) {
+			this.formData.paralleConfigs.splice(index, 1);
+		},
+		// 添加表格行
+		handleAddRow(type, rowIndex, configIndex = 0) {
+			const tableRef = type === 'ladder' ?
+				this.$refs[`ladderStepTableRef_${configIndex}`] :
+				this.$refs[`paralleStepTableRef_${configIndex}`];
+			if (tableRef && tableRef[0].addRow) {
+				tableRef[0].addRow({});
+			}
+		},
+		// 删除表格行
+		deleteRow(rowIndex, type, configIndex = 0) {
+			// 根据类型删除对应的表格行
+			if (type === 'ladder') {
+				const tableRef = this.$refs[`ladderStepTableRef_${configIndex}`];
+				if (tableRef) {
+					tableRef.deleteRow(rowIndex);
+				}
+			} else if (type === 'paralle') {
+				const tableRef = this.$refs[`paralleStepTableRef_${configIndex}`];
+				if (tableRef) {
+					tableRef.deleteRow(rowIndex);
+				}
+			}
+		},
+
+		// 表格失去焦点事件
+		onHandleTableBlur(type, configIndex, e) {
+			const { colKey = "", item, rowIndex } = e;
+			if (colKey === "targetStartSolutionConcentration" || colKey === "targetSolutionVolume" || colKey === "targetSolutionConcentration" || colKey === "targetStartSolutionVolumePrecision" || colKey === "targetDiluentVolumePrecision") {
+				if (type === "ladder") {
+					const volume = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetStartSolution") || 0;
+					if (volume) {
+						this.updateTargetStartSolutionVolume(item, volume);
+					}
+				} else if (type === "paralle") {
+					const volumne = item.targetStartSolutionConcentration || 0;
+					if (volumne) {
+						this.updateTargetStartSolutionVolume(item, volumne);
+					}
+				}
+			} else if (colKey === "actStartSolutionVolume" || colKey === "actDiluentVolume") {//实际起始溶液体积和实际目标溶液体积
+				if (type === "ladder") {
+					const targetAcSolution = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetAcSolution") || 0;//获取实际起始溶液浓度
+					if (targetAcSolution) {
+						const { actVol, actNd } = this.updateSjmbrynd(item, targetAcSolution);
+						this.$refs[`ladderStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
+							actSolutionVolume: actVol,
+							actSolutionConcentration: actNd,
+						});
+					}
+				} else if (type === "paralle") {
+					const targetAcSolution = item.targetAcSolution || 0;//获取实际起始溶液浓度
+					if (targetAcSolution) {
+						this.updateSjmbrynd(item, targetAcSolution);
+						const { actVol, actNd } = this.updateSjmbrynd(item, targetAcSolution);
+						this.$refs[`paralleStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
+							actSolutionVolume: actVol,
+							actSolutionConcentration: actNd,
+						});
+					}
+				}
+
+			}
+		},
+		//表格点击事件
+		handleTableClickable(type, rowIndex, col, tableRowIndex, rowData) {
+			if (col.prop === "actStartSolutionCode") {//实际原始溶液编号点击事件
+				this.currentTableKey = col.prop;
+				this.currentType = type;
+				this.currentRowIndex = rowIndex;
+				this.currentTableIndex = tableRowIndex;
+				this.currentRowData = rowData;
+				this.$refs.selectReagentDialogRef.show(this.formData.id);
+			}
+		},
+		//form表单点击事件
+		handleClickable(type, rowIndex, item) {
+			if (this.fillType === "preFill") {
+				return;
+			}
+			console.log(type, rowIndex, item, "handle")
+			const { subKey = "" } = item;
+			if (subKey === "subStartSolution" || subKey === "subSolution") {//起始源溶液点击事件
+				this.$refs.selectReagentDialogRef.show(this.formData.id)
+				this.currentSubKey = subKey;
+				this.currentType = type;
+				this.currentRowIndex = rowIndex;
+			}
+		},
+		//选择试剂提交事件
+		onSelectReagentSubmit(code, row) {
+			const { currentSubKey, currentTableKey, currentRowIndex, currentTableIndex } = this;
+			if (currentSubKey) {
+				const ref = this.currentType === "ladder" ? "ladderStepFormPackageRef_" : "paralleStepFormPackageRef_"
+				const packageRef = this.$refs[`${ref}${this.currentRowIndex}`][0];
+				if (currentSubKey === "subStartSolution") {
+					packageRef.updateFormData("targetAcSolution", row.nd);
+					packageRef.onValueChangeCompareTo("targetAcSolution", row.nd, "targetStartSolution");
+					this.updateTableNd(row);
+				}
+				packageRef.updateFormData(currentSubKey, code);
+				this.currentSubKey = "";
+			} else if (currentTableKey === "actStartSolutionCode") {//实际原始溶液编号点击事件
+				const tableRef = this.$refs[`paralleStepTableRef_${currentRowIndex}`][0];
+				if (tableRef) {
+					const { actVol, actNd } = this.updateSjmbrynd(this.currentRowData, row.nd);
+					tableRef.updateDataSourceByRowIndex(currentTableIndex, {
+						actStartSolutionCode: code,
+						targetAcSolution: row.nd,
+						actSolutionVolume: actVol,
+						actSolutionConcentration: actNd,
+					})
+
+				}
+			}
+			this.$refs.selectReagentDialogRef.onCancel();
+		},
+		updateRecord() {
+			this.$nextTick(() => {
+				EventBus.$emit('onModifyRecord', {
+					type: "fieldChanged",
+					newRecord: null,
+					resourceList: null,
+				},)
+			})
+		},
+		//选择实际的时候更新table的浓度
+		updateTableNd(row) {
+			const { stepTableFormData = [] } = this.$refs[`ladderStepTableRef_${this.currentRowIndex}`][0].getFilledFormData();
+			const newData = JSON.parse(JSON.stringify(stepTableFormData));
+			// 遍历数据，按要求更新起始溶液编号
+			newData.forEach((item, index) => {
+				const { actVol, actNd } = this.updateSjmbrynd(item, row.nd);
+				console.log(actNd, "actNd")
+				item.actSolutionVolume = actVol;
+				item.actSolutionConcentration = actNd;
+				const o = {
+					actSolutionVolume: actVol,
+					actSolutionConcentration: actNd,
+				}
+				// 更新stepTableRef组件的数据
+				this.$refs[`ladderStepTableRef_${this.currentRowIndex}`][0].updateDataSourceByRowIndex(index, o);
+			})
+		},
+		//只做校验
+		async validFields() {
+			// 构建需要验证的引用数组
+			let refsToValidate = ["baseInfoRef", "storageConditionRef", "remarkRef"];
+
+			// 添加阶梯配制相关的引用
+			if (this.formData.ladderConfigs && this.formData.ladderConfigs.length > 0) {
+				for (let i = 0; i < this.formData.ladderConfigs.length; i++) {
+					refsToValidate.push(`ladderStepFormPackageRef_${i}`);
+					refsToValidate.push(`ladderStepTableRef_${i}`);
+					refsToValidate.push(`ladderStepRef_${i}`);
+				}
+			}
+
+			// 添加平行配制相关的引用
+			if (this.formData.paralleConfigs && this.formData.paralleConfigs.length > 0) {
+				for (let i = 0; i < this.formData.paralleConfigs.length; i++) {
+					refsToValidate.push(`paralleStepFormPackageRef_${i}`);
+					refsToValidate.push(`paralleStepTableRef_${i}`);
+					refsToValidate.push(`paralleStepRef_${i}`);
+				}
+			}
+			return await this.validFormFields(refsToValidate);
+		},
+		getFilledFormData() {
+			const baseData = this.$refs.baseInfoRef.getFilledFormData();
+			const conditionData = this.$refs.storageConditionRef.getFilledFormData();
+
+			// 获取所有阶梯配制数据
+			const ladderConfigsData = [];
+			if (this.formData.ladderConfigs && this.formData.ladderConfigs.length > 0) {
+				for (let i = 0; i < this.formData.ladderConfigs.length; i++) {
+					const ladderFormData = this.$refs[`ladderStepFormPackageRef_${i}`][0].getFilledFormData();
+					const ladderTableFormData = this.$refs[`ladderStepTableRef_${i}`][0].getFilledFormData();
+					const ladderStepData = this.$refs[`ladderStepRef_${i}`][0].getFilledFormData();
+
+					ladderConfigsData.push({
+						...ladderFormData,
+						...ladderTableFormData,
+						ladderStepData: ladderStepData.stepData,
+						showLadderConfig: true
+					});
+				}
+			}
+
+			// 获取所有平行配制数据
+			const paralleConfigsData = [];
+			if (this.formData.paralleConfigs && this.formData.paralleConfigs.length > 0) {
+				for (let i = 0; i < this.formData.paralleConfigs.length; i++) {
+					const paralleFormData = this.$refs[`paralleStepFormPackageRef_${i}`][0].getFilledFormData();
+					const paralleTableFormData = this.$refs[`paralleStepTableRef_${i}`][0].getFilledFormData();
+					const paralleStepData = this.$refs[`paralleStepRef_${i}`][0].getFilledFormData();
+
+					paralleConfigsData.push({
+						...paralleFormData,
+						...paralleTableFormData,
+						paralleStepData: paralleStepData.stepData,
+						showParalleConfig: true
+					});
+				}
+			}
+
+			const remarkData = this.$refs.remarkRef.getFilledFormData();
+			return {
+				...baseData,
+				...conditionData,
+				ladderConfigs: ladderConfigsData,
+				paralleConfigs: paralleConfigsData,
+				...remarkData
+			}
+		},
+		async getFormData() {
+			//先校验再获取值
+			const validFlag = await this.validFields();
+			if (!validFlag) {
+				return false;
+			}
+			let content = this.getFilledFormData();
+			//生成resource
+			let tmpResource = []
+			if (this.fillType === "actFill") {
+				//平行配置
+				if (content.ladderConfigs && content.ladderConfigs.length > 0) {
+					for (let i = 0; i < content.ladderConfigs.length; i++) {
+						let ladderConfigs = content.ladderConfigs[i]
+						let stepTableFormData = ladderConfigs.stepTableFormData
+						for (let j = 0; j < stepTableFormData.length; j++) {
+							//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+							const { total, unit } = addTj([stepTableFormData[j].actStartSolutionVolume, stepTableFormData[j].actDiluentVolume], [ladderConfigs.headerSelectFields.actStartSolutionVolumeUnit, ladderConfigs.headerSelectFields.actDiluentVolumeUnit])
+							tmpResource.push({
+								mc: null,
+								bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
+								ph: null,
+								ndz:stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+								nd: stepTableFormData[j].actSolutionConcentration,
+								nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+								ly: 'ELN配制',
+								sxrq: ladderConfigs.expireDate,
+								kc: total,
+								kcdw: unit,
+								syl: null,
+								syldw: unit,
+								yxzq: ladderConfigs.effectivePeriod,
+								yxzqdw: ladderConfigs.effectivePeriodUnit,
+							})
+							let fzsj = stepTableFormData[j].fzsj
+							if (fzsj && fzsj.fzList) {
+								for (let k = 0; k < fzsj.fzList.length; k++) {
+									tmpResource.push({
+										mc: null,
+										bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
+										ph: null,
+										nd: stepTableFormData[j].actSolutionConcentration,
+										nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+										ndz: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+										ly: 'ELN配制',
+										sxrq: ladderConfigs.expireDate,
+										kc: fzsj.fzList[k].num,
+										kcdw: fzsj.dw,
+										syl: null,
+										syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit,
+										yxzq: ladderConfigs.effectivePeriod,
+										yxzqdw: ladderConfigs.effectivePeriodUnit,
+									})
+								}
+							}
+						}
+					}
+				}
+				//阶梯配置
+				if (content.paralleConfigs && content.paralleConfigs.length > 0) {
+					for (let i = 0; i < content.paralleConfigs.length; i++) {
+						let paralleConfigs = content.paralleConfigs[i]
+						let stepTableFormData = paralleConfigs.stepTableFormData
+						for (let j = 0; j < stepTableFormData.length; j++) {
+							const { total, unit } = addTj([stepTableFormData[j].actSolutionVolume, stepTableFormData[j].actDiluentVolume], [paralleConfigs.headerSelectFields.actSolutionVolumeUnit, paralleConfigs.headerSelectFields.actDiluentVolumeUnit])
+							tmpResource.push({
+								mc: null,
+								bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
+								ph: null,
+								nd: stepTableFormData[j].actSolutionConcentration,
+								ndz: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+								nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+								ly: 'ELN配制',
+								sxrq: stepTableFormData[j].targetSolutionExpirationDate,
+								kc: total,
+								kcdw: unit,
+								syl: null,
+								syldw: unit,
+								yxzq: stepTableFormData[j].targetSolutionCycle,
+								yxzqdw: stepTableFormData[j].targetSolutionCyclePrecision,
+							})
+							let fzsj = stepTableFormData[j].fzsj
+							if (fzsj && fzsj.fzList) {
+								for (let k = 0; k < fzsj.fzList.length; k++) {
+									tmpResource.push({
+										mc: null,
+										bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
+										ph: null,
+										ndz: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+										nd: stepTableFormData[j].actSolutionConcentration,
+										nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+										ly: 'ELN配制',
+										sxrq: paralleConfigs.expireDate,
+										kc: fzsj.fzList[k].num,
+										kcdw: fzsj.dw,
+										syl: null,
+										syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit,
+										yxzq: paralleConfigs.effectivePeriod,
+										yxzqdw: paralleConfigs.effectivePeriodUnit,
+									})
+								}
+							}
+						}
+					}
+				}
+			}
+			this.resourceTmp = tmpResource
+			return content;
+		},
+		async onSave() {
+			const formData = await this.getFormData();
+			console.log(formData, "formData")
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.config-section {
+	margin-bottom: 20px;
+	padding: 15px;
+	border: 1px solid #ebeef5;
+	border-radius: 4px;
+	background-color: #fafafa;
+}
+
+.config-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 15px;
+	font-weight: bold;
+	font-size: 16px;
+	color: #303133;
+}
+
+.config-header .el-button {
+	color: #f56c6c;
+	font-size: 14px;
+}
+
+.config-header .el-button:hover {
+	color: #f78989;
+}
+
+.mt-0 {
+	margin-top: 0;
+}
+
+.s-container {
+	box-shadow: none !important;
+	padding: 24px 0 !important;
+}
+</style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index bf3ddf1..79b422b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
+       //  target: `http://localhost:8080`,
           target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {