From f41280fa093a824009cf8f35d9a27df4b0486d0d Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Tue, 3 Mar 2026 17:12:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?[PCR007]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/template/pcr.js                        |   5 +
 src/lang/zh/template/pcr.js                        |   5 +
 src/utils/index.js                                 |   2 +-
 .../business/comps/template/comps/pcr/PCR005.vue   |  23 ++--
 .../business/comps/template/comps/pcr/PCR007.vue   | 129 ++-------------------
 .../comps/template/formConfig/PCRTableConfig.js    |  89 +++-----------
 6 files changed, 48 insertions(+), 205 deletions(-)

diff --git a/src/lang/en/template/pcr.js b/src/lang/en/template/pcr.js
index e5ae109..ff5c6ca 100644
--- a/src/lang/en/template/pcr.js
+++ b/src/lang/en/template/pcr.js
@@ -49,6 +49,11 @@ export default {
   },
   pcr007: {
     dztpbh: '电子天平编号',
+    ypmc: '样品名称',
+    cyqypgsjyjtjtj: '采样前样品管试剂预计添加体积',
+    cyqypgsjsjtjtj: '采样前样品管试剂实际添加体积',
+    cygzl: '采集管重量',
+    czsj: '称重时间',
     clpbh: 'Analysis Batch Number',
     ypmc: '样品名称',
     ypcsnd: '样品初始浓度',
diff --git a/src/lang/zh/template/pcr.js b/src/lang/zh/template/pcr.js
index 80f8fe1..919028d 100644
--- a/src/lang/zh/template/pcr.js
+++ b/src/lang/zh/template/pcr.js
@@ -48,6 +48,11 @@ export default {
   },
   pcr007: {
     dztpbh: '电子天平编号',
+    ypmc: '样品名称',
+    cyqypgsjyjtjtj: '采样前样品管试剂预计添加体积',
+    cyqypgsjsjtjtj: '采样前样品管试剂实际添加体积',
+    cygzl: '采集管重量',
+    czsj: '称重时间',
     clpbh: 'Analysis Batch Number',
     ypmc: '样品名称',
     ypcsnd: '样品初始浓度',
diff --git a/src/utils/index.js b/src/utils/index.js
index 0212fd7..b80851c 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -441,7 +441,7 @@ export function isValueEmpty(value) {
   if (Array.isArray(value) && value.length === 0) {
     return true
   }
-  if (Object.keys(value).length === 0) {
+  if (Object.keys(value).length === 0 && typeof value=='object') {
     return true;
   }
   return false
diff --git a/src/views/business/comps/template/comps/pcr/PCR005.vue b/src/views/business/comps/template/comps/pcr/PCR005.vue
index 6a23326..dc9e66c 100644
--- a/src/views/business/comps/template/comps/pcr/PCR005.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR005.vue
@@ -26,10 +26,11 @@
 
 						<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>
+									@deleteRow="(rowIndex) => deleteRow(rowIndex)" ></TableOpertaion>
 							</template>
 						</CustomTable>
 					</div>
@@ -43,8 +44,6 @@
 				</div>
 			</div>
 		</div>
-		<SelectReagentDialog @submit="onSelectReagentSubmit" ref="selectReagentDialogRef">
-		</SelectReagentDialog>
 		<!-- <button @click="onSave">保存</button> -->
 		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" />
 	</div>
@@ -177,11 +176,11 @@ export default {
 					type: "cellItem",
 					label: 'template.pcr.pcr005.clpbh',
 					config: {
-						act: {
+						clpbh: {
 							label: '',
 							type: "input",
 							fillType: "actFill",
-							otherCode: "preOther",
+							otherCode: "clpbh",
 						}
 					}
 				},
@@ -237,7 +236,7 @@ export default {
 	},
 	methods: {
 		downloadExcelTemplate() {
-			this.exportExcel(['样品名称', '样品初始浓度', '稀释倍数', '预设样品吸样体积'])
+			this.exportExcel(['样品名称', '样品初始浓度', '稀释倍数', '预设样品吸样体积'], 'PCR分析样品处理表导入模板')
 		},
 		//选择试剂提交事件
 		onSelectReagentSubmit(code, row) {
@@ -310,15 +309,15 @@ export default {
 		},
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"])
+			return this.getFilledFormDataByRefs(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "fjRef", "remarkRef"])
 		},
 		async getFormData() {
-			let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);
+			let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "fjRef", "remarkRef"]);
 			return content;
 		},
 		getResource() {
 			let content = this.getFilledFormData();
-
+			console.log(content)
 			//生成resource
 			let tmpResource = []
 			if (this.fillType === "actFill") {
@@ -333,7 +332,7 @@ export default {
 
 						tmpResource.push({
 							mc: null,
-							bh: item.startSolutionCode,
+							bh: content.subSolution,
 							ph: null,
 							ndz: null,
 							nd: null,
@@ -342,10 +341,10 @@ export default {
 							sxrq: null,
 							kc: null,
 							kcdw: null,
-							syl: item.actStartSolutionVolume,
+							syl: item.ysxsyxytj,
 							type: 1,
 							elnType: this.product,
-							syldw: content.headerSelectFields.actStartSolutionVolumeUnit,
+							syldw: content.headerSelectFields.sjxsyxytjUnit,
 							yxzq: null,
 							yxzqdw: null,
 						})
diff --git a/src/views/business/comps/template/comps/pcr/PCR007.vue b/src/views/business/comps/template/comps/pcr/PCR007.vue
index 8d8a7f5..dcfbadb 100644
--- a/src/views/business/comps/template/comps/pcr/PCR007.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR007.vue
@@ -26,6 +26,7 @@
 
 						<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"
@@ -35,16 +36,11 @@
 					</div>
 					<Step ref="stepRef" :formData="formData.stepData"></Step>
 
-					<BaseInfoFormPackage fieldItemLabel="template.pcr.pcr005.fj" label="template.pcr.pcr005.fj"
-						ref="fjRef" :formConfig="getFjFormConfig" :formData="formData" />
-
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
 			</div>
 		</div>
-		<SelectReagentDialog @submit="onSelectReagentSubmit" ref="selectReagentDialogRef">
-		</SelectReagentDialog>
 		<!-- <button @click="onSave">保存</button> -->
 		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" />
 	</div>
@@ -63,7 +59,7 @@ import { EventBus } from "@/utils/eventBus";
 import { volumeConverter } from "@/utils/volConverter";//体积单位转换
 import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
 import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
-import { getPCR005Config } from "../../formConfig/PCRTableConfig.js";
+import { getPCR007Config  } from "../../formConfig/PCRTableConfig.js";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import { addTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
 import ImportExcelDialog from '../../dialog/ImportExcelDialog'
@@ -79,7 +75,7 @@ export default {
 	},
 	computed: {
 		tableStepColumns() {
-			return getPCR005Config(this);
+			return getPCR007Config(this);
 		},
 		// 附件表单配置
 		getFjFormConfig() {
@@ -151,43 +147,8 @@ export default {
 					}
 				},
 				{
-					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.pcr005.clpbh',
-					config: {
-						act: {
-							label: '',
-							type: "input",
-							fillType: "actFill",
-							otherCode: "preOther",
-						}
-					}
-				},
-				{
 					type: "cellItem",
-					label: 'template.common.configurationTime',
+					label: 'template.pcr.pcr007.czsj',
 					config: {
 						startDate: {
 							label: 'template.common.startTime',
@@ -208,14 +169,10 @@ export default {
 					type: 'step',
 					config: {
 						solution: {
-							labelWidth: 80,
+							labelWidth: 100,
 							label: 'template.pcr.pcr007.dztpbh',
-							type: 'input',
-							fillType: 'preFill',
-							subType: 'sj',
-							subKey: 'subSolution',
-							subFillType: 'actFill',
-							maxlength: 20
+							type: 'yq',
+							fillType: 'actFill',
 						},
 					}
 				}
@@ -237,7 +194,7 @@ export default {
 	},
 	methods: {
 		downloadExcelTemplate() {
-			this.exportExcel(['样品名称', '样品初始浓度', '稀释倍数', '预设样品吸样体积'])
+			this.exportExcel(['样品名称', '样品初始浓采样前样品管试剂预计添加体积度'], 'PCR分析采集管称重记录表导入模板')
 		},
 		//选择试剂提交事件
 		onSelectReagentSubmit(code, row) {
@@ -253,10 +210,6 @@ export default {
 				list.push({
 					ypmc: item[0],
 					ypcsnd: item[1],
-					sxbs: item[2],
-					ysypxytj: item[3],
-					targetDiluentVolumePrecision: 3,
-					actSolutionVolumePrecision: 3
 				})
 			})
 			this.$refs.stepTableRef.addRows(list)
@@ -265,48 +218,8 @@ export default {
 		},
 		// 失去焦点，计算
 		onHandleTableBlur() {
-			let content = this.getFilledFormData();
-			// 预填
-			let ysypxytjUnit = content.headerSelectFields.ysypxytjUnit
-			let ysxsyxytjUnit = content.headerSelectFields.ysxsyxytjUnit
-
-			let ypzndUnit = content.headerSelectFields.ypzndUnit
-			let ypcsndUnit = content.headerSelectFields.ypcsndUnit
-			if (this.fillType === "preFill") {
-				let tableList = content.stepTableFormData
-				if (tableList && tableList.length > 0) {
-					for (let i = 0; i < tableList.length; i++) {
-						let item = tableList[i]
-						if (
-							isValueEmpty(ysypxytjUnit) ||
-							isValueEmpty(ysxsyxytjUnit) ||
-							isValueEmpty(item.sxbs) ||
-							isValueEmpty(item.ysypxytj) ||
-							isValueEmpty(item.actSolutionVolumePrecision) ||
-							isValueEmpty(item.ypcsnd)
-						) {
-							continue;
-						}
 
-						// 计算预设稀释液吸样体积  公式：(稀释倍数-1)*样品理论体积
-						let ysxsyxytj = (item.sxbs - 1) * item.ysypxytj
-						ysxsyxytj = volumeConverter.convert(ysxsyxytj + ysypxytjUnit, ysxsyxytjUnit).toFixed(
-							item.actSolutionVolumePrecision
-						)
-						tableList[i].ysxsyxytj = ysxsyxytj
 
-
-						// 计算样品终浓度： 样品初始浓度/稀释倍数
-						let ypznd = (item.ypcsnd) / item.sxbs
-						ypznd = convertConcentration.convert(ypznd + ypcsndUnit, ypzndUnit).toFixed(
-							item.targetDiluentVolumePrecision
-						)
-						tableList[i].ypznd = ypznd
-
-					}
-				}
-				this.$refs.stepTableRef.updateDataSource(tableList);
-			}
 		},
 		//获取已填写的表单数据
 		getFilledFormData() {
@@ -325,31 +238,6 @@ export default {
 				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: item.startSolutionCode,
-							ph: null,
-							ndz: null,
-							nd: null,
-							nddw: null,
-							ly: 'ELN配制',
-							sxrq: null,
-							kc: null,
-							kcdw: null,
-							syl: item.actStartSolutionVolume,
-							type: 1,
-							elnType: this.product,
-							syldw: content.headerSelectFields.actStartSolutionVolumeUnit,
-							yxzq: null,
-							yxzqdw: null,
-						})
-
 					}
 				}
 			}
@@ -365,7 +253,6 @@ export default {
 		//保存
 		async onSave() {
 			let content = this.$refs.stepRef.getStepResource();
-			console.log(content);
 
 		},
 		// 删除表格行
diff --git a/src/views/business/comps/template/formConfig/PCRTableConfig.js b/src/views/business/comps/template/formConfig/PCRTableConfig.js
index 4f7168b..cbaacc9 100644
--- a/src/views/business/comps/template/formConfig/PCRTableConfig.js
+++ b/src/views/business/comps/template/formConfig/PCRTableConfig.js
@@ -632,6 +632,7 @@ export const getPCR005Config = ($this) => {
       fillType: 'preFill',
       headerSelectKey: 'sjypxytjUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
+      copyFrom: 'ysypxytj', //复制哪个字段
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
@@ -666,6 +667,7 @@ export const getPCR005Config = ($this) => {
       fillType: 'preFill',
       headerSelectKey: 'sjxsyxytjUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
+      copyFrom: 'ysxsyxytj', //复制哪个字段
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
@@ -699,7 +701,7 @@ export const getPCR005Config = ($this) => {
 export const getPCR007Config = ($this) => {
   return [
     {
-      label: 'template.pcr.pcr005.ypmc',
+      label: 'template.pcr.pcr007.ypmc',
       prop: 'ypmc',
       width: 280,
       bodyType: 'input',
@@ -708,105 +710,50 @@ export const getPCR007Config = ($this) => {
       bodyFillType: 'preFill',
     },
     {
-      label: 'template.pcr.pcr005.ypcsnd',
-      prop: 'ypcsnd',
-      width: 280,
-      showWidth: 180,
-      fillType: 'preFill',
-      headerSelectKey: 'ypcsndUnit',
-      headerOptions: $this.getDictOptions('business_nddw'),
-      bodyType: 'inputNumber',
-      bodyFillType: 'preFill',
-      bodyMaxlength: 10,
-    },
-    {
-      label: 'template.pcr.pcr005.sxbs',
-      prop: 'sxbs',
-      width: 280,
-      showWidth: 180,
-      fillType: 'preFill',
-      bodyType: 'inputNumber',
-      bodyFillType: 'preFill',
-      bodyMaxlength: 10,
-    },
-    {
-      label: 'template.pcr.pcr005.ysypxytj',
-      prop: 'ysypxytj',
+      label: 'template.pcr.pcr007.cyqypgsjyjtjtj',
+      prop: 'cyqypgsjyjtjtj',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'ysypxytjUnit',
+      headerSelectKey: 'cyqypgsjyjtjtjUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'preFill',
       bodyMaxlength: 10,
     },
     {
-      label: 'template.pcr.pcr005.sjypxytj',
-      prop: 'sjypxytj',
+      label: 'template.pcr.pcr007.cyqypgsjsjtjtj',
+      prop: 'cyqypgsjsjtjtj',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'sjypxytjUnit',
+      headerSelectKey: 'cyqypgsjsjtjtjUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
+      copyFrom: 'cyqypgsjyjtjtj', //复制哪个字段
       bodyMaxlength: 10,
     },
     {
-      label: 'template.pcr.pcr005.ysxsyxytj',
-      prop: 'ysxsyxytj',
-      width: 280,
-      showWidth: 180,
-      fillType: 'preFill',
-      headerSelectKey: 'ysxsyxytjUnit',
-      headerOptions: $this.getDictOptions('business_tjdw'),
-      bodyDisabled: true,
-      bodyType: 'inputNumber',
-      bodyFillType: 'preFill',
-      bodyMaxlength: 10,
-      bodySubType: 'inputNumber',
-      bodySubKey: 'actSolutionVolumePrecision',
-      subPrecision: 0,
-      bodyFillType: 'preFill',
-      bodySubFillType: 'preFill',
-      showBodySub: $this.fillType === 'preFill',
-      bodyPrecisionKey: 0,
-      bodyMaxlength: 10,
-      bodySubPlaceholder: 'template.common.xswsPlaceholder',
-    },
-    {
-      label: 'template.pcr.pcr005.sjxsyxytj',
-      prop: 'sjxsyxytj',
+      label: 'template.pcr.pcr007.cygzl',
+      prop: 'cygzl',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'sjxsyxytjUnit',
+      headerSelectKey: 'cygzlUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
+      bodySubType: 'button',
+      bodySubButtonName: 'form.hqz',
       bodyMaxlength: 10,
-    },
-    {
-      label: 'template.pcr.pcr005.ypznd',
-      prop: 'ypznd',
-      width: 280,
-      showWidth: 180,
-      fillType: 'preFill',
-      headerSelectKey: 'ypzndUnit',
-      headerOptions: $this.getDictOptions('business_nddw'),
-      bodyDisabled: true,
-      bodyType: 'inputNumber',
-      bodyFillType: 'preFill',
-      bodyMaxlength: 10,
-      bodySubType: 'inputNumber',
       bodySubKey: 'targetDiluentVolumePrecision',
       bodyPrecisionKey: 'targetDiluentVolumePrecision',
-      bodySubFillType: 'preFill',
+      bodySubFillType: 'actFill',
       subPrecision: 0,
-      showBodySub: $this.fillType === 'preFill',
+      showBodySub: $this.fillType === 'actFill',
       bodyMaxlength: 10,
       bodySubPlaceholder: 'template.common.xswsPlaceholder',
-    },
+    }
   ]
 }
\ No newline at end of file

From 7e6f74cd7453c98c2167f4db3175a74b022c621d Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Tue, 3 Mar 2026 18:06:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20[=E6=AD=A5=E9=AA=A4=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=20=E6=96=B0=E5=A2=9E=E7=94=9F=E7=89=A9=E6=A0=B7?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E6=9E=90=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/Step.vue                   |  41 ++++++++-
 src/components/Template/StepComponents/ry/fy.vue   |   2 +-
 src/components/Template/StepComponents/ry/jd.vue   | 102 ++++++++++++++++++++-
 src/components/Template/StepComponents/ry/lx.vue   |   4 +-
 .../Template/StepComponents/swypfx/hhspe.vue       |  91 ++++++++++++++++++
 .../Template/StepComponents/swypfx/jryp.vue        |  67 ++++++++++++++
 .../Template/StepComponents/swypfx/zyfc.vue        |  79 ++++++++++++++++
 7 files changed, 380 insertions(+), 6 deletions(-)
 create mode 100644 src/components/Template/StepComponents/swypfx/hhspe.vue
 create mode 100644 src/components/Template/StepComponents/swypfx/jryp.vue
 create mode 100644 src/components/Template/StepComponents/swypfx/zyfc.vue

diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index 8f274e4..8328014 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -103,6 +103,24 @@ import cl from './StepComponents/b/cl.vue';//表配置-称量
 //表配置-孵育：使用溶液-孵育
 //表配置-复溶：使用溶液-复溶
 
+
+//生物样品分析
+//生物样品分析-解冻：使用溶液-解冻
+//生物样品分析-涡旋混匀：使用溶液-涡旋混匀
+//生物样品分析-选择容器：使用溶液-选择容器
+import jryp from './StepComponents/swypfx/jryp.vue';//生物样品分析-加入样品
+//生物样品分析-衍生反应：使用溶液-离心
+import hhspe from './StepComponents/swypfx/hhspe.vue';//生物样品分析-活化（SPE）
+//生物样品分析-平衡（SPE）：使用溶液-活化（SPE）
+//生物样品分析-上样（SPE）：使用溶液-活化（SPE）
+//生物样品分析-淋洗（SPE）：使用溶液-活化（SPE）
+//生物样品分析-洗脱（SPE）：使用溶液-活化（SPE）
+import zyfc from './StepComponents/swypfx/zyfc.vue';//生物样品分析-转移（分层）
+//生物样品分析-氮吹：使用溶液-氮吹
+//生物样品分析-正压：使用溶液-正压
+//生物样品分析-孵育：使用溶液-孵育
+//生物样品分析-复溶：使用溶液-复溶
+
 import { public_templateStepList } from '@/api/business/public/public';
 
 
@@ -223,6 +241,11 @@ export default {
 		//表配置
 		jrry_b,
 		cl,
+
+		//生物样品分析
+		jryp,
+		hhspe,
+		zyfc
 	},
 	computed: {
 		stepComponentMap() {
@@ -280,8 +303,8 @@ export default {
 					//标配配置
 					'jrry_b': 'jrry_b',
 					'cl': 'cl',
-					'lx_b': 'lx',
-					'cs_b': 'cs',
+					'lx_b': 'Lx',
+					'cs_b': 'Cs',
 					'hwhy_b': 'Hwhy',
 					'zyhy_b': 'Zyhy',
 					'wxhy_b': 'Wxhy',
@@ -298,6 +321,19 @@ export default {
 					'jd_b': 'Jd',
 					'fy_b': 'Fy',
 					'fr_b': 'Fr',
+
+					//生物样品分析
+					'jd_swypfx': 'Jd',
+					'jryp': 'jryp',
+					'ysfy': 'Lx',
+					'hhspe': 'hhspe',
+
+					'phspe': 'hhspe',
+					'syspe': 'hhspe',
+					'lxspe': 'hhspe',
+					'xtspe': 'hhspe',
+					'zyfc': 'zyfc',
+					
 				}
 			}
 			return this.componentMap
@@ -339,6 +375,7 @@ export default {
 	},
 	methods: {
 		getStepList(){
+			debugger
 			public_templateStepList({templateId:this.templateData.templateId}).then(response => {
 				let options = []
 				_.forEach(response.data,(item)=>{
diff --git a/src/components/Template/StepComponents/ry/fy.vue b/src/components/Template/StepComponents/ry/fy.vue
index da8de0a..e893c5f 100644
--- a/src/components/Template/StepComponents/ry/fy.vue
+++ b/src/components/Template/StepComponents/ry/fy.vue
@@ -40,7 +40,7 @@ export default {
                         fillType: "preFill",
                     },
                     text3: {
-                        label: "实际条件为",
+                        label: "实际设置条件为",
                         type: "text",
                     },
                     sjtj: {
diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue
index 40b1ca1..f9fc081 100644
--- a/src/components/Template/StepComponents/ry/jd.vue
+++ b/src/components/Template/StepComponents/ry/jd.vue
@@ -21,7 +21,107 @@ export default {
     },
     computed: {
         formConfig() {
-            let config = [{
+            let config = this.sn==='jd_swypfx'?
+            [{
+                config: {
+                    text1: {
+                        label: "将上述样品预计放置于",
+                        type: "text",
+                    },
+                    ccwz: {
+                        type: "select",
+                        options: this.getDictOptions("business_ccwz"),
+                        fillType: "preFill",
+                        otherCode: "ccwzOther",
+                    },
+                    text3: {
+                        label: "实际放置于",
+                        type: "text",
+                    },
+                    sjccwz: {
+                        type: "select",
+                        options: this.getDictOptions("business_ccwz"),
+                        fillType: "actFill",
+                        otherCode: "sjccwzOther",
+                        compareTo: "ccwz",
+                    },
+                    text4: {
+                        label: "位置，其环境条件预计为",
+                        type: "text",
+                    },
+                    yjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_wddw"),
+                        fillType: "preFill",
+                        otherCode: "yjwdOther",
+                    },
+                    yjhj: {
+                        type: "select",
+                        options: this.getDictOptions("business_hjxx"),
+                        fillType: "preFill",
+                        otherCode: "yjhjOther",
+                    },
+                    text5: {
+                        label: "，实际条件为",
+                        type: "text",
+                    },
+                    sjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_wddw"),
+                        fillType: "actFill",
+                        otherCode: "sjwdOther",
+                        compareTo: "yjwd",
+                    },
+                    sjhj: {
+                        type: "select",
+                        options: this.getDictOptions("business_hjxx"),
+                        fillType: "actFill",
+                        otherCode: "sjhjOther",
+                        compareTo: "yjhj",
+                    },
+                     text6: {
+                        label: "，放置",
+                        type: "text",
+                    },
+                    sr1:{
+                        type: "input",
+                        fillType: "preFill",
+                    },  
+                    text7:{
+                        type:"text",
+                        label:"，解冻",
+                    },
+                    startDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button1:{
+                        type:"button",
+                        buttonName:"开始",
+                    },
+                    text8:{
+                        type:"text",
+                        label:"，解冻",
+                    },
+                    endDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button2:{
+                        type:"button",
+                        buttonName:"结束",
+                    },
+                    text9: {
+                        type: "text",
+                        label: "。",
+                    },
+                    
+
+                }
+            }]:
+            [{
                 config: {
                     text1: {
                         label: "将",
diff --git a/src/components/Template/StepComponents/ry/lx.vue b/src/components/Template/StepComponents/ry/lx.vue
index 4bb113d..86e0fa9 100644
--- a/src/components/Template/StepComponents/ry/lx.vue
+++ b/src/components/Template/StepComponents/ry/lx.vue
@@ -23,7 +23,7 @@ export default {
             let config = [{
                 config: {
                     text1: {
-                        label: "使用离心机",
+                        label: this.sn==='ysfy'?"使用恒温混匀仪":"使用离心机",
                         type: "text",
                     },
                     yq: {
@@ -110,7 +110,7 @@ export default {
                         fillType: "preFill",
                     },
                     text8: {
-                        label: "，进行离心。离心",
+                        label: this.sn==='ysfy'?"，进行衍生反应，反应":"，进行离心。离心",
                         type: "text",
                     },
                     startDate: {
diff --git a/src/components/Template/StepComponents/swypfx/hhspe.vue b/src/components/Template/StepComponents/swypfx/hhspe.vue
new file mode 100644
index 0000000..b6d686e
--- /dev/null
+++ b/src/components/Template/StepComponents/swypfx/hhspe.vue
@@ -0,0 +1,91 @@
+<!-- 活化（SPE） -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_hhspe" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    props: {
+		sn: {
+			type: String,
+			default: 'hhsep',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            return [{
+                config: {
+                    text1: {
+                        label: "使用",
+                        type: "text",
+                    },
+                    ytrq: {
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    sjrqcz: {
+                        fillType: "actFill",
+                        type: "yq",
+                    },
+                    text2: {
+                        label: this.sn==='syspe'?"向预先活化平衡好的固相萃取版中加入":"向固相萃取版中加入",
+                        type: "text",
+                    },
+                    srry: {
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    sjrq:{
+                        fillType: "actFill",
+                        type: "sj",
+                        ylCode: "sjsr2",
+                        dwCode: "sjsrdw2",
+                    },
+                    text3:{
+                        label: this.sn==='syspe'?"样品，预计加入":"溶液，预计加入",
+                        type: "text",
+                    },
+                    ytsr1:{
+                        fillType: "preFill",
+                        type: "inputNumber",
+                    },
+                    tjxz:{
+                        fillType: "preFill",
+                        type: "select",
+                        selectTo: "sjsrdw2",
+                        options:this.getDictOptions('business_tjdw'),  
+                    },
+                    text4:{
+                        label: "，实际加入",
+                        type: "text",
+                    },
+                    sjsr2:{
+                        fillType: "actFill",
+                        type: "inputNumber",
+                        compareTo:"ytsr1",
+                        copyFrom:"ytsr1"
+                    },
+                    sjsrdw2:{
+                        fillType: "preFill",
+                        type: "select",
+                        options: this.getDictOptions('business_tjdw'),  
+                    },
+                    text5:{
+                        label: this.sn==='phspe'?"进行平衡。":this.sn==='syspe'?"进行上样。":this.sn==='lxspe'?"进行淋洗，弃去淋洗液。":this.sn==='xtspe'?"进行洗脱，收集洗脱液。":"进行活化。",
+                        type: "text",
+                    }
+                }
+            }]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/swypfx/jryp.vue b/src/components/Template/StepComponents/swypfx/jryp.vue
new file mode 100644
index 0000000..8d9ada2
--- /dev/null
+++ b/src/components/Template/StepComponents/swypfx/jryp.vue
@@ -0,0 +1,67 @@
+<!-- 加入样品 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_jryp" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            return [{
+                config: {
+                    text1: {
+                        label: "使用移液器",
+                        type: "text",
+                    },
+                    sjrqcz: {
+                        fillType: "actFill",
+                        type: "yq",
+                    },
+                    text2: {
+                        label: "仪器，预计加入样品",
+                        type: "text",
+                    },
+                    ytsr1:{
+                        fillType: "preFill",
+                        type: "inputNumber",
+                    },
+                    tjxz:{
+                        fillType: "preFill",
+                        type: "select",
+                        selectTo: "sjsrdw2",
+                        options:this.getDictOptions('business_tjdw'),  
+                    },
+                    text4:{
+                        label: "，实际加入样品",
+                        type: "text",
+                    },
+                    sjsr2:{
+                        fillType: "actFill",
+                        type: "inputNumber",
+                        compareTo:"ytsr1",
+                        copyFrom:"ytsr1"
+                    },
+                    sjsrdw2:{
+                        fillType: "preFill",
+                        type: "select",
+                        options: this.getDictOptions('business_tjdw'),  
+                    },
+                    text5:{
+                        label: "。",
+                        type: "text",
+                    }
+                }
+            }]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/swypfx/zyfc.vue b/src/components/Template/StepComponents/swypfx/zyfc.vue
new file mode 100644
index 0000000..016a9c5
--- /dev/null
+++ b/src/components/Template/StepComponents/swypfx/zyfc.vue
@@ -0,0 +1,79 @@
+<!-- 转移（分层） -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_zyfc" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            return [{
+                config: {
+                    text1: {
+                        label: "使用",
+                        type: "text",
+                    },
+                    ytyq: {
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    sjrqcz: {
+                        fillType: "actFill",
+                        type: "yq",
+                    },
+                    text2: {
+                        label: "转移",
+                        type: "text",
+                    },
+                    shang:{
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    text3: {
+                        label: "层清液，预计转移",
+                        type: "text",
+                    },
+                    ytsr1:{
+                        fillType: "preFill",
+                        type: "inputNumber",
+                    },
+                    tjxz:{
+                        fillType: "preFill",
+                        type: "select",
+                        selectTo: "sjsrdw2",
+                        options:this.getDictOptions('business_tjdw'),  
+                    },
+                    text4:{
+                        label: "，实际转移",
+                        type: "text",
+                    },
+                    sjsr2:{
+                        fillType: "actFill",
+                        type: "inputNumber",
+                        compareTo:"ytsr1",
+                        copyFrom:"ytsr1"
+                    },
+                    sjsrdw2:{
+                        fillType: "preFill",
+                        type: "select",
+                        options: this.getDictOptions('business_tjdw'),  
+                    },
+                    text5:{
+                        label: "至容器中。",
+                        type: "text",
+                    }
+                }
+            }]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file