From f5b0ef4d83c11c38e03dfb558f327fab1a3f39fb Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Mon, 30 Mar 2026 18:58:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86]GSP00?=
 =?UTF-8?q?5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/template/comps/gsp/GSP005.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/business/comps/template/comps/gsp/GSP005.vue b/src/views/business/comps/template/comps/gsp/GSP005.vue
index f0ef8ab..e04add6 100644
--- a/src/views/business/comps/template/comps/gsp/GSP005.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP005.vue
@@ -701,7 +701,7 @@ export default {
 				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 			//溶剂编号/批号
-			if (key === "rjbhphSub" && !isCommonUnit(selectData.row.nddw, [formFields.rjsjndUnit])) {
+			if (key === "rjbhphSub" && selectData.row.kcdw!==formFields.rjsjtjUnit) {
 				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 		},
@@ -724,13 +724,13 @@ export default {
 			const { selectData, callback, key, formFields } = data;
 			debugger
 			//溶剂编号/批号
-			if (key === "rjbhphSub" && !isCommonUnit(selectData.row.nddw, [formFields.rjsjndUnit])) {
+			if (key === "rjbhphSub" && selectData.row.kcdw!==formFields.rjsjtjUnit) {
+				callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
+			}
+			//试验物质编号/批号
+			if (key === "sywzbhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.sywzsjclzUnit])) {
 				callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
-			// //试验物质编号/批号
-			// if (key === "sywzbhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.sywzsjclzUnit])) {
-			// 	callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
-			// }
 		},
 		onTableRegentZlSubmit(zlIndex, data) {
 			if (data.key === 'sywzbhphSub') {
@@ -892,6 +892,7 @@ export default {
 				if (tableListZl && tableListZl.length > 0) {
 					for (let i = 0; i < tableListZl.length; i++) {
 						let item = tableListZl[i]
+						debugger
 						tmpResource.push({
 							mc: item.targetName,
 							bh: item.targetCode + item.targetCodeSn,