diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
index d0e8f49..fcdb786 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
@@ -17,11 +17,12 @@
 					<div class="template-form-item">
 						<span>基质</span>
 						<BaseInfoFormPcakge fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef"
-							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
+							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData"
+							@clickable="handleJzClickable" />
 
 						<CustomTable @blur="onHandleTableBlur" :ref="`tableRef`" :columns="tableStepColumns"
 							:formData="formData" :prefixKey="`table`" @clickable="handleClickable"
-							fieldItemLabel="这个是什么">
+							fieldItemLabel="template.common.operationSteps">
 							<template slot="operation" slot-scope="{ row, rowIndex}">
 								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"></TableOpertaion>
@@ -31,11 +32,12 @@
 					<div class="template-form-item">
 						<span>溶液</span>
 
-						<BaseInfoFormPcakge fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef"
-							:formConfig="rongyeStepFormConfig" @blur="onHandleBlur" :formData="formData" />
-						<CustomTable @blur="onHandleTableBlur" :ref="`tableRef`" :columns="rongyeTableStepColumns"
-							:formData="formData" :prefixKey="`table`" @clickable="handleClickable"
-							fieldItemLabel="这个是什么">
+						<BaseInfoFormPcakge fieldItemLabel="template.common.operationSteps"
+							ref="rongyeStepFormPackageRef" :formConfig="rongyeStepFormConfig" @blur="onHandleBlur"
+							:formData="formData" @clickable="handleRongyeClickable" />
+						<CustomTable @blur="onHandleTableBlur" :ref="`rongyeTableRef`" :columns="rongyeTableStepColumns"
+							:formData="formData" :prefixKey="`rongyeTable`" @clickable="handleRongyeTableClickable"
+							fieldItemLabel="template.common.operationSteps">
 							<template slot="operation" slot-scope="{ row, rowIndex}">
 								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"></TableOpertaion>
@@ -50,6 +52,8 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
+		<SelectReagentDialog @submit="onSelectReagentSubmit" ref="selectReagentDialogRef">
+		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -63,10 +67,11 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 import { getLatestSn } from '@/api/template';
 import { getSWYPFXFFXYPZBBTableConfig, getSWYPFXFFXYPZBBTQHSLTableConfig } from "../../../formConfig/SWYPFXFFXYPZBBTableConfig.js";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
+import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 
 export default {
 	name: "SWYPFXRYPZB",
-	components: { BaseInfoFormPcakge, LineLabel, TableList, Step, CustomTable, TableOpertaion },
+	components: { BaseInfoFormPcakge, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -174,9 +179,11 @@ export default {
 					label: 'template.sp.sp009.rqcz',
 					config: {
 						rqcz: {
-							type: "input",
+							type: "select",
+							multiple: true,
 							fillType: "actFill",
-							maxlength: 50
+							options: this.getDictOptions('business_rqcz'),
+							otherCode: "rqczOther",
 						},
 					}
 				},
@@ -225,7 +232,7 @@ export default {
 							type: "input",
 							fillType: "preFill",
 							subType: "clickable",
-							subKey: "subSolution",
+							subKey: "subGzy",
 							subFillType: "actFill",
 							maxlength: 20,
 						},
@@ -239,7 +246,7 @@ export default {
 							type: "input",
 							fillType: "preFill",
 							subType: "clickable",
-							subKey: "subSolution",
+							subKey: "subXsy",
 							subFillType: "actFill",
 							maxlength: 20,
 						},
@@ -256,6 +263,7 @@ export default {
 	},
 	data() {
 		return {
+			reagentType: '',
 			resource: [],
 			resourceData1: [],
 			sysjColumns: [
@@ -289,31 +297,86 @@ export default {
 		}
 	},
 	methods: {
+		//点击基质选择
+		handleJzClickable(obj) {
+			this.reagentType = 1//本表单特殊字段
+			this.currentSubKey = obj.subKey;
+			this.$refs.selectReagentDialogRef.show()
+		},
+		handleRongyeClickable(obj) {
+			this.reagentType = 2//本表单特殊字段
+			this.currentSubKey = obj.subKey;
+			this.$refs.selectReagentDialogRef.show()
+		},
+		//选择试剂提交事件
+		onSelectReagentSubmit(code, row) {
+			if (this.reagentType == 1) {
+				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
+			} else if(this.reagentType == 2){
+				this.$refs.rongyeStepFormPackageRef.updateFormData(this.currentSubKey, code);
+			} else if(this.reagentType == 3) {
+				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
+					[this.currentSubKey]: code,
+				})
+			} else if(this.reagentType == 4) {
+				this.$refs.rongyeTableRef.updateDataSourceByRowIndex(this.rowIndex,{
+					[this.currentSubKey]: code,
+				})
+			}
+
+			this.$refs.selectReagentDialogRef.onCancel()
+		},
 		//点击表格单元格
 		handleClickable(col, rowIndex) {
-			console.log("clickable", rowIndex, col)
-			if (col.prop === "sjry") {
-				//调用对应弹窗的方法；
+			this.reagentType = 3
+			this.rowIndex = rowIndex
+			this.currentSubKey = col.prop;
+			console.log("clickable",rowIndex, col)
+			if(col.prop === "sjry"){
+				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
+				this.$refs.selectReagentDialogRef.show()
+			}
+		},
+		handleRongyeTableClickable(col, rowIndex) {
+			this.reagentType = 4
+			this.rowIndex = rowIndex
+			this.currentSubKey = col.prop;
+			console.log("clickable",rowIndex, col)
+			if(col.prop === "sjry"){
+				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
+				this.$refs.selectReagentDialogRef.show()
 			}
-			this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, {
-				sjry: "我是填充进来的数据",
-			})
 		},
 		//获取目标溶液编号
 		async getCode() {
-			const result = await getLatestSn({
-				count: 1,
-			})
-			if (result.code == 200) {
-				this.$refs.stepFormPackageRef.updateFormData("targetCodeSn", result.data)
+			const { stepTableFormData = [] } = v;
+			if (stepTableFormData && stepTableFormData.length > 0 && !stepTableFormData[0].bhCode) {
+				const result = await getLatestSn({
+					count: stepTableFormData.length,
+				})
+				if (result.code == 200) {
+					if (stepTableFormData.length === 0) {
+						this.$refs.tableRef.updateDataSourceByRowIndex(0, {
+							[bhCode]: result.data,
+						})
+					} else {
+						for (let i = 0; i < stepTableFormData.length; i++) {
+							this.$refs.tableRef.updateDataSourceByRowIndex(i, {
+								bhCode: result.data[i],
+							})
+						}
+					}
+				}
 			}
 		},
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "tableRef", "stepRef", "remarkRef"])
+			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "tableRef", "stepRef", "rongyeTableRef", "rongyeStepFormPackageRef", "remarkRef"])
 		},
 		async getFormData() {
-			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "tableRef", "stepRef", "remarkRef"]);
+			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "tableRef", "stepRef",
+			 "rongyeTableRef", "rongyeStepFormPackageRef", "remarkRef"]);
+			 console.log(content)
 			//生成resource
 			let tmpResource = []
 			debugger
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
index a9d4f56..a9a1c90 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
@@ -2,8 +2,8 @@
 <template>
 	<div>
 		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc ||
