diff --git a/src/views/business/comps/template/comps/gsp/GSP005.vue b/src/views/business/comps/template/comps/gsp/GSP005.vue
index 3309ebc..ec1997a 100644
--- a/src/views/business/comps/template/comps/gsp/GSP005.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP005.vue
@@ -617,49 +617,55 @@ export default {
 		// 溶液
 		onTableBeforeReagentRySubmit(data, zlIndex, formZlConfig) {
 			const { selectData, callback, key, formFields } = data;
+			debugger
 			//源溶剂编号/批号
-			if (key === "yrybhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.yrysjtjUnit])) {
-				callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
+			if (key === "yrybhphSub" && !isCommonUnit(selectData.row.nddw, [formFields.yrysjndUnit])) {
+				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 			//溶剂编号/批号
-			if (key === "rjbhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.rjsjtjUnit])) {
-				callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
+			if (key === "rjbhphSub" && !isCommonUnit(selectData.row.nddw, [formFields.rjsjndUnit])) {
+				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 		},
 		onTableRegentRySubmit(zlIndex, data) {
 			if (data.key === 'yrybhphSub') {
 				this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('yrybhphSubType', data.selectInfo.selectType)
 				this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('yrybhphSubKcdw', data.selectInfo.row.kcdw)
-				this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('yrymc', data.selectInfo.row.mc)
+				this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('yrybhphSubNddw', data.selectInfo.row.nddw)
+				this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('yrymc', data.selectInfo.row.mc||'NA')
 			}
 			if (data.key === 'rjbhphSub') {
 				this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('rjbhphSubType', data.selectInfo.selectType)
 				this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('rjbhphSubKcdw', data.selectInfo.row.kcdw)
-				this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('rjmc', data.selectInfo.row.mc)
+				this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('rjbhphSubNddw', data.selectInfo.row.nddw)
+				this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('rjmc', data.selectInfo.row.mc||'NA')
 			}
 		},
 		// 质量
 		onTableBeforeReagentZlSubmit(data, zlIndex, formZlConfig) {
 			const { selectData, callback, key, formFields } = data;
+			debugger
 			//溶剂编号/批号
-			if (key === "rjbhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.rjsjtjUnit])) {
-				callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
-			}
-			//试验物质编号/批号
-			if (key === "sywzbhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.sywzsjclzUnit])) {
+			if (key === "rjbhphSub" && !isCommonUnit(selectData.row.nddw, [formFields.rjsjndUnit])) {
 				callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
+			// //试验物质编号/批号
+			// if (key === "sywzbhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.sywzsjclzUnit])) {
+			// 	callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
+			// }
 		},
 		onTableRegentZlSubmit(zlIndex, data) {
 			if (data.key === 'sywzbhphSub') {
 				this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('sywzbhphSubType', data.selectInfo.selectType)
 				this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('sywzbhphSubKcdw', data.selectInfo.row.kcdw)
-				this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('sywzmcSub', data.selectInfo.row.mc)
+				this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('sywzbhphSubNddw', data.selectInfo.row.nddw)
+				this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('sywzmcSub', data.selectInfo.row.mc||'NA')
 			}
 			if (data.key === 'rjbhphSub') {
 				this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('rjbhphSubType', data.selectInfo.selectType)
 				this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('rjbhphSubKcdw', data.selectInfo.row.kcdw)
-				this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('rjmc', data.selectInfo.row.mc)
+				this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('rjbhphSubNddw', data.selectInfo.row.nddw)
+				this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('rjmc', data.selectInfo.row.mc||'NA')
 			}
 		},
 		//新增质量