From f1669fb8432c6c875b7653b3481b46d6f39c5830 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 12 Jun 2025 17:42:42 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=96=B0=E5=A2=9E=E6=97=B6=E8=BE=85=E5=8A=A9?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarketSpu/components/auxiliary-code.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue b/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
index 2ff4fa9..16db13a 100644
--- a/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
@@ -31,11 +31,11 @@
 			<vxe-column type="checkbox" width="40" fixed="left" />
 			<vxe-column type="seq" width="50" fixed="left" />
 			<vxe-column field="unit" title="单位" :edit-render="{}">
-				<template #edit="{ row }">
-					<el-select v-model="row.unitId">
-						<div v-for="item in computedSmErpUnitEntityList">
+				<template #edit="{ row, $rowIndex }">
+					<el-select v-model="row.unitId" @change="handleUnitIdChange(row.unitId, $rowIndex)">
+						<template v-for="item in computedSmErpUnitEntityList">
 							<el-option :label="item.unit" :value="item.id" />
-						</div>
+						</template>
 					</el-select>
 				</template>
 				<template #default="{ row }">
@@ -63,6 +63,7 @@ import { type rowVU } from "./package-unit.vue"
 export interface rowVC {
 	id: string
 	unitId: string
+	unit: string
 	barCode: string
 	isNew?: boolean
 }
