From 32472c89b05f4ae25890df20d47a69280d5fbb87 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 18 Jun 2025 19:06:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82-=E6=B7=BB=E5=8A=A0=E5=8F=A3?=
 =?UTF-8?q?=E5=91=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/auxiliary-code.vue             | 12 +++++-
 .../components/package-unit.vue               | 39 +++++++++++++++----
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue b/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
index eeaf67c..6161243 100644
--- a/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
@@ -44,6 +44,11 @@
 					<span v-else style="color: #c0c4cf">请选择</span>
 				</template>
 			</vxe-column>
+			<vxe-column field="taste" title="口味">
+				<template #default="{ row }">
+					{{ computedSmErpUnitEntityList?.find((item: rowVU) => item.id === row.unitId)?.taste }}
+				</template>
+			</vxe-column>
 			<vxe-column field="barCode" title="辅助条码" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 				<template #edit="{ row }">
 					<el-input v-model.trim="row.barCode" />
@@ -63,6 +68,7 @@ export interface rowVC {
 	unitId: string
 	unit: string
 	barCode: string
+	taste: string
 	isNew?: boolean
 }
 
@@ -72,6 +78,7 @@ const auxiliaryCodeList = defineModel("modelValue", {
 			id: nanoid(5),
 			unitId: "",
 			unit: "",
+			taste: "",
 			barCode: "",
 		},
 	],
@@ -102,6 +109,7 @@ const pushEvent = () => {
 		unitId: "",
 		unit: "",
 		barCode: "",
+		taste: "",
 		isNew: true,
 	}
 	auxiliaryCodeList.value.push(newRow)
@@ -128,7 +136,9 @@ const computedSmErpUnitEntityList = computed(() => props.smErpUnitEntityList?.fi
 
 // 包装单位下拉选择变化
 const handleUnitIdChange = (unitId: string, rowIndex: number) => {
-	;(auxiliaryCodeList.value[rowIndex] as any).unit = computedSmErpUnitEntityList.value?.find((item: rowVU) => item.id == unitId)?.unit
+	const unitItem = computedSmErpUnitEntityList.value?.find((item: rowVU) => item.id == unitId)
+	;(auxiliaryCodeList.value[rowIndex] as any).unit = unitItem?.unit
+	;(auxiliaryCodeList.value[rowIndex] as any).taste = unitItem?.taste
 }
 
 // 删除选中的行
diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index e9f8190..ab29d47 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -56,14 +56,14 @@
 			</vxe-column>
 			<vxe-column field="unit" title="单位名称" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 				<template #edit="{ row }">
-					<el-input v-model.trim="row.unit" />
+					<el-input v-model.trim="row.unit" @input="(value: string | number) => handleUnitInput(row, value)" />
+				</template>
+			</vxe-column>
+			<vxe-column field="taste" title="口味" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+				<template #edit="{ row }">
+					<el-input v-model.trim="row.taste" @input="(value: string | number) => handleTasteInput(row, value)" />
 				</template>
 			</vxe-column>
-      <vxe-column field="taste" title="口味" :edit-render="{ autoFocus: 'input', placeholder: '请输入口味' }">
-        <template #edit="{ row }">
-          <el-input v-model.trim="row.taste" />
-        </template>
-      </vxe-column>
 			<vxe-column field="status" title="状态" :edit-render="{}">
 				<template #edit="{ row }">
 					<el-select v-model="row.status">
@@ -108,6 +108,7 @@
 
 <script setup lang="ts">
 import { nanoid } from "nanoid"
+import { useMessage } from "/@/hooks/message"
 
 export interface rowVU {
 	id: string
@@ -123,7 +124,7 @@ export interface rowVU {
 	isNew?: boolean
 	isBase?: boolean | null
 	flag?: string
-  taste?: string
+	taste?: string
 }
 
 const packageUnitList = defineModel<rowVU[]>("modelValue", {
@@ -139,6 +140,7 @@ const packageUnitList = defineModel<rowVU[]>("modelValue", {
 			retailPrice: 0.01,
 			promotionPrice: 0,
 			costPrice: 0,
+			taste: "",
 		},
 	],
 })
@@ -172,6 +174,7 @@ const pushEvent = (row?: rowVU | undefined) => {
 			retailPrice: 0.01,
 			promotionPrice: 0,
 			costPrice: 0,
+			taste: "",
 			isNew: true,
 		}
 		Object.assign(newRow, row)
@@ -229,6 +232,28 @@ const editableTableValidate = async () => {
 	}
 }
 
+// 口味字段值改变
+const handleTasteInput = (row: rowVU, value: string | number) => {
+	if (
+		packageUnitList.value.filter((item: rowVU) => item.id != row.id && item.unit == row.unit).some((item: rowVU) => item.taste == value)
+	) {
+		useMessage().warning("该包装单位的口味已存在")
+		return false
+	}
+	return true
+}
+
+// 单位字段值改变
+const handleUnitInput = (row: rowVU, value: string | number) => {
+	if (
+		packageUnitList.value.filter((item: rowVU) => item.id != row.id && item.unit == row.unit).some((item: rowVU) => item.taste == row.taste)
+	) {
+		useMessage().warning("该包装单位的口味已存在")
+		return false
+	}
+	return true
+}
+
 defineExpose({
 	editableTableValidate,
 	getRadioRow,