-				 $t('template.sp.sp008.title') }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.templateMc ||
+				 '生物样品分析方法学样品制备表-准确度与精密度' }}<img src="@/assets/images/detail-title.png" /></div>
 			<div class="detail-content">
 				<div class="content">
 					<BaseInfoFormPcakge fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo" ref="baseInfoRef"
@@ -16,22 +16,22 @@
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
-						<BaseInfoFormPcakge fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							:formData="formData" @clickable="handleJzClickable" />
+						<BaseInfoFormPcakge fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig" @blur="onHandleBlur"
+							:formData="formData" />
 
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
-							fieldItemLabel = "template.common.operationSteps"
+							fieldItemLabel = "这个是什么"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex}">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
 								></TableOpertaion>
@@ -46,11 +46,6 @@
 			</div>
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
-
-		<SelectReagentDialog 
-		@submit="onSelectReagentSubmit"
-		ref="selectReagentDialogRef" >
-		</SelectReagentDialog>
 	</div>
 </template>
 
@@ -64,11 +59,10 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 import { getLatestSn } from '@/api/template';
 import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTableConfig.js";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
-import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 
 export default {
-	name: "ZQDYJMD",
-	components: { BaseInfoFormPcakge, LineLabel, TableList, Step, CustomTable,TableOpertaion,SelectReagentDialog },
+	name: "SWYPFXRYPZB",
+	components: { BaseInfoFormPcakge, LineLabel, TableList, Step, CustomTable,TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -112,7 +106,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -142,7 +136,7 @@ export default {
 						},
 						//处理批编号
 						clpbg: {
-							label: 'template.sp.sp008.clpbh',
+							label: 'template.common.clpbh',
 							type: "input",
 							fillType: "actFill",
 							maxlength: 50
@@ -174,20 +168,18 @@ export default {
 				},
 				{
 					type: "cellItem",
-					label: 'template.sp.sp008.rqcz',
+					label: 'template.common.rqcz',
 					config: {
 						rqcz: {
-							type: "select",
-							multiple: true,
+							type: "input",
 							fillType: "actFill",
-							options: this.getDictOptions('business_rqcz'),
-							otherCode: "rqczOther",
+							maxlength: 50
 						},
 					}
 				},
 				{
 					type: "cellItem",
-					label: 'template.sp.sp008.clsj',
+					label: 'template.common.clsj',
 					config: {
 						startDate: {
 							label: 'template.common.startTime',
@@ -207,37 +199,32 @@ export default {
 					type: "step",
 					config: {
 						jz: {
-							label: 'template.sp.sp008.xzjz',
+							label: 'template.common.xzjz',
 							type: "input",
 							fillType: "preFill",
 							subType: "clickable",
-							subKey: "subJz",
+							subKey: "subSolution",
 							subFillType: "actFill",
 							maxlength: 20,
-							labelWidth: 80,
 						},
 					}
 				}
 			]
 		},
 		tableStepColumns() {
-			return getSWYPFXFFXYPZBBTableConfig(this,'business_sp_jmdyzqdyp');
+			return getSWYPFXFFXYPZBBTableConfig(this);
 		},
 	},
 	data() {
 		return {
-			reagentType: "",//本表单特殊字段：选择试剂的类型1选择基质，2表格里面选择试剂
-
-			currentSubKey: "",//当前点击的子项key
-			rowIndex:0,//当前表格点击的行数
-
 			resource: [],
+			resourceData1: [],
 			sysjColumns: [
 				{ label: 'template.common.reagentName', prop: "mc" },//名称
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -256,63 +243,30 @@ export default {
 		formData: {
 			immediate: true,
 			handler(v) {
-				if(this.fillType === "actFill"){
-					this.getCode(v);
+				if(!v.targetCodeSn && this.fillType === "actFill"){
+					this.getCode();
 				}
 			}
 		}
 	},
 	methods: {
-		//点击基质选择
-		handleJzClickable(obj){
-			this.reagentType = 1//本表单特殊字段
-			this.currentSubKey = obj.subKey;
-			this.$refs.selectReagentDialogRef.show()
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code,row){
-			if(this.reagentType===1){
-				this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
-			}else{
-				this.$refs.tableRef.updateDataSourceByRowIndex(this.rowIndex,{
-					[this.currentSubKey]: code,
-				})
-			}
-			this.$refs.selectReagentDialogRef.onCancel()
-		},
 		//点击表格单元格
 		handleClickable(col, rowIndex) {
-			//本表单特殊字段
-			this.reagentType = 2
-
-			this.rowIndex = rowIndex
-			this.currentSubKey = col.prop;
 			console.log("clickable",rowIndex, col)
 			if(col.prop === "sjry"){
-				//调用对应弹窗的方法-多个点击的需要判断是哪个字段点击
-				this.$refs.selectReagentDialogRef.show()
+				//调用对应弹窗的方法；
 			}
+			this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex,{
+				sjry: "我是填充进来的数据",
+			})
 		},
 		//获取目标溶液编号
-		async getCode(v){
-			const {stepTableFormData = []} = v;
-			if(stepTableFormData && stepTableFormData.length>0 && !stepTableFormData[0].bhCode){
-				const result = await getLatestSn({
-					count: stepTableFormData.length,
-				})
-				if(result.code == 200){
-					if(stepTableFormData.length===1){
-						this.$refs.tableRef.updateDataSourceByRowIndex(0,{
-							bhCode: result.data,
-						})
-					}else{
-						for(let i=0;i<stepTableFormData.length;i++){
-							this.$refs.tableRef.updateDataSourceByRowIndex(i,{
-								bhCode: result.data[i],
-							})
-						}
-					}
-				}
+		async getCode(){
+			const result = await getLatestSn({
+				count: 1,
+			})
+			if(result.code == 200){
+				this.$refs.stepFormPackageRef.updateFormData("targetCodeSn",result.data)
 			}
 		},
 		//获取已填写的表单数据
@@ -323,31 +277,27 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
-
-			let tableList = content.stepTableFormData
-			for(let i=0;i<tableList.length;i++){
-				//配置的试剂
-				let item = tableList[i]
-				tmpResource.push({
-					mc: null,
-					bh: item.bh+item.bhCode,
-					ph: null,
-					nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-					source: 'ELN配制',
-					sxrq: null,
-					ndz: item.hhwznd,
-					nddw: content.headerSelectFields.hhwzndUnit,
-					kc: item.sjjzxql+item.sjryxql,//todo 单位不一致-计算
-					kcdw: content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
-					syl: null,
-					syldw:content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算,
-					yxzq:null,
-					yxzqdw:null,
-				})
-			}
-			
+			debugger
+			//配置的试剂
+			tmpResource.push({
+				mc: content.targetName,
+				bh: content.targetCode+content.targetCodeSn,
+				ph: '',
+				nd: content.targetActConcentration + content.targetActConcentrationUnit,
+				source: 'ELN配制',
+				sxrq: content.expireDate,
+				ndz: content.targetActConcentration,
+				nddw: content.targetActConcentrationUnit,
+				kc: content.targetActVolume,
+				kcdw: content.targetActVolumeUnit,
+				syl: null,
+				syldw:content.targetActVolumeUnit,
+				yxzq:content.effectivePeriod,
+				yxzqdw:content.effectivePeriodUnit,
+			})
 			//使用的试剂
 			this.resource=tmpResource
+
 			return content;
 		},
 		async onSave() {
@@ -362,7 +312,6 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
-		
 
 	}
 };