@@ -72,6 +73,7 @@ const auxiliaryCodeList = defineModel("modelValue", {
 		{
 			id: nanoid(5),
 			unitId: "",
+			unit: "",
 			barCode: "",
 		},
 	],
@@ -100,6 +102,7 @@ const pushEvent = () => {
 	const newRow: rowVC = {
 		id: nanoid(5),
 		unitId: "",
+		unit: "",
 		barCode: "",
 		isNew: true,
 	}
@@ -125,6 +128,11 @@ watch(
 // 计算辅助条码中可选择的包装单位下拉菜单
 const computedSmErpUnitEntityList = computed(() => props.smErpUnitEntityList?.filter((item: rowVU) => item.unit))
 
+// 包装单位下拉选择变化
+const handleUnitIdChange = (unitId: string, rowIndex: number) => {
+	;(auxiliaryCodeList.value[rowIndex] as any).unit = computedSmErpUnitEntityList.value?.find((item: rowVU) => item.id == unitId)?.unit
+}
+
 // 删除选中的行
 const removeSelectRowEvent = () => {
 	const $table = editableTableRef.value

From bd0e9c3dd2c2079bf7ab1b1f69832e9d634660f3 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 12 Jun 2025 17:58:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=BE=85=E5=8A=A9=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E9=87=8D=E5=A4=8D=E9=80=89=E6=8B=A9=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=B9=B6=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useUniqueField.ts                   | 37 +++++++++++++++++++
 .../components/auxiliary-code.vue             | 18 +++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 src/hooks/useUniqueField.ts

diff --git a/src/hooks/useUniqueField.ts b/src/hooks/useUniqueField.ts
new file mode 100644
index 0000000..f16afde
--- /dev/null
+++ b/src/hooks/useUniqueField.ts
@@ -0,0 +1,37 @@
+import { Ref, ref, watchEffect } from "vue"
+
+const useUniqueField = <T>(items: Ref<T[]>, field: Ref<keyof T> | string) => {
+	const isUnique = ref(true)
+	const errorMessage = ref("")
+
+	watchEffect(() => {
+		try {
+			const seen = new Set()
+			isUnique.value = true
+			errorMessage.value = ""
+
+			// 处理非响应式的字段名
+			const fieldKey = typeof field === "object" ? field.value : field
+
+			for (const item of items.value) {
+				const value = item[fieldKey as keyof T]
+
+				// 处理 undefined/null 的特殊情况
+				const key = value === null ? "NULL" : value === undefined ? "UNDEFINED" : value
+
+				if (seen.has(key)) {
+					isUnique.value = false
+					errorMessage.value = `字段 "${String(fieldKey)}" 存在重复值`
+					break
+				}
+				seen.add(key)
+			}
+		} catch (error: any) {
+			errorMessage.value = `验证失败: ${error.message}`
+		}
+	})
+
+	return { isUnique, errorMessage }
+}
+
+export default useUniqueField
diff --git a/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue b/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
index 16db13a..74dd8f4 100644
--- a/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
@@ -130,6 +130,11 @@ const computedSmErpUnitEntityList = computed(() => props.smErpUnitEntityList?.fi
 
 // 包装单位下拉选择变化
 const handleUnitIdChange = (unitId: string, rowIndex: number) => {
+	nextTick(() => {
+		if (!isFieldUnique(auxiliaryCodeList.value, "unit")) {
+			useMessage().error("包装单位重复")
+		}
+	})
 	;(auxiliaryCodeList.value[rowIndex] as any).unit = computedSmErpUnitEntityList.value?.find((item: rowVU) => item.id == unitId)?.unit
 }
 
@@ -144,6 +149,19 @@ const removeSelectRowEvent = () => {
 	}
 }
 
+// 判断辅助条码是否重复
+const isFieldUnique = (arr: any[], field: string) => {
+	const seen = new Set()
+	for (const item of arr) {
+		const value = item[field]
+		if (seen.has(value)) {
+			return false
+		}
+		seen.add(value)
+	}
+	return true
+}
+
 // 校验可编辑表格 成功返回 true 失败返回 false
 // const editableTableValidate = async () => {
 // 	// 全量校验

From 658380c60d2953fab42963f3bda3b90adf4f9635 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 13 Jun 2025 09:30:20 +0800
Subject: [PATCH 3/3]

---
 src/hooks/useUniqueField.ts                   | 37 -------------------
 .../components/auxiliary-code.vue             | 18 ---------
 .../supermarketerp/supermarketSpu/form.vue    |  2 +-
 3 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 src/hooks/useUniqueField.ts

diff --git a/src/hooks/useUniqueField.ts b/src/hooks/useUniqueField.ts
deleted file mode 100644
index f16afde..0000000
--- a/src/hooks/useUniqueField.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Ref, ref, watchEffect } from "vue"
-
-const useUniqueField = <T>(items: Ref<T[]>, field: Ref<keyof T> | string) => {
-	const isUnique = ref(true)
-	const errorMessage = ref("")
-
-	watchEffect(() => {
-		try {
-			const seen = new Set()
-			isUnique.value = true
-			errorMessage.value = ""
-
-			// 处理非响应式的字段名
-			const fieldKey = typeof field === "object" ? field.value : field
-
-			for (const item of items.value) {
-				const value = item[fieldKey as keyof T]
-
-				// 处理 undefined/null 的特殊情况
-				const key = value === null ? "NULL" : value === undefined ? "UNDEFINED" : value
-
-				if (seen.has(key)) {
-					isUnique.value = false
-					errorMessage.value = `字段 "${String(fieldKey)}" 存在重复值`
-					break
-				}
-				seen.add(key)
-			}
-		} catch (error: any) {
-			errorMessage.value = `验证失败: ${error.message}`
-		}
-	})
-
-	return { isUnique, errorMessage }
-}
-
-export default useUniqueField
diff --git a/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue b/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
index 74dd8f4..16db13a 100644
--- a/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
@@ -130,11 +130,6 @@ const computedSmErpUnitEntityList = computed(() => props.smErpUnitEntityList?.fi
 
 // 包装单位下拉选择变化
 const handleUnitIdChange = (unitId: string, rowIndex: number) => {
-	nextTick(() => {
-		if (!isFieldUnique(auxiliaryCodeList.value, "unit")) {
-			useMessage().error("包装单位重复")
-		}
-	})
 	;(auxiliaryCodeList.value[rowIndex] as any).unit = computedSmErpUnitEntityList.value?.find((item: rowVU) => item.id == unitId)?.unit
 }
 
@@ -149,19 +144,6 @@ const removeSelectRowEvent = () => {
 	}
 }
 
-// 判断辅助条码是否重复
-const isFieldUnique = (arr: any[], field: string) => {
-	const seen = new Set()
-	for (const item of arr) {
-		const value = item[field]
-		if (seen.has(value)) {
-			return false
-		}
-		seen.add(value)
-	}
-	return true
-}
-
 // 校验可编辑表格 成功返回 true 失败返回 false
 // const editableTableValidate = async () => {
 // 	// 全量校验
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 22a8966..b06d4b1 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -224,7 +224,7 @@ const usePackageUnitList = () => {
 		item.retailPrice = storePrice(item.retailPrice)
 		if (item.isNew) {
 			item.id = ""
-			// delete item.isNew
+			delete item.isNew
 		}
 		return item
 	})