From 3a5a226804587bbb6d9f48f0d786ad754b12b32a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ZHANGTENG=5C=E5=BC=A0=E8=85=BE?= <894697943@qq.com>
Date: Wed, 4 Mar 2026 20:04:12 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]D?=
 =?UTF-8?q?L001=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/template/comps/dl/DL003.vue      | 9 ++++-----
 src/views/business/comps/template/mixins/templateMixin.js | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/business/comps/template/comps/dl/DL003.vue b/src/views/business/comps/template/comps/dl/DL003.vue
index 92c18fc..ba0c5e3 100644
--- a/src/views/business/comps/template/comps/dl/DL003.vue
+++ b/src/views/business/comps/template/comps/dl/DL003.vue
@@ -374,7 +374,6 @@ export default {
     },
     // 点击按钮
     handleClickButton(_item, signData) {
-      console.log(this.refConf,888)
       this.$refs.czInfoRef.updateFormData(
         _item.subKey,
         moment().format('YYYY/MM/DD HH:mm'),
@@ -395,11 +394,11 @@ export default {
       return await this.validFormFields(refNames)
     },
     getResource() {
-      const stepResource = this.$refs.yqsyTableRef.getStepResource()
+      // const stepResource = this.$refs.yqsyTableRef.getStepResource()
       // 使用的试剂、仪器
-      this.resourceTmp = stepResource.sjResource || []
-      this.yqResourceTmp = stepResource.yqResource || []
-      return this.resourceTmp
+      // this.resourceTmp = stepResource.sjResource || []
+      // this.yqResourceTmp = stepResource.yqResource || []
+      // return this.resourceTmp
     },
     onRegentSubmit(e) {
       const { selectInfo, key, rowIndex } = e
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 39e6d69..755fe10 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -359,8 +359,10 @@ export default {
 		},
 		//统一校验form表单是否填写
 		async validFormFields(refArr = []) {
+			console.log(refArr,2121)
 			let result = {}
 			const refs = refArr.map((ref) => {
+				console.log(ref,312312321)
 				let refData = {}
 				if (this.$refs[ref][0]) {
 					refData = this.$refs[ref][0]?.getFormData() || {}

From 1b01114ffb96127171313268cb4e7d9ba724b1d0 Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Thu, 5 Mar 2026 10:46:44 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E4=BE=9B=E8=AF=95=E5=93=81=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95]=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/pcr/PCR010.vue   | 371 +++++++++++++++++++++
 src/views/business/resource/gsp/comps/rkjl/Bj.vue  |  23 +-
 src/views/business/resource/gsp/comps/rkjl/Xq.vue  |   5 +-
 src/views/business/resource/gsp/comps/rkjl/Xz.vue  |   6 +-
 src/views/business/resource/gsp/comps/rkjlList.vue |   5 +-
 5 files changed, 385 insertions(+), 25 deletions(-)
 create mode 100644 src/views/business/comps/template/comps/pcr/PCR010.vue

diff --git a/src/views/business/comps/template/comps/pcr/PCR010.vue b/src/views/business/comps/template/comps/pcr/PCR010.vue
new file mode 100644
index 0000000..bafd71e
--- /dev/null
+++ b/src/views/business/comps/template/comps/pcr/PCR010.vue
@@ -0,0 +1,371 @@
+<!-- PCR分析组织匀浆表-知组织重 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img
+					src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+
+					<LineLabel label="template.common.operationSteps" />
+					<div class="template-form-item">
+						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef"
+							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
+						<div v-if="fillType == 'preFill'">
+							<el-button type="primary" @click="downloadExcelTemplate">{{
+								$t('template.common.downloadTemplate') }}</el-button>
+							<el-button type="primary" @click="showImportExcelDialog">{{
+								$t('template.common.importTemplate')
+							}}</el-button>
+						</div>
+
+						<CustomTable @blur="onHandleTableBlur" @headerSelectChange="onHandleTableBlur"
+							:ref="`stepTableRef`" :columns="tableStepColumns" :formData="formData" :prefixKey="`table`"
+							:showOperation="fillType === 'preFill'" fieldItemLabel="template.common.operationSteps">
+							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
+									@deleteRow="(rowIndex) => deleteRow(rowIndex)"></TableOpertaion>
+							</template>
+						</CustomTable>
+					</div>
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
+
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" />
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin.js";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import { isValueEmpty } from '@/utils/index';
+import { getLatestSnArr } from '@/api/template';
+import { EventBus } from "@/utils/eventBus";
+import { volumeConverter } from "@/utils/volConverter";//体积单位转换
+import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
+import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
+import { getPCR009Config } from "../../formConfig/PCRTableConfig.js";
+import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
+import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
+import ImportExcelDialog from '../../dialog/ImportExcelDialog'
+export default {
+	name: "PCR005",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog, ImportExcelDialog },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		tableStepColumns() {
+			return getPCR009Config(this);
+		},
+		// 附件表单配置
+		getFjFormConfig() {
+			return [
+				{
+					type: "attachment",
+					config: {
+						attTitle: {
+							label: 'template.pcr.pcr005.fj',
+							type: "attachment",
+							fillType: "actFill",
+						},
+					}
+				}
+			]
+		},
+		// 配置条件
+		storageFormConfig() {
+			return [
+				{
+					type: "conditionItem",
+					config: {
+						storageCondition: {
+							label: 'template.common.storageConditionLabel',
+							type: "select",
+							fillType: "preFill",
+							options: this.getDictOptions("business_cctj"),
+							otherCode: "storageConditionOther",
+						},
+					}
+				}
+			];
+		},
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "conditionItem",
+					label: 'template.common.processCondition',
+					config: {
+						pre: {
+							label: 'template.common.preFill',
+							type: "select",
+							multiple: true,
+							fillType: "preFill",
+							options: this.getDictOptions('business_pztj'),
+							otherCode: "preOther",
+						},
+						act: {
+							label: 'template.common.actualFill',
+							type: "select",
+							fillType: "actFill",
+							otherCode: "actOther",
+							multiple: true,
+							compareTo: "pre",
+							options: this.getDictOptions('business_pztj')
+						}
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.pcr.pcr009.clsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 操作步骤表单配置
+		stepFormConfig() {
+			return [
+				{
+					type: 'step',
+					config: {
+						yjry: {
+							label: 'template.pcr.pcr009.yjry',
+							type: 'input',
+							fillType: 'preFill',
+							subType: 'sj',
+							subKey: 'yjrybh',
+							subFillType: 'actFill',
+							maxlength: 20
+						},
+						bs: {
+							label: 'template.pcr.pcr009.bs',
+							type: 'inputNumber',
+							fillType: 'actFill',
+							maxlength: 20
+						},
+						yjyjry: {
+							label: 'template.pcr.pcr009.yjyjry',
+							type: 'inputNumber',
+							fillType: 'preFill',
+							subType: 'select',
+							subKey: 'yjyjryUnit',
+							subOptions: this.getDictOptions('business_tjdw'),
+							subFillType: 'preFill',
+							maxlength: 20
+						},
+					}
+				}
+			]
+		},
+	},
+	data() {
+		return {
+			reagentType: null, // 1-表单 2-表格
+			formData: {},
+			currentSubKey: "",//当前点击的子项key
+			currentType: "",//当前点击的类型
+			currentRowIndex: "",//当前点击的行索引
+		};
+	},
+	mounted() {
+		const formData = this.getFormDataByTemplateData();
+		this.onHandleTableBlur()
+	},
+	methods: {
+		downloadExcelTemplate() {
+			this.exportExcel(['样品名称', '组织重'], 'PCR分析组织匀浆表-知组织重导入模板')
+		},
+		//选择试剂提交事件
+		onSelectReagentSubmit(code, row) {
+
+		},
+		showImportExcelDialog() {
+			this.$refs.ImportExcelDialog.show()
+		},
+		onLoadExcelData(excelData) {
+			excelData.shift()
+			let list = []
+			excelData.forEach(item => {
+				list.push({
+					ypmc: item[0],
+					zzz: item[1],
+					targetStartSolutionVolumePrecision: 3
+				})
+			})
+			this.$refs.stepTableRef.addRows(list)
+			this.$refs.ImportExcelDialog.cancel()
+
+			setTimeout(() => {
+				this.justUpdateFilledFormData();
+			}, 100);
+		},
+		// 失去焦点，计算
+		onHandleTableBlur() {
+			this.updateTable()
+		},
+		onHandleBlur(fields) {
+			this.updateTable()
+		},
+		// 计算表格 预设匀浆溶液补加入量
+		updateTable() {
+			let content = this.getFilledFormData();
+
+			let bs = content.bs
+			content
+			if (this.fillType === "actFill") {
+				let tableList = content.stepTableFormData
+				if (tableList && tableList.length > 0) {
+					for (let i = 0; i < tableList.length; i++) {
+						let item = tableList[i]
+						let zzz = item.zzz * bs
+						// 组织重量 乘以 倍数 ）减去 已加匀浆溶液
+						const { total, unit } = subTj([zzz, content.yjyjry], [content.headerSelectFields.zzzUnit, content.yjyjryUnit])
+						let ysyjrybjrl = volumeConverter.convert(total + unit, content.headerSelectFields.ysyjrybjrlUnit)
+						tableList[i].ysyjrybjrl = ysyjrybjrl
+					}
+				}
+				this.$refs.stepTableRef.updateDataSource(tableList);
+			}
+		},
+		//获取已填写的表单数据
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"])
+		},
+		async getFormData() {
+			let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
+
+			//生成resource
+			let tmpResource = []
+			if (this.fillType === "actFill") {
+				let tableList = content.stepTableFormData
+				if (tableList && tableList.length > 0) {
+					for (let i = 0; i < tableList.length; i++) {
+						//配置的试剂
+						let item = tableList[i]
+						console.log('表格item:' + JSON.stringify(item))
+
+						//使用的
+
+						tmpResource.push({
+							mc: null,
+							bh: content.subSolution,
+							ph: null,
+							ndz: null,
+							nd: null,
+							nddw: null,
+							ly: 'ELN配制',
+							sxrq: null,
+							kc: null,
+							kcdw: null,
+							syl: item.ysxsyxytj,
+							type: 1,
+							elnType: this.product,
+							syldw: content.headerSelectFields.sjxsyxytjUnit,
+							yxzq: null,
+							yxzqdw: null,
+						})
+
+					}
+				}
+			}
+			if (tmpResource.length > 0) {
+				tmpResource = uniqeResourceOne(tmpResource)
+			}
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			let content = this.$refs.stepRef.getStepResource();
+			console.log(content);
+
+		},
+		// 删除表格行
+		deleteRow(rowIndex) {
+			const stepTableRef = this.$refs['stepTableRef'];
+			if (stepTableRef) {
+				stepTableRef.deleteRow(rowIndex);
+			}
+		},
+
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
index aecdb21..9a9f254 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Bj.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
@@ -3,7 +3,6 @@
     <!-- 编辑弹窗 -->
     <el-dialog :title="$t('form.edit')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <div class="sbzdtcma"> <input type="text"> <input  type="password" show-password> </div>
         <el-row>
           <!-- 名称 -->
           <el-col :span="12">
@@ -20,16 +19,16 @@
         </el-row>
         <el-row>
           <!-- 规格 -->
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
               <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
           <!-- 规格单位 -->
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <BusinessSelect v-model="form.ggdw"
               dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
-          </el-col>
+          </el-col> -->
           <!-- 入库时间 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.rksj')" prop="rksj">
@@ -204,20 +203,10 @@ export default {
     show(row) {
       this.reset()
       info({id: row.id}).then(response => {
-        this.form.id = response.data.id
-        this.form.mc = response.data.mc
-        this.form.ph = response.data.ph
-        this.form.gg = response.data.gg
-        this.form.ggdw = response.data.ggdw
-        this.form.rkl = response.data.rkl
-        this.form.rkdw = response.data.rkdw
-        this.form.rksj = response.data.rksj
-        this.form.cctj = response.data.cctj
-        this.form.zysx = response.data.zysx
-        this.form.qmyy = '编辑供试品入库记录'
-        console.log(this.form)
-        this.open = true
+        this.form = response.data
 
+        this.form.qmyy = this.$t('page.business.resource.gsp.bjgsprkjl'),
+        this.open = true
       })
     },
     save() {
diff --git a/src/views/business/resource/gsp/comps/rkjl/Xq.vue b/src/views/business/resource/gsp/comps/rkjl/Xq.vue
index a4b1568..c9f0c9b 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Xq.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Xq.vue
@@ -25,15 +25,14 @@
             <el-input type="text" :value="form.mc" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="left-title">{{ $t('page.business.resource.gsp.ph') }}</div>
+            <div class="right-title">{{ $t('page.business.resource.gsp.ph') }}</div>
             <el-input type="text" :value="form.ph" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="right-title">{{ $t('page.business.resource.gsp.gg') }}</div>
+            <div class="left-title">{{ $t('page.business.resource.gsp.gg') }}</div>
             <el-input type="text" :value="form.gg" maxlength="50" disabled>
-              <template slot="append">{{ form.ggdw }}</template>
             </el-input>
           </div>
           <div class="right">
diff --git a/src/views/business/resource/gsp/comps/rkjl/Xz.vue b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
index 0f4eb5c..fbca554 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Xz.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
@@ -20,16 +20,16 @@
         </el-row>
         <el-row>
           <!-- 规格 -->
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
               <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
           <!-- 规格单位 -->
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <BusinessSelect v-model="form.ggdw"
               dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
-          </el-col>
+          </el-col> -->
           <!-- 入库时间 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.rksj')" prop="rksj">
diff --git a/src/views/business/resource/gsp/comps/rkjlList.vue b/src/views/business/resource/gsp/comps/rkjlList.vue
index 6044664..7d7e69f 100644
--- a/src/views/business/resource/gsp/comps/rkjlList.vue
+++ b/src/views/business/resource/gsp/comps/rkjlList.vue
@@ -92,7 +92,8 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.gsp.gg')" align="center">
             <template slot-scope="scope">
-              {{ scope.row.gg }} {{ scope.row.ggdw }}
+              {{ scope.row.gg }}
+              <!-- {{ scope.row.ggdw }} -->
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gsp.rksj')" align="center" prop="rksj" width="150px"
@@ -303,7 +304,7 @@ export default {
             '&nbsp;' + value.ph +
             '</td>' +
             ' <td>' +
-            value.gg + value.ggdw +
+            value.gg +
             '</td>' +
             ' <td>' +
             value.rksj +

From 438d5395765d8b5053435175320afc6c1d09c450 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 5 Mar 2026 11:12:16 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]G?=
 =?UTF-8?q?PS002?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/template/comps/gsp/GSP002.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/business/comps/template/comps/gsp/GSP002.vue b/src/views/business/comps/template/comps/gsp/GSP002.vue
index 6ce5379..925098f 100644
--- a/src/views/business/comps/template/comps/gsp/GSP002.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP002.vue
@@ -269,7 +269,7 @@ export default {
 					headerSelectKey: 'actSolutionConcentrationUnit',
 					fillType: 'preFill',
 					headerOptions: this.getDictOptions('business_nddw'),
-					bodyDisabled: true,
+					bodyDisabled: this.fillType !== 'actFill',
 					bodyType: 'inputNumber',
 					bodySubType: 'inputNumber',
 					bodySubKey: 'actSolutionConcentrationPrecision',
@@ -302,7 +302,7 @@ export default {
 					headerSelectKey: 'actSolutionVolumeUnit',
 					fillType: 'preFill',
 					headerOptions: this.getDictOptions('business_tjdw'),
-					bodyDisabled: true,
+					bodyDisabled: this.fillType !== 'actFill',
 					bodyType: 'inputNumber',
 					bodySubType: 'inputNumber',
 					bodySubKey: 'actSolutionVolumePrecision',
@@ -374,7 +374,7 @@ export default {
 					showWidth: 120,
 					bodyType: 'inputNumber',
 					bodyFillType: 'actFill',
-					bodyDisabled: true,
+					bodyDisabled: this.fillType !== 'actFill',
 					compareTo: 'targetStartSolutionConcentration', //比较哪个字段
 				},
 				{
@@ -383,7 +383,7 @@ export default {
 					headerSelectKey: 'targetStartSolutionVolumeUnit',
 					fillType: 'preFill',
 					headerOptions: this.getDictOptions('business_tjdw'),
-					width: 280,
+					width: 360,
 					showWidth: 120,
 					bodyType: 'inputNumber',
 					bodyFillType: 'preFill',
@@ -394,8 +394,7 @@ export default {
 					bodyPrecisionKey: 'targetStartSolutionVolumePrecision',
 					bodyMaxlength: 10,
 					bodySubPlaceholder: 'template.common.xswsPlaceholder',
-					bodyDisabled: true,
-					showBodySub: true,
+					bodyDisabled: this.fillType !== 'preFill',
 					showBodySub: this.fillType === 'preFill',
 					headerSelectTo: "actStartSolutionVolumeUnit",
 				},
@@ -421,7 +420,7 @@ export default {
 					headerSelectKey: 'preDiluentVolumeUnit',
 					fillType: 'preFill',
 					headerOptions: this.getDictOptions('business_tjdw'),
-					width: 280,
+					width: 340,
 					showWidth: 120,
 					bodyType: 'inputNumber',
 					bodyFillType: 'preFill',
@@ -431,7 +430,7 @@ export default {
 					bodyMaxlength: 10,
 					bodyPrecisionKey: 'targetDiluentVolumePrecision',
 					bodySubPlaceholder: 'template.common.xswsPlaceholder',
-					bodyDisabled: true,
+					bodyDisabled: this.fillType !== 'preFill',
 					showBodySub: this.fillType === 'preFill',
 					headerSelectTo: "actDiluentVolumeUnit",
 				},
@@ -725,6 +724,7 @@ export default {
 			const { selectInfo, key } = data;
 			const { row } = selectInfo;
 			if (key) {
+				debugger
 				const packageRef = this.$refs[`paralleStepFormPackageRef_${rowIndex}`][0];
 				if (key === "subStartSolution") {
 					packageRef.updateFormData("targetAcSolution", row.nd);

From c9910a1990af77a86bb294e4a00ca794eb26e402 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 5 Mar 2026 13:43:31 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=E4=BE=9B=E8=AF=95=E5=93=81002?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/gsp/GSP002.vue   | 112 ++++++---------------
 1 file changed, 29 insertions(+), 83 deletions(-)

diff --git a/src/views/business/comps/template/comps/gsp/GSP002.vue b/src/views/business/comps/template/comps/gsp/GSP002.vue
index 925098f..3f79e3d 100644
--- a/src/views/business/comps/template/comps/gsp/GSP002.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP002.vue
@@ -8,18 +8,18 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					
-					<TableList label="template.common.gspsywzInfo" :columns="gspColumns" :dataSource="resourceGsp" v-if="sn!='GSP002'"/>
+
+					<TableList label="template.common.gspsywzInfo" :columns="gspColumns" :dataSource="resourceGsp"
+						v-if="sn != 'GSP002'" />
 					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
-					<LineLabel v-if="sn=='GSP002'" label="template.common.operationSteps" />
-					<LineLabel v-if="sn=='GSP006'" label="template.gsp.GSP002.cbybdpz" />
-					<LineLabel v-if="sn=='GSP008'" label="template.gsp.GSP002.zlkz" />
-					<LineLabel v-if="sn=='GSP012'" label="template.gsp.GSP002.cbywdx" />
-					<LineLabel v-if="sn=='GSP013'" label="template.gsp.GSP002.lmd" />
-					<LineLabel v-if="sn=='GSP014'" label="template.gsp.GSP002.clhwdx" />
-					<!-- 平行配制区域 -->
+					<LineLabel v-if="sn == 'GSP002'" label="template.common.operationSteps" />
+					<LineLabel v-if="sn == 'GSP006'" label="template.gsp.GSP002.cbybdpz" />
+					<LineLabel v-if="sn == 'GSP008'" label="template.gsp.GSP002.zlkz" />
+					<LineLabel v-if="sn == 'GSP012'" label="template.gsp.GSP002.cbywdx" />
+					<LineLabel v-if="sn == 'GSP013'" label="template.gsp.GSP002.lmd" />
+					<LineLabel v-if="sn == 'GSP014'" label="template.gsp.GSP002.clhwdx" />
 					<div :label="$t('template.common.pxpz')"
 						v-for="(paralleConfig, paralleIndex) in formData.paralleConfigs"
 						:key="'paralle_' + paralleIndex">
@@ -624,25 +624,7 @@ export default {
 				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);
 		},
@@ -661,11 +643,9 @@ export default {
 				tableRef[0].deleteRow(rowIndex);
 			}
 		},
-
 		// 表格失去焦点事件
 		onHandleTableBlur(type, configIndex, e) {
 			const { colKey = "", item, rowIndex } = e;
-			debugger
 			if (colKey === "targetStartSolutionConcentration" || colKey === "targetSolutionVolume" || colKey === "targetSolutionConcentration" || colKey === "targetStartSolutionVolumePrecision" || colKey === "targetDiluentVolumePrecision") {
 				if (type === "paralle") {
 					const volumne = item.targetStartSolutionConcentration || 0;
@@ -677,7 +657,15 @@ export default {
 				if (type === "paralle") {
 					const targetAcSolution = item.targetAcSolution || 0;//获取实际起始溶液浓度
 					if (targetAcSolution) {
-						const volResult = this.updateSjmbrynd(item, targetAcSolution);
+						const tableRef = this.$refs[`paralleStepTableRef_${configIndex}`][0];
+						//实际起始溶液体积和实际目标溶液体积
+						const formData = tableRef.getFilledFormData();
+						const headerSelectFields = formData.headerSelectFields;
+						const p = {
+							targetStartSolutionUnit: rowData.targetStartSolutionConcentrationPrecision,
+							headerSelectFields
+						}
+						const volResult = this.updateSjmbrynd(item, targetAcSolution,p);
 						if (!volResult) {
 							return
 						}
@@ -696,14 +684,21 @@ export default {
 				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 		},
-		//平行配置 table选择试剂确定弹窗
+		// table选择试剂确定弹窗
 		onTableRegentSubmit(type, configIndex, data) {
 			const { selectInfo, rowIndex, key, rowData } = data;
 			const { row, selectedId } = selectInfo;
 			if (key === "actStartSolutionCode") {//实际原始溶液编号点击事件
 				const tableRef = this.$refs[`paralleStepTableRef_${configIndex}`][0];
+				//实际起始溶液体积和实际目标溶液体积
+				const formData = tableRef.getFilledFormData();
+				const headerSelectFields = formData.headerSelectFields;
+				const p = {
+					targetStartSolutionUnit: rowData.targetStartSolutionConcentrationPrecision,
+					headerSelectFields
+				}
 				if (tableRef) {
-					const volResult = this.updateSjmbrynd(rowData, row.nd);
+					const volResult = this.updateSjmbrynd(rowData, row.nd, p);
 					//第一次选择溶液的时候，可能其他值没填入，就需要先把浓度和code一起更新
 					tableRef.updateDataSourceByRowIndex(rowIndex, {
 						actStartSolutionCode: selectedId,
@@ -719,54 +714,6 @@ export default {
 				}
 			}
 		},
-		//选择试剂提交事件
-		onRegentSubmit(type, rowIndex, data) {
-			const { selectInfo, key } = data;
-			const { row } = selectInfo;
-			if (key) {
-				debugger
-				const packageRef = this.$refs[`paralleStepFormPackageRef_${rowIndex}`][0];
-				if (key === "subStartSolution") {
-					packageRef.updateFormData("targetAcSolution", row.nd);
-					packageRef.onValueChangeCompareTo("targetAcSolution", row.nd, "targetStartSolution");
-					this.updateTableNd(row, rowIndex);
-				}
-			}
-		},
-		updateRecord() {
-			this.$nextTick(() => {
-				EventBus.$emit('onModifyRecord', {
-					type: "fieldChanged",
-					newRecord: null,
-					resourceList: null,
-				},)
-			})
-		},
-		//选择实际的时候更新table的浓度
-		updateTableNd(row, rowIndex) {
-			const { stepTableFormData = [] } = this.$refs[`ladderStepTableRef_${rowIndex}`][0].getFilledFormData();
-			const newData = JSON.parse(JSON.stringify(stepTableFormData));
-			// 遍历数据，按要求更新起始溶液编号
-			newData.forEach((item, index) => {
-				let initNd = row.nd;//起始浓度是上一条记录的实际目标溶液浓度
-				if (index === 0) {
-					item.startSolutionCode = row.bh;
-				} else {
-					item.startSolutionCode = newData[index - 1].targetSolutionCode + newData[index - 1].subTargetSolutionCode;
-					initNd = newData[i - 1].actSolutionConcentration;
-				}
-				const volResult = this.updateSjmbrynd(item, initNd);
-				if (!volResult) {
-					return
-				}
-
-				item.actSolutionVolume = volResult.actVol;
-				item.actSolutionConcentration = volResult.actNd;
-				// 更新stepTableRef组件的数据
-			})
-			this.$refs[`ladderStepTableRef_${rowIndex}`][0].updateDataSource(newData);
-
-		},
 		//只做校验
 		async validFields() {
 			// 构建需要验证的引用数组
@@ -792,7 +739,6 @@ export default {
 					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,
@@ -838,7 +784,7 @@ export default {
 			//生成resource
 			let tmpResource = []
 			if (this.fillType === "actFill") {
-				//平行配置
+				//
 				if (content.paralleConfigs && content.paralleConfigs.length > 0) {
 					for (let i = 0; i < content.paralleConfigs.length; i++) {
 						let paralleConfigs = content.paralleConfigs[i]

From 6698971b5532bf446e9e681e5ccc83228af4026f Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 5 Mar 2026 14:38:46 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]G?=
 =?UTF-8?q?SP002?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/gsp/GSP002.vue     | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/views/business/comps/template/comps/gsp/GSP002.vue b/src/views/business/comps/template/comps/gsp/GSP002.vue
index 3f79e3d..a0f8c10 100644
--- a/src/views/business/comps/template/comps/gsp/GSP002.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP002.vue
@@ -662,7 +662,7 @@ export default {
 						const formData = tableRef.getFilledFormData();
 						const headerSelectFields = formData.headerSelectFields;
 						const p = {
-							targetStartSolutionUnit: rowData.targetStartSolutionConcentrationPrecision,
+							targetStartSolutionUnit: formData.stepTableFormData[configIndex].targetStartSolutionConcentrationPrecision,
 							headerSelectFields
 						}
 						const volResult = this.updateSjmbrynd(item, targetAcSolution,p);
@@ -855,6 +855,24 @@ export default {
 								yxzq: null,
 								yxzqdw: null,
 							})
+							//原始溶液 
+							tmpResource.push({
+								mc: null,
+								bh: stepTableFormData[j].actStartSolutionCode,
+								ph: null,
+								nd: null,
+								nddw: null,
+								ndz: null,
+								ly: null,
+								sxrq: null,
+								kc: null,
+								kcdw: null,
+								type: 1,
+								syl: stepTableFormData[j].actStartSolutionVolume,
+								syldw: paralleConfigs.headerSelectFields.actStartSolutionVolumeUnit,
+								yxzq: null,
+								yxzqdw: null,
+							})
 						}
 					}
 				}

From 734e974e22b7f0be45f7fa459ef06dbb766cf333 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 5 Mar 2026 15:12:20 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/gsp/GSP003.vue   |   1 +
 .../business/comps/template/comps/gsp/GSP004.vue   | 148 ++++++++-------------
 2 files changed, 55 insertions(+), 94 deletions(-)

diff --git a/src/views/business/comps/template/comps/gsp/GSP003.vue b/src/views/business/comps/template/comps/gsp/GSP003.vue
index 2c1e59b..97a4284 100644
--- a/src/views/business/comps/template/comps/gsp/GSP003.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP003.vue
@@ -12,6 +12,7 @@
 					<!-- 基本信息 -->
 					<TableList label="template.common.gspsywzInfo" :columns="gspColumns" :dataSource="resourceGsp" />
 					<TableList label="template.common.sjInfo" :columns="sjColumns" :dataSource="resourceSj" />
+					<!-- <TableList label="template.common.gyzjInfo" :columns="gyzjColumns" :dataSource="resourceGyzj" /> -->
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<!-- 存储条件 -->
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
diff --git a/src/views/business/comps/template/comps/gsp/GSP004.vue b/src/views/business/comps/template/comps/gsp/GSP004.vue
index af9fecf..5b09354 100644
--- a/src/views/business/comps/template/comps/gsp/GSP004.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP004.vue
@@ -1,4 +1,4 @@
-<!-- 试验物质配制记录表（平行稀释） -->
+<!-- 试剂配制记录表（平行稀释） -->
 <template>
 	<div>
 		<div class="detail-container">
@@ -16,19 +16,18 @@
 						label="template.gsp.GSP003.calcConditionLabel" ref="calcConditionRef"
 						:formConfig="calcFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
-					<!-- 平行配制区域 -->
 					<div :label="$t('template.common.pxpz')"
 						v-for="(paralleConfig, paralleIndex) in formData.paralleConfigs"
 						:key="'paralle_' + paralleIndex">
 
 						<div class="template-form-item">
-							<div class="config-header-right">
+							<!-- <div class="config-header-right">
 								<el-button type="primary" v-if="fillType === 'preFill'" @click="handleAddParalle">{{
 									$t('template.common.addBtn') }}</el-button>
 								<el-button v-if="fillType === 'preFill' && formData.paralleConfigs.length > 1"
 									type="danger" @click="deleteParalleConfig(paralleIndex)">{{
 										$t('template.common.deleteBtn') }}</el-button>
-							</div>
+							</div> -->
 							<BaseInfoFormPackage @clickable="(e) => handleClickable('paralle', paralleIndex, e)"
 								:ref="`paralleStepFormPackageRef_${paralleIndex}`" :formConfig="paralleStepFormConfig"
 								:formData="paralleConfig" :prefixKey="'paralle' + paralleIndex"
@@ -80,7 +79,7 @@ import { isCommonUnit } from "@/utils/conTools";
 import moment from "moment";
 import { addTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
 export default {
-	name: "GSP004",
+	name: "GSP002",
 	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, SelectReagentDialog, TableOpertaion },
 	mixins: [templateMixin],
 	props: {
@@ -230,12 +229,10 @@ export default {
 						sfxyzjfx: {
 							label: 'template.gsp.GSP003.sfxyzjfx',
 							type: "select",
-							with:'100%',
-							span:1,
 							fillType: "actFill",
 							options: [
-								{label:'是',value:'是'},
-								{label:'否',value:'否'}
+								{ label: '是', value: '是' },
+								{ label: '否', value: '否' }
 							]
 						},
 						solution: {
@@ -294,7 +291,7 @@ export default {
 					headerSelectKey: 'actSolutionConcentrationUnit',
 					fillType: 'preFill',
 					headerOptions: this.getDictOptions('business_nddw'),
-					bodyDisabled: true,
+					bodyDisabled: this.fillType !== 'actFill',
 					bodyType: 'inputNumber',
 					bodySubType: 'inputNumber',
 					bodySubKey: 'actSolutionConcentrationPrecision',
@@ -327,7 +324,7 @@ export default {
 					headerSelectKey: 'actSolutionVolumeUnit',
 					fillType: 'preFill',
 					headerOptions: this.getDictOptions('business_tjdw'),
-					bodyDisabled: true,
+					bodyDisabled: this.fillType !== 'actFill',
 					bodyType: 'inputNumber',
 					bodySubType: 'inputNumber',
 					bodySubKey: 'actSolutionVolumePrecision',
@@ -342,7 +339,7 @@ export default {
 				{
 					label: 'template.sp.sp00456.mbryyxzq',
 					prop: 'targetSolutionCycle',
-					width: 280,
+					width: 360,
 					showWidth: 160,
 					fillType: 'preFill',
 					bodyType: 'inputNumber',
@@ -399,7 +396,7 @@ export default {
 					showWidth: 120,
 					bodyType: 'inputNumber',
 					bodyFillType: 'actFill',
-					bodyDisabled: true,
+					bodyDisabled: this.fillType !== 'actFill',
 					compareTo: 'targetStartSolutionConcentration', //比较哪个字段
 				},
 				{
@@ -408,7 +405,7 @@ export default {
 					headerSelectKey: 'targetStartSolutionVolumeUnit',
 					fillType: 'preFill',
 					headerOptions: this.getDictOptions('business_tjdw'),
-					width: 280,
+					width: 360,
 					showWidth: 120,
 					bodyType: 'inputNumber',
 					bodyFillType: 'preFill',
@@ -419,8 +416,7 @@ export default {
 					bodyPrecisionKey: 'targetStartSolutionVolumePrecision',
 					bodyMaxlength: 10,
 					bodySubPlaceholder: 'template.common.xswsPlaceholder',
-					bodyDisabled: true,
-					showBodySub: true,
+					bodyDisabled: this.fillType !== 'preFill',
 					showBodySub: this.fillType === 'preFill',
 					headerSelectTo: "actStartSolutionVolumeUnit",
 				},
@@ -446,7 +442,7 @@ export default {
 					headerSelectKey: 'preDiluentVolumeUnit',
 					fillType: 'preFill',
 					headerOptions: this.getDictOptions('business_tjdw'),
-					width: 280,
+					width: 340,
 					showWidth: 120,
 					bodyType: 'inputNumber',
 					bodyFillType: 'preFill',
@@ -456,7 +452,7 @@ export default {
 					bodyMaxlength: 10,
 					bodyPrecisionKey: 'targetDiluentVolumePrecision',
 					bodySubPlaceholder: 'template.common.xswsPlaceholder',
-					bodyDisabled: true,
+					bodyDisabled: this.fillType !== 'preFill',
 					showBodySub: this.fillType === 'preFill',
 					headerSelectTo: "actDiluentVolumeUnit",
 				},
@@ -650,25 +646,7 @@ export default {
 				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);
 		},
@@ -687,11 +665,9 @@ export default {
 				tableRef[0].deleteRow(rowIndex);
 			}
 		},
-
 		// 表格失去焦点事件
 		onHandleTableBlur(type, configIndex, e) {
 			const { colKey = "", item, rowIndex } = e;
-			debugger
 			if (colKey === "targetStartSolutionConcentration" || colKey === "targetSolutionVolume" || colKey === "targetSolutionConcentration" || colKey === "targetStartSolutionVolumePrecision" || colKey === "targetDiluentVolumePrecision") {
 				if (type === "paralle") {
 					const volumne = item.targetStartSolutionConcentration || 0;
@@ -703,7 +679,15 @@ export default {
 				if (type === "paralle") {
 					const targetAcSolution = item.targetAcSolution || 0;//获取实际起始溶液浓度
 					if (targetAcSolution) {
-						const volResult = this.updateSjmbrynd(item, targetAcSolution);
+						const tableRef = this.$refs[`paralleStepTableRef_${configIndex}`][0];
+						//实际起始溶液体积和实际目标溶液体积
+						const formData = tableRef.getFilledFormData();
+						const headerSelectFields = formData.headerSelectFields;
+						const p = {
+							targetStartSolutionUnit: formData.stepTableFormData[configIndex].targetStartSolutionConcentrationPrecision,
+							headerSelectFields
+						}
+						const volResult = this.updateSjmbrynd(item, targetAcSolution, p);
 						if (!volResult) {
 							return
 						}
@@ -722,14 +706,21 @@ export default {
 				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 		},
-		//平行配置 table选择试剂确定弹窗
+		// table选择试剂确定弹窗
 		onTableRegentSubmit(type, configIndex, data) {
 			const { selectInfo, rowIndex, key, rowData } = data;
 			const { row, selectedId } = selectInfo;
 			if (key === "actStartSolutionCode") {//实际原始溶液编号点击事件
 				const tableRef = this.$refs[`paralleStepTableRef_${configIndex}`][0];
+				//实际起始溶液体积和实际目标溶液体积
+				const formData = tableRef.getFilledFormData();
+				const headerSelectFields = formData.headerSelectFields;
+				const p = {
+					targetStartSolutionUnit: rowData.targetStartSolutionConcentrationPrecision,
+					headerSelectFields
+				}
 				if (tableRef) {
-					const volResult = this.updateSjmbrynd(rowData, row.nd);
+					const volResult = this.updateSjmbrynd(rowData, row.nd, p);
 					//第一次选择溶液的时候，可能其他值没填入，就需要先把浓度和code一起更新
 					tableRef.updateDataSourceByRowIndex(rowIndex, {
 						actStartSolutionCode: selectedId,
@@ -745,57 +736,10 @@ export default {
 				}
 			}
 		},
-		//选择试剂提交事件
-		onRegentSubmit(type, rowIndex, data) {
-			const { selectInfo, key } = data;
-			const { row } = selectInfo;
-			if (key) {
-				const packageRef = this.$refs[`paralleStepFormPackageRef_${rowIndex}`][0];
-				if (key === "subStartSolution") {
-					packageRef.updateFormData("targetAcSolution", row.nd);
-					packageRef.onValueChangeCompareTo("targetAcSolution", row.nd, "targetStartSolution");
-					this.updateTableNd(row, rowIndex);
-				}
-			}
-		},
-		updateRecord() {
-			this.$nextTick(() => {
-				EventBus.$emit('onModifyRecord', {
-					type: "fieldChanged",
-					newRecord: null,
-					resourceList: null,
-				},)
-			})
-		},
-		//选择实际的时候更新table的浓度
-		updateTableNd(row, rowIndex) {
-			const { stepTableFormData = [] } = this.$refs[`ladderStepTableRef_${rowIndex}`][0].getFilledFormData();
-			const newData = JSON.parse(JSON.stringify(stepTableFormData));
-			// 遍历数据，按要求更新起始溶液编号
-			newData.forEach((item, index) => {
-				let initNd = row.nd;//起始浓度是上一条记录的实际目标溶液浓度
-				if (index === 0) {
-					item.startSolutionCode = row.bh;
-				} else {
-					item.startSolutionCode = newData[index - 1].targetSolutionCode + newData[index - 1].subTargetSolutionCode;
-					initNd = newData[i - 1].actSolutionConcentration;
-				}
-				const volResult = this.updateSjmbrynd(item, initNd);
-				if (!volResult) {
-					return
-				}
-
-				item.actSolutionVolume = volResult.actVol;
-				item.actSolutionConcentration = volResult.actNd;
-				// 更新stepTableRef组件的数据
-			})
-			this.$refs[`ladderStepTableRef_${rowIndex}`][0].updateDataSource(newData);
-
-		},
 		//只做校验
 		async validFields() {
 			// 构建需要验证的引用数组
-			let refsToValidate = ["baseInfoRef","storageConditionRef", "remarkRef"];
+			let refsToValidate = ["baseInfoRef", "remarkRef"];
 
 			// 添加平行配制相关的引用
 			if (this.formData.paralleConfigs && this.formData.paralleConfigs.length > 0) {
@@ -809,7 +753,7 @@ export default {
 		},
 		getFilledFormData() {
 			const baseData = this.$refs.baseInfoRef.getFilledFormData();
-			const calcConditionData = this.$refs.calcConditionRef.getFilledFormData();
+
 			// 获取所有平行配制数据
 			const paralleConfigsData = [];
 			if (this.formData.paralleConfigs && this.formData.paralleConfigs.length > 0) {
@@ -817,7 +761,6 @@ export default {
 					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,
@@ -830,7 +773,6 @@ export default {
 			const remarkData = this.$refs.remarkRef.getFilledFormData();
 			return {
 				...baseData,
-				...calcConditionData,
 				paralleConfigs: paralleConfigsData,
 				...remarkData
 			}
@@ -864,7 +806,7 @@ export default {
 			//生成resource
 			let tmpResource = []
 			if (this.fillType === "actFill") {
-				//平行配置
+				//
 				if (content.paralleConfigs && content.paralleConfigs.length > 0) {
 					for (let i = 0; i < content.paralleConfigs.length; i++) {
 						let paralleConfigs = content.paralleConfigs[i]
@@ -935,6 +877,24 @@ export default {
 								yxzq: null,
 								yxzqdw: null,
 							})
+							//原始溶液 
+							tmpResource.push({
+								mc: null,
+								bh: stepTableFormData[j].actStartSolutionCode,
+								ph: null,
+								nd: null,
+								nddw: null,
+								ndz: null,
+								ly: null,
+								sxrq: null,
+								kc: null,
+								kcdw: null,
+								type: 1,
+								syl: stepTableFormData[j].actStartSolutionVolume,
+								syldw: paralleConfigs.headerSelectFields.actStartSolutionVolumeUnit,
+								yxzq: null,
+								yxzqdw: null,
+							})
 						}
 					}
 				}

From db156f6d539e65062762a8622fdc608d6f33c1a3 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 5 Mar 2026 15:13:35 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.vue b/src/App.vue
index 2ce2341..c0c9f75 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -382,6 +382,7 @@ th {
 /** 基础信息设置tab **/
 
 .edit-container {
+    padding: 10px 10px;
 
   .edit-top {
     background: #fff;