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 f154247..cadbcdd 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
@@ -292,8 +292,8 @@ export default {
 		formData: {
 			immediate: true,
 			handler(v) {
-				if (!v.targetCodeSn && this.fillType === "actFill") {
-					this.getCode();
+				if (this.fillType === "actFill") {
+					this.getCode(v);
 				}
 			}
 		}
@@ -350,7 +350,7 @@ export default {
 			}
 		},
 		//获取目标溶液编号
-		async getCode() {
+		async getCode(v) {
 			// 基质表格
 			const {stepTableFormData = []} = v;
 			if(stepTableFormData && stepTableFormData.length>0 && !stepTableFormData[0].bhCode){
@@ -419,29 +419,59 @@ export default {
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "tableRef", "stepRef",
 			 "rongyeTableRef", "rongyeStepFormPackageRef", "remarkRef"]);
-			 console.log(content)
+			console.log(content)
 			//生成resource
 			let tmpResource = []
-			//配置的试剂
-			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
 
+			let tableList = content.stepTableFormData
+			if(tableList && tableList.length>0){
+				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,
+					})
+				}
+			}
+
+			tableList = content.stepTableFormData_1
+			if(tableList && tableList.length>0){
+				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.sjryxql+item.sjgzyxql + item.sjxsyxql,//todo 单位不一致-计算
+						kcdw: content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+						syl: null,
+						syldw:content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算,
+						yxzq:null,
+						yxzqdw:null,
+					})
+				}
+			}
+			//使用的试剂
+			this.resource=tmpResource
 			return content;
 		},
 		async onSave() {
diff --git a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
index 360e0fb..617679e 100644
--- a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
+++ b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js
@@ -178,8 +178,8 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
-      bodyCompareTo: 'yjjzxql',
-      copyFrom: 'yjjzxql'
+      bodyCompareTo: 'yjgzyxql',
+      copyFrom: 'yjgzyxql'
     },
     {
       label: 'template.sp.sp009.yjxsyxql',
@@ -202,8 +202,8 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
-      bodyCompareTo: 'yjjzxql',
-      copyFrom: 'yjjzxql'
+      bodyCompareTo: 'yjxsyxql',
+      copyFrom: 'yjxsyxql'
     },
     {
       label: 'template.sp.sp008.hhwznd',