diff --git a/src/views/business/comps/template/comps/sp/SP0021.vue b/src/views/business/comps/template/comps/sp/SP0021.vue
index 99545ba..02d563e 100644
--- a/src/views/business/comps/template/comps/sp/SP0021.vue
+++ b/src/views/business/comps/template/comps/sp/SP0021.vue
@@ -61,7 +61,7 @@ import TableList from "@/components/Template/Table";
 import Step from "@/components/Template/Step";
 import templateMixin from "../../mixins/templateMixin";
 import CustomTable from '@/components/Template/CustomTable.vue';
-import { uniqeResource } from "@/utils/calUnitTools";
+import { uniqeResource ,uniqeYqOne} from "@/utils/calUnitTools";
 import { getuuid, justUpdateFilledFormData } from "@/utils/index";
 import { getBaseInfoFormConfig, getStorageFormConfig, getRemarkFormConfig, getYbsmFormConfig, getTableColumns } from "../../formConfig/sp/SP0021";
 const refConfig = {
@@ -228,27 +228,6 @@ export default {
 			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
-			if (this.fillType === "actFill") {
-				//配制的试剂
-				tmpResource.push({
-					mc: content.targetName,
-					bh: content.targetCode + content.targetCodeSn,
-					ph: '',
-					ndz: content.targetActConcentration + content.targetActConcentrationUnit,
-					nd: content.targetActConcentration,
-					nddw: content.targetActConcentrationUnit,
-					ly: 'ELN配制',
-					sxrq: content.expireDate,
-					kc: content.targetActVolume,
-					kcdw: content.targetActVolumeUnit,
-					syl: null,
-					type: null,
-					elnType: this.product,
-					syldw: content.targetActVolumeUnit,
-					yxzq: content.effectivePeriod,
-					yxzqdw: content.effectivePeriodUnit,
-				})
-			}
 			//使用的试剂、仪器
 			let allSjResource = [];
 			let allYqResource = [];
@@ -258,8 +237,17 @@ export default {
 				allSjResource = [...allSjResource, ...(stepResource.sjResource || [])];
 				allYqResource = [...allYqResource, ...(stepResource.yqResource || [])];
 			}
+			for(var i=0;i<this.formData.ybsmDataList.length;i++){
+				allYqResource.push({
+						mc:  this.formData.ybsmDataList[i].selectInfo_xztp.mc,
+						xh:  this.formData.ybsmDataList[i].selectInfo_xztp.xh,
+						bh:   this.formData.ybsmDataList[i].selectInfo_xztp.bh,
+						jzrq:  this.formData.ybsmDataList[i].selectInfo_xztp.jzrq,
+					})
+			}
 			this.resourceTmp = uniqeResource(tmpResource, allSjResource)
-			this.yqResourceTmp = allYqResource
+			this.yqResourceTmp =  uniqeYqOne(allYqResource)
+			debugger
 			return this.resourceTmp;
 		},
 		//保存