From e82a191e374321d8a30ffadef7078daf0112b4e0 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 19 Aug 2025 12:44:37 +0800
Subject: [PATCH 01/15] =?UTF-8?q?1.other.ts=E5=A2=9E=E5=8A=A0application/o?=
 =?UTF-8?q?ctet-stream=E7=99=BD=E5=90=8D=E5=8D=95=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=A3=E5=91=B3=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/supermarketerp/smErpTasteStock.ts     |  41 +++++++
 src/utils/other.ts                            |   3 +-
 .../supermarketerp/smErpTasteStock/form.vue   | 111 +++++++++++++++++
 .../supermarketerp/smErpTasteStock/index.vue  | 115 ++++++++++++++++++
 4 files changed, 269 insertions(+), 1 deletion(-)
 create mode 100644 src/api/supermarketerp/smErpTasteStock.ts
 create mode 100644 src/views/supermarketerp/smErpTasteStock/form.vue
 create mode 100644 src/views/supermarketerp/smErpTasteStock/index.vue

diff --git a/src/api/supermarketerp/smErpTasteStock.ts b/src/api/supermarketerp/smErpTasteStock.ts
new file mode 100644
index 0000000..bc697f4
--- /dev/null
+++ b/src/api/supermarketerp/smErpTasteStock.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/supermarket/smErpTasteStock/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/supermarket/smErpTasteStock',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/supermarket/smErpTasteStock/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/supermarket/smErpTasteStock',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/supermarket/smErpTasteStock',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/utils/other.ts b/src/utils/other.ts
index ca381da..6d95f83 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -352,8 +352,9 @@ export function handleBlobFile(response: any, fileName: string) {
 		"text/plain",
 		"image/jpeg",
 		"image/png",
+		// "application/zip" // 添加 ZIP 文件类型支持
+		"application/octet-stream"
 	]
-
 	if (!allowedTypes.includes(blob.type) && blob.type !== "") {
 		useMessage().error("不支持的文件类型")
 		return
diff --git a/src/views/supermarketerp/smErpTasteStock/form.vue b/src/views/supermarketerp/smErpTasteStock/form.vue
new file mode 100644
index 0000000..1e39acf
--- /dev/null
+++ b/src/views/supermarketerp/smErpTasteStock/form.vue
@@ -0,0 +1,111 @@
+<template>
+    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+      :close-on-click-modal="false" draggable>
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+       <el-row :gutter="24">
+    <el-col :span="12" class="mb20">
+      <el-form-item label="商品SPU ID" prop="spuId">
+        <el-input v-model="form.spuId" placeholder="请输入商品SPU ID"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="口味名称" prop="taste">
+        <el-input v-model="form.taste" placeholder="请输入口味名称"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="该口味的库存数量" prop="stock">
+        <el-input v-model="form.stock" placeholder="请输入该口味的库存数量"/>
+      </el-form-item>
+      </el-col>
+
+			</el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="SmErpTasteStockDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/supermarketerp/smErpTasteStock'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  spuId: '',
+	  taste: '',
+	  stock: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取smErpTasteStock信息
+  if (id) {
+    form.id = id
+    getsmErpTasteStockData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {});
+	if (!valid) return false;
+
+	try {
+    loading.value = true;
+		form.id ? await putObj(form) : await addObj(form);
+		useMessage().success(form.id ? '修改成功' : '添加成功');
+		visible.value = false;
+		emit('refresh');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getsmErpTasteStockData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
diff --git a/src/views/supermarketerp/smErpTasteStock/index.vue b/src/views/supermarketerp/smErpTasteStock/index.vue
new file mode 100644
index 0000000..a09fd06
--- /dev/null
+++ b/src/views/supermarketerp/smErpTasteStock/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'supermarket_smErpTasteStock_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'supermarket_smErpTasteStock_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'supermarket_smErpTasteStock_export'"
+                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border
+        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+          <el-table-column prop="spuId" label="商品SPU ID"  show-overflow-tooltip/>
+          <el-table-column prop="taste" label="口味名称"  show-overflow-tooltip/>
+          <el-table-column prop="stock" label="该口味的库存数量"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpTasteStock_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'supermarket_smErpTasteStock_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemSmErpTasteStock">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/supermarketerp/smErpTasteStock";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/supermarket/smErpTasteStock/export', Object.assign(state.queryForm, { ids: selectObjs }), 'smErpTasteStock.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

From 2a82e97cfea36dc83bd4d8b603b57c9887d42f8f Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 19 Aug 2025 16:46:03 +0800
Subject: [PATCH 02/15] =?UTF-8?q?feat:=E5=BA=93=E5=AD=98=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=8F=A3=E5=91=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarketSpu/components/taste-stock.vue | 89 +++++++++++++++++++
 .../supermarketerp/supermarketSpu/form.vue    | 18 +++-
 2 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 src/views/supermarketerp/supermarketSpu/components/taste-stock.vue

diff --git a/src/views/supermarketerp/supermarketSpu/components/taste-stock.vue b/src/views/supermarketerp/supermarketSpu/components/taste-stock.vue
new file mode 100644
index 0000000..8b5a7ba
--- /dev/null
+++ b/src/views/supermarketerp/supermarketSpu/components/taste-stock.vue
@@ -0,0 +1,89 @@
+<template>
+	<el-row class="mb-2">
+		<el-button type="primary" @click="pushEvent">新增</el-button>
+	</el-row>
+
+	<vxe-table
+		ref="tableRef"
+		show-overflow
+		max-height="340"
+		height="340"
+		:edit-rules="validRules"
+		:column-config="{ resizable: true }"
+		:row-config="{ isHover: true }"
+		:resizable-config="{ dragMode: 'fixed' }"
+		:data="smErpTasteStockEntityList"
+		:edit-config="{
+					trigger: 'click',
+					mode: 'cell',
+					beforeEditMethod({ row, column }:any) {
+						// 禁止编辑
+						if (column.property === '') {
+							return false
+						}
+						return true
+					},
+				}"
+		size="mini"
+		align="center"
+	>
+		<vxe-column type="seq" width="50" fixed="left" />
+		<vxe-column field="tasteName" title="口味" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+			<template #edit="{ row }">
+				<el-input v-model.trim="row.tasteName" />
+			</template>
+		</vxe-column>
+		<vxe-column field="stock" title="库存" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+			<template #edit="{ row }">
+				<el-input-number v-model.trim="row.stock" :min="0" :precision="2" />
+			</template>
+		</vxe-column>
+		<vxe-column title="操作">
+			<template #default="scope">
+				<el-popconfirm title="是否删除?" @confirm="removeRow(scope.$rowIndex)">
+					<template #reference><el-button size="small">删除</el-button></template>
+				</el-popconfirm>
+			</template>
+		</vxe-column>
+	</vxe-table>
+</template>
+
+<script setup lang="ts">
+import { nanoid } from "nanoid"
+
+type Row = {
+	id: string
+	tasteName: string
+	stock: number
+}
+
+const smErpTasteStockEntityList = defineModel<any>("modelValue", { default: [] })
+
+const tableRef = ref()
+
+const validRules = {
+	tasteName: [{ required: true, message: "口味单位不能为空", trigger: "blur" }],
+	stock: [{ required: true, message: "库存不能为空", trigger: "blur" }],
+}
+
+// 底部新增行
+const pushEvent = () => {
+	const newRow: Row = {
+		id: "tmp_" + nanoid(5),
+		tasteName: "",
+		stock: 0,
+	}
+	smErpTasteStockEntityList.value.push(newRow)
+	nextTick(() => {
+		const $table = tableRef.value
+		if ($table) {
+			$table.setEditRow(newRow)
+		}
+	})
+}
+
+// 删除行
+const removeRow = (rowIndex: number) => {
+	smErpTasteStockEntityList.value.splice(rowIndex, 1)
+}
+</script>
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 2dd4b55..2725cc9 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -18,6 +18,9 @@
 				<el-tab-pane class="el-tab-pane" label="辅助条码" name="辅助条码">
 					<auxiliary-code v-model="form.smErpAuxiliaryCodeEntityList" :smErpUnitEntityList="form.smErpUnitEntityList" />
 				</el-tab-pane>
+				<el-tab-pane class="el-tab-pane" label="口味" name="口味">
+					<taste-stock v-model="form.smErpTasteStockEntityList" />
+				</el-tab-pane>
 			</el-tabs>
 		</el-form>
 
@@ -35,6 +38,7 @@ import BaseInfo from "./components/base-info.vue"
 import PackageUnit, { type rowVU } from "./components/package-unit.vue"
 import ProductInventory from "./components/product-inventory.vue"
 import AuxiliaryCode, { type rowVC } from "./components/auxiliary-code.vue"
+import TasteStock from "./components/taste-stock.vue"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/supermarketSpu"
 import { TabPaneName } from "element-plus"
 import { useMessage } from "/@/hooks/message"
@@ -47,7 +51,7 @@ const visible = ref(false)
 const loading = ref(false)
 const formRef = ref()
 const packageUnitRef = ref()
-const tabPaneName = ["基础信息", "包装单位", "库存", "辅助条码"]
+const tabPaneName = ["基础信息", "包装单位", "库存", "辅助条码", "口味"]
 const tabPaneActiveName = ref(tabPaneName[0])
 const tabPaneActiveIndex = ref(0)
 
@@ -71,6 +75,7 @@ const form = reactive<any>({
 	grossMargin: 0,
 	smErpUnitEntityList: [],
 	smErpAuxiliaryCodeEntityList: [],
+	smErpTasteStockEntityList: [],
 
 	barCode: "",
 	spec: "",
@@ -254,6 +259,15 @@ const settleAuxiliaryCode = () => {
 		})
 }
 
+// 整理辅助条码列表
+const settleSmErpTasteStockEntityList = () => {
+	const smErpTasteStockEntityList = [...form.smErpTasteStockEntityList]
+	return smErpTasteStockEntityList.map((item: rowVC) => {
+		if (item.id.startsWith("tmp_")) item.id = ""
+		return item
+	})
+}
+
 // 提交
 const onSubmit = async () => {
 	const valid = await formRef.value.validate().catch(() => {})
@@ -264,6 +278,7 @@ const onSubmit = async () => {
 
 	const smErpAuxiliaryCodeEntityList = settleAuxiliaryCode()
 	const smErpUnitEntityList = settlePackageUnitList()
+	const smErpTasteStockEntityList = settleSmErpTasteStockEntityList()
 	try {
 		loading.value = true
 		const _pa = {
@@ -271,6 +286,7 @@ const onSubmit = async () => {
 			...formatedStorePrice.value,
 			smErpAuxiliaryCodeEntityList,
 			smErpUnitEntityList,
+			smErpTasteStockEntityList,
 		}
 
 		// console.log("提交的数据", _pa)

From f39279bf8a6d756e8a280cc2a08aaf7387bffb87 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 20 Aug 2025 11:11:34 +0800
Subject: [PATCH 03/15] =?UTF-8?q?feat:=E5=BA=93=E5=AD=98=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=8F=A3=E5=91=B3=E7=9A=84=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/package-unit.vue               |  28 ++++-
 .../supermarketSpu/components/taste-form.vue  | 104 ++++++++++++++++++
 .../supermarketerp/supermarketSpu/form.vue    |  24 ++--
 3 files changed, 146 insertions(+), 10 deletions(-)
 create mode 100644 src/views/supermarketerp/supermarketSpu/components/taste-form.vue

diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index 3335357..29479f6 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -10,8 +10,9 @@
 					</p>
 				</el-alert>
 			</template>
-			<el-icon class="text-xl my-auto ml-4 text-yellow-600"><WarningFilled /></el-icon>
+			<el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
 		</el-tooltip>
+		<el-button type="primary" @click="tasteFormRef.openDialog()">新增口味</el-button>
 	</el-row>
 
 	<vxe-table
@@ -57,9 +58,20 @@
 				<el-input v-model.trim="slotParams.row.unit" @input="slotInputChange(slotParams)" />
 			</template>
 		</vxe-column>
-		<vxe-column field="taste" title="口味" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-			<template #edit="slotParams">
+		<vxe-column field="tasteId" title="口味" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+			<!-- <template #edit="slotParams">
 				<el-input v-model.trim="slotParams.row.taste" @input="slotInputChange(slotParams)" />
+			</template> -->
+			<template #default="{ row }">
+				{{ tasteList?.find((item) => item.id === row.tasteId)?.tasteName || "" }}
+			</template>
+			<template #edit="{ row }">
+				<el-select v-model="row.tasteId" placeholder="请选择包装单位">
+					<el-option v-for="item in tasteList" :key="item.id" :label="item.tasteName" :value="item.id">
+						<span class="float-left">口味:{{ item.tasteName }}</span>
+						<span class="float-right ml-4">库存:{{ item.stock }}</span>
+					</el-option>
+				</el-select>
 			</template>
 		</vxe-column>
 		<vxe-column field="status" title="状态" :edit-render="{}">
@@ -108,11 +120,14 @@
 			</template>
 		</vxe-column>
 	</vxe-table>
+
+	<taste-form ref="tasteFormRef" v-model="tasteList" />
 </template>
 
 <script setup lang="ts">
 import { VxeTablePropTypes } from "vxe-table"
 import { nanoid } from "nanoid"
+import TasteForm from "./taste-form.vue"
 
 export interface rowVU {
 	id: string
@@ -130,10 +145,17 @@ export interface rowVU {
 	flag?: string
 	taste?: string
 }
+export interface TasteItem {
+	id: string
+	tasteName: string
+	stock: number
+}
 
 const packageUnitList = defineModel<rowVU[]>("modelValue", { default: [] })
+const tasteList = defineModel<TasteItem[]>("tasteList", { default: [] })
 
 const tableRef = ref()
+const tasteFormRef = ref()
 
 const validRules = ref<VxeTablePropTypes.EditRules<rowVU>>({
 	barCode: [{ required: true, message: "不能为空" }],
diff --git a/src/views/supermarketerp/supermarketSpu/components/taste-form.vue b/src/views/supermarketerp/supermarketSpu/components/taste-form.vue
new file mode 100644
index 0000000..26e66dd
--- /dev/null
+++ b/src/views/supermarketerp/supermarketSpu/components/taste-form.vue
@@ -0,0 +1,104 @@
+<template>
+	<el-dialog width="60%" title="新增口味" v-model="visible" :close-on-click-modal="false" draggable destroy-on-close>
+		<el-row class="mb-2">
+			<el-button type="primary" @click="pushEvent">新增</el-button>
+		</el-row>
+
+		<vxe-table
+			ref="tableRef"
+			show-overflow
+			max-height="340"
+			height="340"
+			:edit-rules="validRules"
+			:column-config="{ resizable: true }"
+			:row-config="{ isHover: true }"
+			:resizable-config="{ dragMode: 'fixed' }"
+			:data="tasteList || []"
+			:edit-config="{
+					trigger: 'click',
+					mode: 'cell',
+					beforeEditMethod({ row, column }:any) {
+						// 禁止编辑
+						if (column.property === '') {
+							return false
+						}
+						return true
+					},
+				}"
+			size="mini"
+			align="center"
+		>
+			<vxe-column type="seq" width="50" fixed="left" />
+			<vxe-column field="tasteName" title="口味" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+				<template #edit="{ row }">
+					<el-input v-model.trim="row.tasteName" />
+				</template>
+			</vxe-column>
+			<vxe-column field="stock" title="库存" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+				<template #edit="{ row }">
+					<el-input-number v-model.trim="row.stock" :min="0" :precision="2" />
+				</template>
+			</vxe-column>
+			<vxe-column title="操作">
+				<template #default="scope">
+					<el-popconfirm title="是否删除?" @confirm="removeRow(scope.$rowIndex)">
+						<template #reference><el-button size="small">删除</el-button></template>
+					</el-popconfirm>
+				</template>
+			</vxe-column>
+		</vxe-table>
+
+		<template #footer>
+			<el-button @click="visible = false">取消</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts">
+import { nanoid } from "nanoid"
+
+type Row = {
+	id: string
+	tasteName: string
+	stock: number
+}
+
+const tasteList = defineModel<any>("modelValue", { default: [] })
+
+const tableRef = ref()
+const visible = ref(false)
+
+const validRules = {
+	tasteName: [{ required: true, message: "口味单位不能为空", trigger: "blur" }],
+	stock: [{ required: true, message: "库存不能为空", trigger: "blur" }],
+}
+
+// 底部新增行
+const pushEvent = () => {
+	const newRow: Row = {
+		id: "tmp_" + nanoid(5),
+		tasteName: "",
+		stock: 0,
+	}
+	tasteList.value.push(newRow)
+	nextTick(() => {
+		const $table = tableRef.value
+		if ($table) {
+			$table.setEditRow(newRow)
+		}
+	})
+}
+
+// 删除行
+const removeRow = (rowIndex: number) => {
+	tasteList.value.splice(rowIndex, 1)
+}
+
+const openDialog = (id: string) => {
+	visible.value = true
+}
+
+defineExpose({
+	openDialog,
+})
+</script>
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 2725cc9..2e0d703 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -6,7 +6,7 @@
 					<base-info v-model="form" />
 				</el-tab-pane>
 				<el-tab-pane class="el-tab-pane" label="包装单位" name="包装单位">
-					<package-unit ref="packageUnitRef" v-model="form.smErpUnitEntityList" />
+					<package-unit ref="packageUnitRef" v-model="form.smErpUnitEntityList" v-model:tasteList="form.smErpTasteStockEntityList" />
 				</el-tab-pane>
 				<el-tab-pane class="el-tab-pane" label="库存" name="库存">
 					<product-inventory
@@ -18,9 +18,6 @@
 				<el-tab-pane class="el-tab-pane" label="辅助条码" name="辅助条码">
 					<auxiliary-code v-model="form.smErpAuxiliaryCodeEntityList" :smErpUnitEntityList="form.smErpUnitEntityList" />
 				</el-tab-pane>
-				<el-tab-pane class="el-tab-pane" label="口味" name="口味">
-					<taste-stock v-model="form.smErpTasteStockEntityList" />
-				</el-tab-pane>
 			</el-tabs>
 		</el-form>
 
@@ -38,8 +35,8 @@ import BaseInfo from "./components/base-info.vue"
 import PackageUnit, { type rowVU } from "./components/package-unit.vue"
 import ProductInventory from "./components/product-inventory.vue"
 import AuxiliaryCode, { type rowVC } from "./components/auxiliary-code.vue"
-import TasteStock from "./components/taste-stock.vue"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/supermarketSpu"
+import { fetchList } from "/@/api/supermarketerp/smErpTasteStock"
 import { TabPaneName } from "element-plus"
 import { useMessage } from "/@/hooks/message"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
@@ -51,7 +48,7 @@ const visible = ref(false)
 const loading = ref(false)
 const formRef = ref()
 const packageUnitRef = ref()
-const tabPaneName = ["基础信息", "包装单位", "库存", "辅助条码", "口味"]
+const tabPaneName = ["基础信息", "包装单位", "库存", "辅助条码"]
 const tabPaneActiveName = ref(tabPaneName[0])
 const tabPaneActiveIndex = ref(0)
 
@@ -185,6 +182,8 @@ const openDialog = async (id: string) => {
 
 		// 设置基础包装单位的单选行
 		packageUnitRef.value.setRadioRow(form.smErpUnitEntityList.findIndex((item: any) => item.isBase))
+
+		await getAllTasteList(id)
 	}
 }
 
@@ -219,11 +218,22 @@ const getsupermarketSpuData = async (id: string) => {
 	}
 }
 
+// 获取全部口味
+const getAllTasteList = async (spuId: string) => {
+	const { code, data, msg } = await fetchList({ spuId, current: 1, size: 1000 })
+	if (code !== 0) {
+		form.smErpTasteStockEntityList = []
+		return useMessage().error(msg)
+	}
+	form.smErpTasteStockEntityList = data.records ?? []
+}
+
 // 重置表单数据
 const resetForm = () => {
 	formRef.value?.resetFields()
 	form.smErpUnitEntityList = []
 	form.smErpAuxiliaryCodeEntityList = []
+	form.smErpTasteStockEntityList = []
 }
 
 // 整理包装单位列表
@@ -259,7 +269,7 @@ const settleAuxiliaryCode = () => {
 		})
 }
 
-// 整理辅助条码列表
+// 整理口味
 const settleSmErpTasteStockEntityList = () => {
 	const smErpTasteStockEntityList = [...form.smErpTasteStockEntityList]
 	return smErpTasteStockEntityList.map((item: rowVC) => {

From ff3a47dcabca55474da66af7d91d25fad04895ff Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 20 Aug 2025 15:36:08 +0800
Subject: [PATCH 04/15] =?UTF-8?q?feat:=E5=8F=A3=E5=91=B3=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/package-unit.vue               |  2 +
 .../supermarketSpu/components/taste-form.vue  | 55 ++++++++++--
 .../supermarketSpu/components/taste-stock.vue | 89 -------------------
 .../supermarketerp/supermarketSpu/form.vue    |  1 +
 4 files changed, 50 insertions(+), 97 deletions(-)
 delete mode 100644 src/views/supermarketerp/supermarketSpu/components/taste-stock.vue

diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index 29479f6..eed0c61 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -144,6 +144,7 @@ export interface rowVU {
 	isBase?: boolean | null
 	flag?: string
 	taste?: string
+	tasteId: string
 }
 export interface TasteItem {
 	id: string
@@ -218,6 +219,7 @@ const pushEvent = (row?: rowVU | undefined) => {
 			promotionPrice: 0,
 			costPrice: 0,
 			taste: "",
+			tasteId: "",
 		}
 		Object.assign(newRow, row)
 	}
diff --git a/src/views/supermarketerp/supermarketSpu/components/taste-form.vue b/src/views/supermarketerp/supermarketSpu/components/taste-form.vue
index 26e66dd..7d8add1 100644
--- a/src/views/supermarketerp/supermarketSpu/components/taste-form.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/taste-form.vue
@@ -13,7 +13,7 @@
 			:column-config="{ resizable: true }"
 			:row-config="{ isHover: true }"
 			:resizable-config="{ dragMode: 'fixed' }"
-			:data="tasteList || []"
+			:data="tableTasteList"
 			:edit-config="{
 					trigger: 'click',
 					mode: 'cell',
@@ -30,8 +30,8 @@
 		>
 			<vxe-column type="seq" width="50" fixed="left" />
 			<vxe-column field="tasteName" title="口味" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-				<template #edit="{ row }">
-					<el-input v-model.trim="row.tasteName" />
+				<template #edit="slotParams">
+					<el-input v-model.trim="slotParams.row.tasteName" @input="slotInputChange(slotParams)" />
 				</template>
 			</vxe-column>
 			<vxe-column field="stock" title="库存" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
@@ -50,6 +50,7 @@
 
 		<template #footer>
 			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="onConfirm">确认</el-button>
 		</template>
 	</el-dialog>
 </template>
@@ -64,15 +65,36 @@ type Row = {
 }
 
 const tasteList = defineModel<any>("modelValue", { default: [] })
-
+const tableTasteList = ref<Row[]>([])
 const tableRef = ref()
 const visible = ref(false)
 
 const validRules = {
-	tasteName: [{ required: true, message: "口味单位不能为空", trigger: "blur" }],
+	tasteName: [
+		{ required: true, message: "口味单位不能为空", trigger: "blur" },
+		{
+			validator({ cellValue, row, rowIndex }: any) {
+				if (
+					cellValue &&
+					tableTasteList.value
+						.filter((item: Row, index: number) => rowIndex != index && item.tasteName == row.tasteName)
+						.some((v: Row) => v.tasteName == row.tasteName)
+				)
+					return new Error("该口味已存在")
+			},
+		},
+	],
 	stock: [{ required: true, message: "库存不能为空", trigger: "blur" }],
 }
 
+// 自定义编辑模板的input校验
+const slotInputChange = (slotParams: any) => {
+	const $table = tableRef.value
+	if ($table) {
+		$table.updateStatus(slotParams)
+	}
+}
+
 // 底部新增行
 const pushEvent = () => {
 	const newRow: Row = {
@@ -80,7 +102,7 @@ const pushEvent = () => {
 		tasteName: "",
 		stock: 0,
 	}
-	tasteList.value.push(newRow)
+	tableTasteList.value.push(newRow)
 	nextTick(() => {
 		const $table = tableRef.value
 		if ($table) {
@@ -91,11 +113,28 @@ const pushEvent = () => {
 
 // 删除行
 const removeRow = (rowIndex: number) => {
-	tasteList.value.splice(rowIndex, 1)
+	tableTasteList.value.splice(rowIndex, 1)
 }
 
-const openDialog = (id: string) => {
+const openDialog = () => {
 	visible.value = true
+	tableTasteList.value = tasteList.value ? [...tasteList.value] : []
+}
+
+// 提交
+const onConfirm = async () => {
+	const $table = tableRef.value
+	if ($table) {
+		const errMap = await $table.validate(true)
+		if (errMap) {
+			console.log("全量校验失败！", errMap)
+			return
+		} else {
+			console.log("全量校验成功！")
+			visible.value = false
+			tasteList.value = [...tableTasteList.value]
+		}
+	}
 }
 
 defineExpose({
diff --git a/src/views/supermarketerp/supermarketSpu/components/taste-stock.vue b/src/views/supermarketerp/supermarketSpu/components/taste-stock.vue
deleted file mode 100644
index 8b5a7ba..0000000
--- a/src/views/supermarketerp/supermarketSpu/components/taste-stock.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-	<el-row class="mb-2">
-		<el-button type="primary" @click="pushEvent">新增</el-button>
-	</el-row>
-
-	<vxe-table
-		ref="tableRef"
-		show-overflow
-		max-height="340"
-		height="340"
-		:edit-rules="validRules"
-		:column-config="{ resizable: true }"
-		:row-config="{ isHover: true }"
-		:resizable-config="{ dragMode: 'fixed' }"
-		:data="smErpTasteStockEntityList"
-		:edit-config="{
-					trigger: 'click',
-					mode: 'cell',
-					beforeEditMethod({ row, column }:any) {
-						// 禁止编辑
-						if (column.property === '') {
-							return false
-						}
-						return true
-					},
-				}"
-		size="mini"
-		align="center"
-	>
-		<vxe-column type="seq" width="50" fixed="left" />
-		<vxe-column field="tasteName" title="口味" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-			<template #edit="{ row }">
-				<el-input v-model.trim="row.tasteName" />
-			</template>
-		</vxe-column>
-		<vxe-column field="stock" title="库存" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-			<template #edit="{ row }">
-				<el-input-number v-model.trim="row.stock" :min="0" :precision="2" />
-			</template>
-		</vxe-column>
-		<vxe-column title="操作">
-			<template #default="scope">
-				<el-popconfirm title="是否删除?" @confirm="removeRow(scope.$rowIndex)">
-					<template #reference><el-button size="small">删除</el-button></template>
-				</el-popconfirm>
-			</template>
-		</vxe-column>
-	</vxe-table>
-</template>
-
-<script setup lang="ts">
-import { nanoid } from "nanoid"
-
-type Row = {
-	id: string
-	tasteName: string
-	stock: number
-}
-
-const smErpTasteStockEntityList = defineModel<any>("modelValue", { default: [] })
-
-const tableRef = ref()
-
-const validRules = {
-	tasteName: [{ required: true, message: "口味单位不能为空", trigger: "blur" }],
-	stock: [{ required: true, message: "库存不能为空", trigger: "blur" }],
-}
-
-// 底部新增行
-const pushEvent = () => {
-	const newRow: Row = {
-		id: "tmp_" + nanoid(5),
-		tasteName: "",
-		stock: 0,
-	}
-	smErpTasteStockEntityList.value.push(newRow)
-	nextTick(() => {
-		const $table = tableRef.value
-		if ($table) {
-			$table.setEditRow(newRow)
-		}
-	})
-}
-
-// 删除行
-const removeRow = (rowIndex: number) => {
-	smErpTasteStockEntityList.value.splice(rowIndex, 1)
-}
-</script>
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 2e0d703..03abb2d 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -248,6 +248,7 @@ const settlePackageUnitList = () => {
 			item.isBase = false
 		}
 		if (item.id.startsWith("tmp_")) item.id = ""
+		if (item.tasteId.startsWith("tmp_")) item.tasteId = ""
 		// 转换金额单位
 		item.costPrice = storePrice(item.costPrice)
 		item.promotionPrice = storePrice(item.promotionPrice)

From 6517d33d1c775c8b644b881c01a1943fcc8e9b01 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 20 Aug 2025 18:14:35 +0800
Subject: [PATCH 05/15] =?UTF-8?q?feat:=E5=8F=A3=E5=91=B3=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/package-unit.vue               | 43 ++++++++++++-------
 .../supermarketSpu/components/taste-form.vue  |  4 +-
 .../supermarketerp/supermarketSpu/form.vue    |  8 +++-
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index eed0c61..fffa8eb 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -65,8 +65,8 @@
 			<template #default="{ row }">
 				{{ tasteList?.find((item) => item.id === row.tasteId)?.tasteName || "" }}
 			</template>
-			<template #edit="{ row }">
-				<el-select v-model="row.tasteId" placeholder="请选择包装单位">
+			<template #edit="slotParams">
+				<el-select v-model="slotParams.row.tasteId" placeholder="请选择包装单位" @change="slotInputChange(slotParams)">
 					<el-option v-for="item in tasteList" :key="item.id" :label="item.tasteName" :value="item.id">
 						<span class="float-left">口味:{{ item.tasteName }}</span>
 						<span class="float-right ml-4">库存:{{ item.stock }}</span>
@@ -121,7 +121,7 @@
 		</vxe-column>
 	</vxe-table>
 
-	<taste-form ref="tasteFormRef" v-model="tasteList" />
+	<taste-form ref="tasteFormRef" v-model:tasteList="tasteList" />
 </template>
 
 <script setup lang="ts">
@@ -145,6 +145,7 @@ export interface rowVU {
 	flag?: string
 	taste?: string
 	tasteId: string
+	tasteName?: string
 }
 export interface TasteItem {
 	id: string
@@ -167,10 +168,10 @@ const validRules = ref<VxeTablePropTypes.EditRules<rowVU>>({
 				if (
 					cellValue &&
 					packageUnitList.value
-						.filter((item: rowVU, index: number) => rowIndex != index && item.taste == row.taste)
+						.filter((item: rowVU, index: number) => rowIndex != index && item.tasteId == row.tasteId)
 						.some((v: rowVU) => v.unit == row.unit)
 				)
-					return new Error("该包装单位的口味已存在")
+					return new Error("相同包装单位的口味不能相同")
 			},
 		},
 	],
@@ -178,16 +179,16 @@ const validRules = ref<VxeTablePropTypes.EditRules<rowVU>>({
 	packageNum: [{ required: true, message: "不能为空" }],
 	retailPrice: [{ required: true, type: "number", min: 0.01, message: "不能为0" }],
 	purchasePrice: [{ required: true, message: "不能为空" }],
-	taste: [
+	tasteId: [
 		{
 			validator({ cellValue, row, rowIndex }) {
 				if (
 					cellValue &&
 					packageUnitList.value
-						.filter((item: rowVU, index: number) => rowIndex != index && item.taste == row.taste)
+						.filter((item: rowVU, index: number) => rowIndex != index && item.tasteId == row.tasteId)
 						.some((v: rowVU) => v.unit == row.unit)
 				)
-					return new Error("该包装单位的口味已存在")
+					return new Error("相同包装单位的口味不能相同")
 			},
 		},
 	],
@@ -255,17 +256,27 @@ const getRadioRow = () => {
 }
 
 // 校验表格 成功返回 true 失败返回 false
-const tableValidate = async () => {
-	// 全量校验
+const tableValidate = async (filed?: string) => {
 	const $table = tableRef.value
 	if ($table) {
-		const errMap = await $table.validate(true)
-		if (errMap) {
-			console.log("全量校验失败！", errMap)
-			return false
+		if (filed) {
+			const errMap = await $table.validateField(packageUnitList.value, filed)
+			if (errMap) {
+				console.log("字段校验失败！", errMap)
+				return false
+			} else {
+				console.log("字段校验成功！")
+				return true
+			}
 		} else {
-			console.log("全量校验成功！")
-			return true
+			const errMap = await $table.validate(true)
+			if (errMap) {
+				console.log("全量校验失败！", errMap)
+				return false
+			} else {
+				console.log("全量校验成功！")
+				return true
+			}
 		}
 	}
 }
diff --git a/src/views/supermarketerp/supermarketSpu/components/taste-form.vue b/src/views/supermarketerp/supermarketSpu/components/taste-form.vue
index 7d8add1..4af2185 100644
--- a/src/views/supermarketerp/supermarketSpu/components/taste-form.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/taste-form.vue
@@ -41,7 +41,7 @@
 			</vxe-column>
 			<vxe-column title="操作">
 				<template #default="scope">
-					<el-popconfirm title="是否删除?" @confirm="removeRow(scope.$rowIndex)">
+					<el-popconfirm title="是否删除?" placement="right" @confirm="removeRow(scope.$rowIndex)">
 						<template #reference><el-button size="small">删除</el-button></template>
 					</el-popconfirm>
 				</template>
@@ -64,7 +64,7 @@ type Row = {
 	stock: number
 }
 
-const tasteList = defineModel<any>("modelValue", { default: [] })
+const tasteList = defineModel<any>("tasteList", { default: [] })
 const tableTasteList = ref<Row[]>([])
 const tableRef = ref()
 const visible = ref(false)
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 03abb2d..a2893be 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -248,7 +248,10 @@ const settlePackageUnitList = () => {
 			item.isBase = false
 		}
 		if (item.id.startsWith("tmp_")) item.id = ""
-		if (item.tasteId.startsWith("tmp_")) item.tasteId = ""
+		if (item.tasteId.startsWith("tmp_")) {
+			item.tasteName = form.smErpTasteStockEntityList.find((tasteItem: any) => tasteItem.id === item.tasteId).tasteName
+			item.tasteId = ""
+		}
 		// 转换金额单位
 		item.costPrice = storePrice(item.costPrice)
 		item.promotionPrice = storePrice(item.promotionPrice)
@@ -284,7 +287,8 @@ const onSubmit = async () => {
 	const valid = await formRef.value.validate().catch(() => {})
 	if (!valid) return useMessage().warning("基础信息或库存必填项未填写完整")
 	if (!form.smErpUnitEntityList || form.smErpUnitEntityList.length <= 0) return useMessage().warning("请添加包装单位")
-	if (!(await packageUnitRef.value.tableValidate())) return useMessage().warning("包装单位必填项未填写完整 且 相同包装单位的口味不能相同")
+	if (!(await packageUnitRef.value.tableValidate("tasteId"))) return useMessage().warning("相同包装单位的口味不能相同")
+	if (!(await packageUnitRef.value.tableValidate())) return useMessage().warning("包装单位必填项未填写完整")
 	if (!packageUnitRef.value.getRadioRow()) return useMessage().warning("请选择基础包装单位")
 
 	const smErpAuxiliaryCodeEntityList = settleAuxiliaryCode()

From 867cabdee891e996b3d4d6e73f020845bcb88171 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 21 Aug 2025 17:29:06 +0800
Subject: [PATCH 06/15] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=9C=AA=E6=B7=BB=E5=8A=A0=E5=8F=A3=E5=91=B3=E6=97=B6id?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/package-unit.vue               | 38 +++++++++----------
 .../supermarketerp/supermarketSpu/form.vue    | 20 ++--------
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index fffa8eb..9e985c3 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -143,7 +143,6 @@ export interface rowVU {
 	costPrice: number
 	isBase?: boolean | null
 	flag?: string
-	taste?: string
 	tasteId: string
 	tasteName?: string
 }
@@ -203,27 +202,24 @@ const slotInputChange = (slotParams: any) => {
 }
 
 // 底部新增行
-const pushEvent = (row?: rowVU | undefined) => {
-	const newRow = {} as rowVU
-	if (row) {
-		Object.assign(newRow, row)
-	} else {
-		row = {
-			id: "tmp_" + nanoid(5),
-			barCode: "",
-			spec: "",
-			unit: "",
-			status: "0",
-			packageNum: 1,
-			purchasePrice: 0,
-			retailPrice: 0.01,
-			promotionPrice: 0,
-			costPrice: 0,
-			taste: "",
-			tasteId: "",
-		}
-		Object.assign(newRow, row)
+const pushEvent = (flag?: "flag" | undefined) => {
+	const newRow: rowVU = {
+		id: "tmp_" + nanoid(5),
+		barCode: "",
+		spec: "",
+		unit: "",
+		status: "0",
+		packageNum: 1,
+		purchasePrice: 0,
+		retailPrice: 0.01,
+		promotionPrice: 0,
+		costPrice: 0,
+		tasteName: "",
+		tasteId: "",
 	}
+
+	if (flag) newRow.flag = "defaultPackageUnitRow"
+
 	packageUnitList.value.push(newRow)
 	nextTick(() => {
 		const $table = tableRef.value
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index a2893be..bc84556 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -147,20 +147,8 @@ const setDefaultPackageUnit = () => {
 	if (!form.id && tabPaneActiveIndex.value == 1) {
 		const isFlagRowExist = form.smErpUnitEntityList.some((item: rowVU) => item.flag === "defaultPackageUnitRow")
 		if (isFlagRowExist) return
-		const row = {
-			id: "tmp_" + nanoid(5),
-			barCode: form.barCode,
-			spec: form.spec,
-			unit: form.unit,
-			status: form.unitStatus,
-			packageNum: form.packageNum,
-			purchasePrice: form.purchasePrice,
-			retailPrice: form.retailPrice,
-			promotionPrice: form.promotionPrice,
-			costPrice: form.costPrice,
-			flag: "defaultPackageUnitRow",
-		}
-		packageUnitRef.value.pushEvent(row)
+
+		packageUnitRef.value.pushEvent("flag")
 		packageUnitRef.value.setRadioRow(0) // 自动设置基础包装单位的radio单选行
 	}
 }
@@ -248,7 +236,7 @@ const settlePackageUnitList = () => {
 			item.isBase = false
 		}
 		if (item.id.startsWith("tmp_")) item.id = ""
-		if (item.tasteId.startsWith("tmp_")) {
+		if (item.tasteId?.startsWith("tmp_")) {
 			item.tasteName = form.smErpTasteStockEntityList.find((tasteItem: any) => tasteItem.id === item.tasteId).tasteName
 			item.tasteId = ""
 		}
@@ -277,7 +265,7 @@ const settleAuxiliaryCode = () => {
 const settleSmErpTasteStockEntityList = () => {
 	const smErpTasteStockEntityList = [...form.smErpTasteStockEntityList]
 	return smErpTasteStockEntityList.map((item: rowVC) => {
-		if (item.id.startsWith("tmp_")) item.id = ""
+		if (item.id && item.id.startsWith("tmp_")) item.id = ""
 		return item
 	})
 }

From 017cba3a05144d3fa1d964026bea3a99ff3486de Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 21 Aug 2025 17:34:18 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
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 ++++++++++++-------
 .../components/product-inventory.vue          |  3 ++
 .../supermarketerp/supermarketSpu/index.vue   |  2 +-
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue b/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
index 90bd45e..753592d 100644
--- a/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue
@@ -35,7 +35,7 @@
 					<template v-for="item in unitSelectOptions">
 						<el-option :label="item.unit" :value="item.id">
 							<span class="float-left">单位：{{ item.unit }}</span>
-							<span class="float-right ml-4">口味：{{ item.taste }}</span>
+							<span class="float-right ml-4">口味：{{ item.tasteName }}</span>
 						</el-option>
 					</template>
 				</el-select>
@@ -45,9 +45,9 @@
 				<span v-else style="color: #c0c4cf">请选择</span>
 			</template>
 		</vxe-column>
-		<vxe-column field="taste" title="口味">
+		<vxe-column field="tasteName" title="口味">
 			<template #default="{ row }">
-				{{ unitSelectOptions?.find((item: rowVU) => item.id === row.unitId)?.taste }}
+				{{ unitSelectOptions?.find((item: rowVU) => item.id === row.unitId)?.tasteName }}
 			</template>
 		</vxe-column>
 		<vxe-column field="barCode" title="辅助条码" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
@@ -74,7 +74,7 @@ export interface rowVC {
 	id: string
 	unitId: string
 	unit: string
-	taste: string
+	tasteName: string
 	barCode: string
 }
 
@@ -96,7 +96,7 @@ const pushEvent = () => {
 		id: "tmp_" + nanoid(5),
 		unitId: "",
 		unit: "",
-		taste: "",
+		tasteName: "",
 		barCode: "",
 	}
 	auxiliaryCodeList.value.push(newRow)
@@ -132,7 +132,7 @@ watch(
 const handleUnitIdChange = (unitId: string, rowIndex: number) => {
 	const unitItem = unitSelectOptions.value?.find((item: rowVU) => item.id == unitId)
 	;(auxiliaryCodeList.value[rowIndex] as any).unit = unitItem?.unit
-	;(auxiliaryCodeList.value[rowIndex] as any).taste = unitItem?.taste
+	;(auxiliaryCodeList.value[rowIndex] as any).tasteName = unitItem?.tasteName
 }
 
 // 校验可编辑表格 成功返回 true 失败返回 false
diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index fffa8eb..c6c2732 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -1,18 +1,28 @@
 <template>
 	<el-row class="mb-2">
 		<el-button type="primary" @click="pushEvent()">新增</el-button>
-		<el-tooltip effect="light" placement="right">
-			<template #content>
-				<el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
-					<p>
-						注：内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换，影响erp库存自动扣减操作。
-						例如：一瓶矿泉水内装填'1',为售卖的最小基础单位，如果想按箱卖，在继续添加包装单位为箱，内装为24
-					</p>
-				</el-alert>
-			</template>
-			<el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
-		</el-tooltip>
-		<el-button type="primary" @click="tasteFormRef.openDialog()">新增口味</el-button>
+    <el-tooltip effect="light" placement="right">
+      <template #content>
+        <el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
+          <p>
+            注：内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换，影响erp库存自动扣减操作。
+            例如：一瓶矿泉水内装填'1',为售卖的最小基础单位，如果想按箱卖，在继续添加包装单位为箱，内装为24
+          </p>
+        </el-alert>
+      </template>
+      <el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
+    </el-tooltip>
+    <el-button type="success" @click="tasteFormRef.openDialog()">口味管理</el-button>
+    <el-tooltip effect="light" placement="right">
+      <template #content>
+        <el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
+          <p>
+            注：口味管理则可以实现通过对该商品的口味划分+设置改口味的基础库存，以此实现对某个的口味商品进行不同包装形式售卖
+          </p>
+        </el-alert>
+      </template>
+      <el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
+    </el-tooltip>
 	</el-row>
 
 	<vxe-table
@@ -143,9 +153,8 @@ export interface rowVU {
 	costPrice: number
 	isBase?: boolean | null
 	flag?: string
-	taste?: string
-	tasteId: string
 	tasteName?: string
+	tasteId: string
 }
 export interface TasteItem {
 	id: string
@@ -219,7 +228,7 @@ const pushEvent = (row?: rowVU | undefined) => {
 			retailPrice: 0.01,
 			promotionPrice: 0,
 			costPrice: 0,
-			taste: "",
+			tasteName: "",
 			tasteId: "",
 		}
 		Object.assign(newRow, row)
diff --git a/src/views/supermarketerp/supermarketSpu/components/product-inventory.vue b/src/views/supermarketerp/supermarketSpu/components/product-inventory.vue
index c8b6133..14feec7 100644
--- a/src/views/supermarketerp/supermarketSpu/components/product-inventory.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/product-inventory.vue
@@ -22,8 +22,11 @@
 			<span class="text-lg">
 				注：此处库存数应该填写最小售卖单位的总库存，否则无法换算成完整的库存扣减。每卖出一个包装形式的商品，都会进行总库存数 -
 				内装数，从而进行多种包装形式的售卖。
+        <br>
+        期初库存指的是该商品还未录入到本系统时所剩库存数,即初始库存
 			</span>
 		</el-alert>
+
 	</el-row>
 </template>
 
diff --git a/src/views/supermarketerp/supermarketSpu/index.vue b/src/views/supermarketerp/supermarketSpu/index.vue
index 708494d..c7457b0 100644
--- a/src/views/supermarketerp/supermarketSpu/index.vue
+++ b/src/views/supermarketerp/supermarketSpu/index.vue
@@ -155,7 +155,7 @@
 		<upload-excel-update ref="excelUploadUpdateRef" title="覆盖导入库存商品"
 			url="/supermarket/supermarketSpu/importNewUpdate" @refreshDataList="refreshDataList" />
 
-		<upload-excel ref="excelUploadPd" title="导入库存盘点" url="/supermarket/supermarketSpu/importPD"
+		<upload-excel ref="excelUploadPd" title="导入库存盘点" url="/supermarket/supermarketSpu/importPDNew"
 			@refreshDataList="refreshDataList" />
 	</div>
 </template>

From 09ed9cd1a67bafec7fdb6796de0dcfbb0b357dec Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 21 Aug 2025 17:43:28 +0800
Subject: [PATCH 08/15] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/package-unit.vue               | 62 ++++++-------------
 1 file changed, 20 insertions(+), 42 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index 9fd10aa..9fbca26 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -1,28 +1,26 @@
 <template>
 	<el-row class="mb-2">
 		<el-button type="primary" @click="pushEvent()">新增</el-button>
-    <el-tooltip effect="light" placement="right">
-      <template #content>
-        <el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
-          <p>
-            注：内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换，影响erp库存自动扣减操作。
-            例如：一瓶矿泉水内装填'1',为售卖的最小基础单位，如果想按箱卖，在继续添加包装单位为箱，内装为24
-          </p>
-        </el-alert>
-      </template>
-      <el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
-    </el-tooltip>
-    <el-button type="success" @click="tasteFormRef.openDialog()">口味管理</el-button>
-    <el-tooltip effect="light" placement="right">
-      <template #content>
-        <el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
-          <p>
-            注：口味管理则可以实现通过对该商品的口味划分+设置改口味的基础库存，以此实现对某个的口味商品进行不同包装形式售卖
-          </p>
-        </el-alert>
-      </template>
-      <el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
-    </el-tooltip>
+		<el-tooltip effect="light" placement="right">
+			<template #content>
+				<el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
+					<p>
+						注：内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换，影响erp库存自动扣减操作。
+						例如：一瓶矿泉水内装填'1',为售卖的最小基础单位，如果想按箱卖，在继续添加包装单位为箱，内装为24
+					</p>
+				</el-alert>
+			</template>
+			<el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
+		</el-tooltip>
+		<el-button type="success" @click="tasteFormRef.openDialog()">口味管理</el-button>
+		<el-tooltip effect="light" placement="right">
+			<template #content>
+				<el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
+					<p>注：口味管理则可以实现通过对该商品的口味划分+设置改口味的基础库存，以此实现对某个的口味商品进行不同包装形式售卖</p>
+				</el-alert>
+			</template>
+			<el-icon class="text-xl my-auto mx-4 text-yellow-600"><WarningFilled /></el-icon>
+		</el-tooltip>
 	</el-row>
 
 	<vxe-table
@@ -212,26 +210,6 @@ const slotInputChange = (slotParams: any) => {
 }
 
 // 底部新增行
-const pushEvent = (row?: rowVU | undefined) => {
-	const newRow = {} as rowVU
-	if (row) {
-		Object.assign(newRow, row)
-	} else {
-		row = {
-			id: "tmp_" + nanoid(5),
-			barCode: "",
-			spec: "",
-			unit: "",
-			status: "0",
-			packageNum: 1,
-			purchasePrice: 0,
-			retailPrice: 0.01,
-			promotionPrice: 0,
-			costPrice: 0,
-			tasteName: "",
-			tasteId: "",
-		}
-		Object.assign(newRow, row)
 const pushEvent = (flag?: "flag" | undefined) => {
 	const newRow: rowVU = {
 		id: "tmp_" + nanoid(5),

From 54273cdc9a4cd41a16508d103604f3489ce853b7 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 21 Aug 2025 17:45:53 +0800
Subject: [PATCH 09/15] 1

---
 .../components/package-unit.vue               | 170 +++++++++---------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index 9fd10aa..abebdd8 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -217,100 +217,100 @@ const pushEvent = (row?: rowVU | undefined) => {
 	if (row) {
 		Object.assign(newRow, row)
 	} else {
-		row = {
-			id: "tmp_" + nanoid(5),
-			barCode: "",
-			spec: "",
-			unit: "",
-			status: "0",
-			packageNum: 1,
-			purchasePrice: 0,
-			retailPrice: 0.01,
-			promotionPrice: 0,
-			costPrice: 0,
-			tasteName: "",
-			tasteId: "",
-		}
-		Object.assign(newRow, row)
-const pushEvent = (flag?: "flag" | undefined) => {
-	const newRow: rowVU = {
-		id: "tmp_" + nanoid(5),
-		barCode: "",
-		spec: "",
-		unit: "",
-		status: "0",
-		packageNum: 1,
-		purchasePrice: 0,
-		retailPrice: 0.01,
-		promotionPrice: 0,
-		costPrice: 0,
-		tasteName: "",
-		tasteId: "",
-	}
+1    row = {
+      id: "tmp_" + nanoid(5),
+      barCode: "",
+      spec: "",
+      unit: "",
+      status: "0",
+      packageNum: 1,
+      purchasePrice: 0,
+      retailPrice: 0.01,
+      promotionPrice: 0,
+      costPrice: 0,
+      tasteName: "",
+      tasteId: "",
+    }
+    Object.assign(newRow, row)1
+    const pushEvent = (flag?: "flag" | undefined) => {
+      const newRow: rowVU = {
+        id: "tmp_" + nanoid(5),
+        barCode: "",
+        spec: "",
+        unit: "",
+        status: "0",
+        packageNum: 1,
+        purchasePrice: 0,
+        retailPrice: 0.01,
+        promotionPrice: 0,
+        costPrice: 0,
+        tasteName: "",
+        tasteId: "",
+      }
 
-	if (flag) newRow.flag = "defaultPackageUnitRow"
+      if (flag) newRow.flag = "defaultPackageUnitRow"
 
-	packageUnitList.value.push(newRow)
-	nextTick(() => {
-		const $table = tableRef.value
-		if ($table) {
-			$table.setEditRow(newRow)
-		}
-	})
-}
+      packageUnitList.value.push(newRow)
+      nextTick(() => {
+        const $table = tableRef.value
+        if ($table) {
+          $table.setEditRow(newRow)
+        }
+      })
+    }
 
 // 删除行
-const removeRow = (rowIndex: number) => {
-	packageUnitList.value.splice(rowIndex, 1)
-}
+    const removeRow = (rowIndex: number) => {
+      packageUnitList.value.splice(rowIndex, 1)
+    }
 
 // 设置单选的行
-const setRadioRow = (index: number) => {
-	const $table = tableRef.value
-	if ($table) {
-		$table.setRadioRow(packageUnitList.value[index])
-	}
-}
+    const setRadioRow = (index: number) => {
+      const $table = tableRef.value
+      if ($table) {
+        $table.setRadioRow(packageUnitList.value[index])
+      }
+    }
 
 // 获取单选的行
-const getRadioRow = () => {
-	const $table = tableRef.value
-	if ($table) {
-		const currRadioRow = $table.getRadioRecord()
-		return currRadioRow
-	}
-}
+    const getRadioRow = () => {
+      const $table = tableRef.value
+      if ($table) {
+        const currRadioRow = $table.getRadioRecord()
+        return currRadioRow
+      }
+    }
 
 // 校验表格 成功返回 true 失败返回 false
-const tableValidate = async (filed?: string) => {
-	const $table = tableRef.value
-	if ($table) {
-		if (filed) {
-			const errMap = await $table.validateField(packageUnitList.value, filed)
-			if (errMap) {
-				console.log("字段校验失败！", errMap)
-				return false
-			} else {
-				console.log("字段校验成功！")
-				return true
-			}
-		} else {
-			const errMap = await $table.validate(true)
-			if (errMap) {
-				console.log("全量校验失败！", errMap)
-				return false
-			} else {
-				console.log("全量校验成功！")
-				return true
-			}
-		}
-	}
-}
+    const tableValidate = async (filed?: string) => {
+      const $table = tableRef.value
+      if ($table) {
+        if (filed) {
+          const errMap = await $table.validateField(packageUnitList.value, filed)
+          if (errMap) {
+            console.log("字段校验失败！", errMap)
+            return false
+          } else {
+            console.log("字段校验成功！")
+            return true
+          }
+        } else {
+          const errMap = await $table.validate(true)
+          if (errMap) {
+            console.log("全量校验失败！", errMap)
+            return false
+          } else {
+            console.log("全量校验成功！")
+            return true
+          }
+        }
+      }
+    }
 
-defineExpose({
-	tableValidate,
-	setRadioRow,
-	getRadioRow,
-	pushEvent,
-})
+    defineExpose({
+      tableValidate,
+      setRadioRow,
+      getRadioRow,
+      pushEvent,
+    })
 </script>

From a68829e953071ad7cd2339bb58efc35ba0650e30 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 21 Aug 2025 18:39:34 +0800
Subject: [PATCH 10/15]

---
 .../components/package-unit.vue               | 148 +++++++-----------
 .../supermarketerp/supermarketSpu/form.vue    |   3 +-
 2 files changed, 56 insertions(+), 95 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index a021459..9fbca26 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -210,43 +210,6 @@ const slotInputChange = (slotParams: any) => {
 }
 
 // 底部新增行
-<<<<<<< HEAD
-const pushEvent = (row?: rowVU | undefined) => {
-	const newRow = {} as rowVU
-	if (row) {
-		Object.assign(newRow, row)
-	} else {
-1    row = {
-      id: "tmp_" + nanoid(5),
-      barCode: "",
-      spec: "",
-      unit: "",
-      status: "0",
-      packageNum: 1,
-      purchasePrice: 0,
-      retailPrice: 0.01,
-      promotionPrice: 0,
-      costPrice: 0,
-      tasteName: "",
-      tasteId: "",
-    }
-    Object.assign(newRow, row)1
-    const pushEvent = (flag?: "flag" | undefined) => {
-      const newRow: rowVU = {
-        id: "tmp_" + nanoid(5),
-        barCode: "",
-        spec: "",
-        unit: "",
-        status: "0",
-        packageNum: 1,
-        purchasePrice: 0,
-        retailPrice: 0.01,
-        promotionPrice: 0,
-        costPrice: 0,
-        tasteName: "",
-        tasteId: "",
-      }
-=======
 const pushEvent = (flag?: "flag" | undefined) => {
 	const newRow: rowVU = {
 		id: "tmp_" + nanoid(5),
@@ -262,71 +225,70 @@ const pushEvent = (flag?: "flag" | undefined) => {
 		tasteName: "",
 		tasteId: "",
 	}
->>>>>>> 09ed9cd1a67bafec7fdb6796de0dcfbb0b357dec
 
-      if (flag) newRow.flag = "defaultPackageUnitRow"
+	if (flag) newRow.flag = "defaultPackageUnitRow"
 
-      packageUnitList.value.push(newRow)
-      nextTick(() => {
-        const $table = tableRef.value
-        if ($table) {
-          $table.setEditRow(newRow)
-        }
-      })
-    }
+	packageUnitList.value.push(newRow)
+	nextTick(() => {
+		const $table = tableRef.value
+		if ($table) {
+			$table.setEditRow(newRow)
+		}
+	})
+}
 
 // 删除行
-    const removeRow = (rowIndex: number) => {
-      packageUnitList.value.splice(rowIndex, 1)
-    }
+const removeRow = (rowIndex: number) => {
+	packageUnitList.value.splice(rowIndex, 1)
+}
 
 // 设置单选的行
-    const setRadioRow = (index: number) => {
-      const $table = tableRef.value
-      if ($table) {
-        $table.setRadioRow(packageUnitList.value[index])
-      }
-    }
+const setRadioRow = (index: number) => {
+	const $table = tableRef.value
+	if ($table) {
+		$table.setRadioRow(packageUnitList.value[index])
+	}
+}
 
 // 获取单选的行
-    const getRadioRow = () => {
-      const $table = tableRef.value
-      if ($table) {
-        const currRadioRow = $table.getRadioRecord()
-        return currRadioRow
-      }
-    }
+const getRadioRow = () => {
+	const $table = tableRef.value
+	if ($table) {
+		const currRadioRow = $table.getRadioRecord()
+		return currRadioRow
+	}
+}
 
 // 校验表格 成功返回 true 失败返回 false
-    const tableValidate = async (filed?: string) => {
-      const $table = tableRef.value
-      if ($table) {
-        if (filed) {
-          const errMap = await $table.validateField(packageUnitList.value, filed)
-          if (errMap) {
-            console.log("字段校验失败！", errMap)
-            return false
-          } else {
-            console.log("字段校验成功！")
-            return true
-          }
-        } else {
-          const errMap = await $table.validate(true)
-          if (errMap) {
-            console.log("全量校验失败！", errMap)
-            return false
-          } else {
-            console.log("全量校验成功！")
-            return true
-          }
-        }
-      }
-    }
+const tableValidate = async (filed?: string) => {
+	const $table = tableRef.value
+	if ($table) {
+		if (filed) {
+			const errMap = await $table.validateField(packageUnitList.value, filed)
+			if (errMap) {
+				console.log("字段校验失败！", errMap)
+				return false
+			} else {
+				console.log("字段校验成功！")
+				return true
+			}
+		} else {
+			const errMap = await $table.validate(true)
+			if (errMap) {
+				console.log("全量校验失败！", errMap)
+				return false
+			} else {
+				console.log("全量校验成功！")
+				return true
+			}
+		}
+	}
+}
 
-    defineExpose({
-      tableValidate,
-      setRadioRow,
-      getRadioRow,
-      pushEvent,
-    })
+defineExpose({
+	tableValidate,
+	setRadioRow,
+	getRadioRow,
+	pushEvent,
+})
 </script>
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index bc84556..6d826e3 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -32,7 +32,7 @@
 
 <script setup lang="ts">
 import BaseInfo from "./components/base-info.vue"
-import PackageUnit, { type rowVU } from "./components/package-unit.vue"
+import { type rowVU } from "./components/package-unit.vue"
 import ProductInventory from "./components/product-inventory.vue"
 import AuxiliaryCode, { type rowVC } from "./components/auxiliary-code.vue"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/supermarketSpu"
@@ -40,7 +40,6 @@ import { fetchList } from "/@/api/supermarketerp/smErpTasteStock"
 import { TabPaneName } from "element-plus"
 import { useMessage } from "/@/hooks/message"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
-import { nanoid } from "nanoid"
 
 const emit = defineEmits(["refresh"])
 

From b1f182a1739b3ee064e80e41f0a4a8d7b4a537a7 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 21 Aug 2025 19:02:12 +0800
Subject: [PATCH 11/15] =?UTF-8?q?feat:=E6=AF=8F=E6=97=A5=E8=8F=9C=E5=93=81?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteenDailyDishes/index.vue | 588 ++++++-------------------
 1 file changed, 140 insertions(+), 448 deletions(-)

diff --git a/src/views/canteenDailyDishes/index.vue b/src/views/canteenDailyDishes/index.vue
index e623eca..2dc76aa 100644
--- a/src/views/canteenDailyDishes/index.vue
+++ b/src/views/canteenDailyDishes/index.vue
@@ -1,193 +1,81 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-view">
-			<div
-				ref="containerRef"
-				class="border-flow-container relative flex h-screen w-full flex-col overflow-hidden bg-gradient-to-br from-[#1a2942] to-[#121e2d] p-4"
-			>
-				<!-- 背景装饰 -->
-				<div class="pointer-events-none absolute inset-0 bg-pattern opacity-10"></div>
+			<div ref="containerRef" class="relative h-full w-full overflow-y-auto bg-gradient-to-br from-[#232e55] to-[#040a1b] p-2">
+				<!-- 背景圆点 -->
 				<div class="pointer-events-none absolute inset-0 pattern-dots opacity-[0.08]"></div>
 
-				<!-- 圆形云纹装饰 -->
-				<div class="ink-cloud absolute left-4 top-4 h-64 w-64 opacity-20"></div>
+				<!-- 背景外侧环形 -->
+				<div class="ink-cloud absolute left-4 top-4 h-64 w-64 rotate-0 opacity-20"></div>
 				<div class="ink-cloud absolute right-4 top-4 h-64 w-64 rotate-90 opacity-20"></div>
 				<div class="ink-cloud absolute bottom-4 left-4 h-64 w-64 -rotate-90 opacity-20"></div>
 				<div class="ink-cloud absolute bottom-4 right-4 h-64 w-64 rotate-180 opacity-20"></div>
 
-				<!-- 随机位置云纹装饰 -->
+				<!-- 背景中间环形 -->
 				<div class="ink-cloud absolute left-[30%] top-[20%] h-48 w-48 opacity-15 rotate-45"></div>
 				<div class="ink-cloud absolute right-[25%] top-[40%] h-40 w-40 opacity-15 rotate-[120deg]"></div>
 				<div class="ink-cloud absolute left-[45%] bottom-[30%] h-56 w-56 opacity-15 rotate-[220deg]"></div>
 				<div class="ink-cloud absolute right-[40%] bottom-[15%] h-44 w-44 opacity-15 rotate-[300deg]"></div>
 
 				<!-- 顶部区域 -->
-				<div class="relative mb-2 flex items-center justify-center">
-					<!-- 左侧条纹 -->
-					<div class="continuous-flow-stripe absolute left-0 flex h-2 w-[calc(50%-8rem)] items-center">
-						<div class="h-full w-full rounded-full bg-gradient-to-r from-transparent via-[#F7D6C3]/30 to-transparent"></div>
+				<div class="h-8 relative mx-4 flex items-center justify-between">
+					<div class="flex items-center">
+						<h1 class="text-4xl text-[#b0bfff] font-bold tracking-wider">今日午餐菜品</h1>
+						<div class="text-xl text-blue-400 drop-shadow-lg ml-5">{{ currentDate }}&nbsp;&nbsp;&nbsp;{{ currentTime }}</div>
 					</div>
 
-					<div class="flex flex-col items-center">
-						<h1 class="gradient-text relative text-2xl font-bold tracking-wider">今日午餐菜品</h1>
-						<div class="flow-text mt-2 text-lg font-medium text-[#8ab4ff] drop-shadow-lg">{{ currentDate }} {{ currentTime }}</div>
-					</div>
-
-					<!-- 右侧条纹 -->
-					<div class="continuous-flow-stripe absolute right-0 flex h-2 w-[calc(50%-8rem)] items-center">
-						<div class="h-full w-full rounded-full bg-gradient-to-r from-transparent via-[#F7D6C3]/30 to-transparent"></div>
-					</div>
-
-					<!-- 全屏按钮和滚动控制按钮 -->
-					<div class="absolute right-0 flex items-center gap-2">
-						<el-tooltip v-if="needScroll" :content="isScrolling ? '暂停滚动' : '开始滚动'" placement="bottom" effect="dark">
-							<button
-								@click="toggleScroll"
-								class="flex h-8 w-8 items-center justify-center rounded-xl bg-[#F7D6C3]/20 transition-all hover:scale-110 hover:bg-[#F7D6C3]/40"
-							>
-								<el-icon class="h-10 w-10 font-bold">
-									<component :is="isScrolling ? 'VideoPause' : 'VideoPlay'" />
-								</el-icon>
-							</button>
-						</el-tooltip>
-
-						<el-tooltip :content="isFullscreen ? '退出全屏' : '全屏'" placement="bottom" effect="dark">
-							<button
-								@click="toggleFullScreen"
-								class="flex h-8 w-8 items-center justify-center rounded-xl bg-[#F7D6C3]/20 transition-all hover:scale-110 hover:bg-[#F7D6C3]/40"
-							>
-								<el-icon class="icon h-10 w-10 font-bold bg-contain bg-center bg-no-repeat"><FullScreen /></el-icon>
-							</button>
-						</el-tooltip>
-					</div>
+					<!-- 全屏按钮 -->
+					<el-tooltip :content="isFullscreen ? '退出全屏' : '全屏'" placement="left" effect="dark">
+						<button
+							@click="toggleFullScreen"
+							class="flex h-8 w-8 items-center justify-center rounded-xl bg-[#F7D6C3]/20 transition-all hover:scale-110 hover:bg-[#F7D6C3]/40"
+						>
+							<el-icon class="icon h-10 w-10 font-bold bg-contain bg-center bg-no-repeat"><FullScreen /></el-icon>
+						</button>
+					</el-tooltip>
 				</div>
 
 				<!-- 菜品展示区域 -->
-				<div class="flex-1 px-4" :style="containerStyle">
-					<div class="scroll-wrapper" ref="scrollContainerRef">
-						<div class="scroll-content" :style="{ transform: `translateY(${-scrollOffset}px)` }">
-							<div class="grid w-full gap-3" :style="gridStyle">
-								<template v-for="hourType in foodData" :key="hourType">
-									<div
-										v-for="dish in hourType"
-										:key="dish.id"
-										class="group relative flex flex-col overflow-hidden rounded-xl border border-[#F7D6C3]/10 bg-[#1d2b45]/60 transition-all duration-500 hover:scale-[1.02] hover:-translate-y-1 hover:bg-[#1d2b45]/80 hover:shadow-[0_0_20px_rgba(74,136,255,0.1)]"
-									>
-										<div class="relative h-32 overflow-hidden">
-											<div class="absolute inset-0 bg-gradient-to-b from-transparent"></div>
-											<img
-												:src="imageBaseUrl + dish.picUrl"
-												:alt="dish.name"
-												class="h-full w-full object-cover transition-transform duration-500 group-hover:scale-110"
-											/>
-											<div class="absolute left-2 top-2 rounded-lg">
-												<!-- <dict-tag
-													:options="daily_menu"
-													:value="canteenCategoryOption?.find((v: any) => v.id == dish.categoryId)?.categoryType?.split(',')"
-												/> -->
-												<el-tag type="primary">午餐</el-tag>
-											</div>
-											<div class="absolute right-1 top-2 rounded-lg px-2 py-0.5 text-sm">
-												<el-tag type="primary">
-													{{ canteenCategoryOption?.find((v: any) => v.id == dish.categoryId)?.name }}
-												</el-tag>
-											</div>
-										</div>
-										<div class="flex flex-col justify-between gap-1 bg-[#1d2b45]/40 p-3 backdrop-blur-sm">
-											<div class="flex items-center justify-between">
-												<h3 class="text-2xl font-bold text-[#8ab4ff] drop-shadow-lg transition-colors group-hover:text-white line-clamp-1">
-													{{ dish.name }}
-												</h3>
-												<p class="text-3xl font-bold text-[#4a88ff] drop-shadow-lg whitespace-nowrap ml-4">
-													¥{{ displayPrice(dish.price) }}
-												</p>
-											</div>
-											<!-- <span class="text-base text-[#8ab4ff]/80 line-clamp-1">{{ dish.name }}</span> -->
-										</div>
-										<div class="absolute inset-px rounded-xl border border-[#F7D6C3]/10 pointer-events-none"></div>
-									</div>
-								</template>
+				<div class="w-full">
+					<div class="w-full flex flex-wrap items-center justify-center" v-for="(hourType, index) in foodData" :key="index">
+						<div v-for="dish in hourType" :key="dish.id" class="w-60 p-2">
+							<div class="h-32 overflow-hidden">
+								<!-- <div class="absolute inset-0 bg-gradient-to-b from-transparent"></div> -->
+								<img :src="imageBaseUrl + dish.picUrl" :alt="dish.name" class="h-full w-full object-cover" />
+								<!-- <div class="absolute left-2 top-2 rounded-lg">
+									<el-tag type="primary">午餐</el-tag>
+								</div> -->
+								<!-- <div class="absolute right-1 top-2 rounded-lg px-2 py-0.5 text-sm">
+									<el-tag type="primary">
+										{{ canteenCategoryOption?.find((v: any) => v.id == dish.categoryId)?.name }}
+									</el-tag>
+								</div> -->
 							</div>
-							<!-- 只在需要滚动时显示克隆内容 -->
-							<div v-if="needScroll" class="grid w-full gap-3" :style="gridStyle">
-								<template v-for="hourType in foodData" :key="hourType + '_clone'">
-									<div
-										v-for="dish in hourType"
-										:key="dish.id"
-										class="group relative flex flex-col overflow-hidden rounded-xl border border-[#F7D6C3]/10 bg-[#1d2b45]/60 transition-all duration-500 hover:scale-[1.02] hover:-translate-y-1 hover:bg-[#1d2b45]/80 hover:shadow-[0_0_20px_rgba(74,136,255,0.1)]"
-									>
-										<div class="relative h-32 overflow-hidden">
-											<div class="absolute inset-0 bg-gradient-to-b from-transparent"></div>
-											<img
-												:src="imageBaseUrl + dish.picUrl"
-												:alt="dish.name"
-												class="h-full w-full object-cover transition-transform duration-500 group-hover:scale-110"
-											/>
-											<div class="absolute left-2 top-2 rounded-lg">
-												<!-- <dict-tag
-													:options="daily_menu"
-													:value="canteenCategoryOption?.find((v: any) => v.id == dish.categoryId)?.categoryType?.split(',')"
-												/> -->
-												<el-tag type="primary">午餐</el-tag>
-											</div>
-											<div class="absolute right-1 top-2 rounded-lg px-2 py-0.5 text-sm">
-												<el-tag type="primary">
-													{{ canteenCategoryOption?.find((v: any) => v.id == dish.categoryId)?.name }}
-												</el-tag>
-											</div>
-										</div>
-										<div class="flex flex-col justify-between gap-1 bg-[#1d2b45]/40 p-3 backdrop-blur-sm">
-											<div class="flex items-center justify-between">
-												<h3 class="text-2xl font-bold text-[#8ab4ff] drop-shadow-lg transition-colors group-hover:text-white line-clamp-1">
-													{{ dish.name }}
-												</h3>
-												<p class="text-3xl font-bold text-[#4a88ff] drop-shadow-lg whitespace-nowrap ml-4">
-													¥{{ displayPrice(dish.price) }}
-												</p>
-											</div>
-											<!-- <span class="text-base text-[#8ab4ff]/80 line-clamp-1">{{ dish.name }}</span> -->
-										</div>
-										<div class="absolute inset-px rounded-xl border border-[#F7D6C3]/10 pointer-events-none"></div>
-									</div>
-								</template>
+							<div
+								class="w-full flex items-center justify-between bg-[#AEBBF9]/40 px-2 pb-4 backdrop-blur-sm rounded-bl-[50%] rounded-br-[50%]"
+							>
+								<h3 class="text-2xl font-bold text-[#8ab4ff] drop-shadow-lg line-clamp-1 whitespace-nowrap">
+									{{ dish.name }}
+								</h3>
+								<p class="text-3xl font-bold text-[#4a88ff] drop-shadow-lg whitespace-nowrap">¥{{ displayPrice(dish.price) }}</p>
 							</div>
 						</div>
 					</div>
 				</div>
-
-				<!-- 底部区域 -->
-				<div class="mt-4 flex items-center justify-center gap-8 pb-2 text-sm text-[#8ab4ff]/60">
-					<div class="h-[1px] w-32 bg-gradient-to-r from-transparent via-[#F7D6C3]/20 to-transparent"></div>
-					<span>智慧食堂</span>
-					<div class="h-[1px] w-32 bg-gradient-to-r from-transparent via-[#F7D6C3]/20 to-transparent"></div>
-				</div>
 			</div>
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted, computed, watch, nextTick } from "vue"
-import dayjs from "dayjs"
 import { ElTooltip } from "element-plus"
-import { selectTimeFoodApi } from "/@/api/canteen/canteenDailyMenu"
-import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
-import { displayPrice } from "/@/utils/formatMoney"
+import dayjs from "dayjs"
 
 const containerRef = ref<HTMLElement | null>(null)
-const currentDate = ref(dayjs().format("YYYY年MM月DD日"))
+const currentDate = ref(dayjs().format("YYYY/MM/DD"))
 const currentTime = ref(dayjs().format("HH:mm:ss"))
 const isFullscreen = ref(false)
 const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
-const canteenCategoryOption = ref<
-	| {
-			id: string
-			categoryType: string
-			name: string
-			[key: string]: any
-	  }[]
-	| null
->()
 
 interface FoodItem {
 	categoryId: string
@@ -207,37 +95,110 @@ const foodData = reactive<{
 	lunch: [],
 	dinner: [],
 })
+const canteenCategoryOption = ref<any>()
+let timer: number
 
-// 根据日期和时段获取菜品
-const getDishByType = async () => {
-	const result = await selectTimeFoodApi({
-		time: dayjs().format("YYYY-MM-DD"),
-		// time: "2025-03-14",
-		// time: "2025-02-07",
-		merchantId: "1887400193644199937",
+onMounted(async () => {
+	timer = setInterval(() => (currentTime.value = dayjs().format("HH:mm:ss")), 1000)
+	await getDishByType()
+	await getCanteenDishesCategory()
+
+	// 监听全屏变化事件
+	const handleFullscreenChange = () => {
+		isFullscreen.value = !!(
+			document.fullscreenElement ||
+			(document as any).webkitFullscreenElement ||
+			(document as any).mozFullScreenElement ||
+			(document as any).msFullscreenElement
+		)
+	}
+
+	// 全屏api兼容性
+	document.addEventListener("fullscreenchange", handleFullscreenChange)
+	document.addEventListener("webkitfullscreenchange", handleFullscreenChange)
+	document.addEventListener("mozfullscreenchange", handleFullscreenChange)
+	document.addEventListener("MSFullscreenChange", handleFullscreenChange)
+
+	onUnmounted(() => {
+		document.removeEventListener("fullscreenchange", handleFullscreenChange)
+		document.removeEventListener("webkitfullscreenchange", handleFullscreenChange)
+		document.removeEventListener("mozfullscreenchange", handleFullscreenChange)
+		document.removeEventListener("MSFullscreenChange", handleFullscreenChange)
 	})
-	if (result.code == 0) {
-		result.data.forEach((r: any) => {
-			switch (r.hourType) {
-				case 1:
-					// foodData.breakfast = r.dailyMenuVOS
-					break
-				case 2:
-					foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 12)
-					break
-				case 3:
-					// foodData.dinner = r.dailyMenuVOS
-					break
+})
+
+// 全屏切换
+const toggleFullScreen = async () => {
+	const element = containerRef.value
+	if (!element) return
+
+	try {
+		if (!isFullscreen.value) {
+			if (element.requestFullscreen) {
+				await element.requestFullscreen()
+			} else if ((element as any).webkitRequestFullscreen) {
+				await (element as any).webkitRequestFullscreen()
+			} else if ((element as any).msRequestFullscreen) {
+				await (element as any).msRequestFullscreen()
+			} else if ((element as any).mozRequestFullScreen) {
+				await (element as any).mozRequestFullScreen()
 			}
-		})
+			isFullscreen.value = true
+		} else {
+			if (document.exitFullscreen) {
+				await document.exitFullscreen()
+			} else if ((document as any).webkitExitFullscreen) {
+				await (document as any).webkitExitFullscreen()
+			} else if ((document as any).msExitFullscreen) {
+				await (document as any).msExitFullscreen()
+			} else if ((document as any).mozCancelFullScreen) {
+				await (document as any).mozCancelFullScreen()
+			}
+			isFullscreen.value = false
+		}
+	} catch (err) {
+		console.error("全屏切换失败:", err)
 	}
 }
 
-// 更新时间
-let timer: number
-const updateTime = () => {
-	currentTime.value = dayjs().format("HH:mm:ss")
+// 根据日期和时段获取菜品
+const getDishByType = async () => {
+	const { code, data, msg } = await selectTimeFoodApi({
+		time: dayjs().format("YYYY-MM-DD"),
+		merchantId: "1887400193644199937",
+	})
+	if (code != 0) return useMessage().error(msg || "获取菜品列表失败")
+	data.forEach((r: any) => {
+		switch (r.hourType) {
+			case 1:
+				// foodData.breakfast = r.dailyMenuVOS
+				break
+			case 2:
+				foodData.lunch = r.dailyMenuVOS.filter((item: any) => !item.name.includes("元") && !item.name.includes("米饭"))
+				break
+			case 3:
+				// foodData.dinner = r.dailyMenuVOS
+				break
+		}
+	})
 }
+// 获取食堂菜品分类
+const getCanteenDishesCategory = async () => {
+	try {
+		const res = await getCanteenCategory()
+		if (res.code === 0) {
+			canteenCategoryOption.value = res.data
+		}
+	} catch (error) {
+		canteenCategoryOption.value = []
+	}
+}
+// =====================================
+import { ref, onMounted, onUnmounted, computed, watch, nextTick } from "vue"
+import { selectTimeFoodApi } from "/@/api/canteen/canteenDailyMenu"
+import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
+import { displayPrice } from "/@/utils/formatMoney"
+import { useMessage } from "/@/hooks/message"
 
 const scrollContainerRef = ref<HTMLElement | null>(null)
 let scrollOffset = ref(0)
@@ -324,143 +285,6 @@ const checkNeedScroll = () => {
 	return needScroll.value
 }
 
-onMounted(async () => {
-	timer = setInterval(updateTime, 1000)
-	await getDishByType()
-	try {
-		// 获取菜品分类
-		const res = await getCanteenCategory()
-		if (res.code === 0) {
-			canteenCategoryOption.value = res.data
-		}
-	} catch (error) {
-		canteenCategoryOption.value = []
-	}
-
-	// 监听全屏变化事件
-	const handleFullscreenChange = () => {
-		isFullscreen.value = !!(
-			document.fullscreenElement ||
-			(document as any).webkitFullscreenElement ||
-			(document as any).mozFullScreenElement ||
-			(document as any).msFullscreenElement
-		)
-	}
-
-	// 全屏api兼容性
-	document.addEventListener("fullscreenchange", handleFullscreenChange)
-	document.addEventListener("webkitfullscreenchange", handleFullscreenChange)
-	document.addEventListener("mozfullscreenchange", handleFullscreenChange)
-	document.addEventListener("MSFullscreenChange", handleFullscreenChange)
-
-	onUnmounted(() => {
-		clearInterval(timer)
-		document.removeEventListener("fullscreenchange", handleFullscreenChange)
-		document.removeEventListener("webkitfullscreenchange", handleFullscreenChange)
-		document.removeEventListener("mozfullscreenchange", handleFullscreenChange)
-		document.removeEventListener("MSFullscreenChange", handleFullscreenChange)
-		stopScroll()
-	})
-
-	// 延迟启动滚动，等待内容加载
-	setTimeout(() => {
-		// 检查是否需要滚动
-		if (checkNeedScroll()) {
-			isScrolling.value = true
-			startScroll()
-		}
-	}, 1000)
-
-	// 在内容变化时重新检查是否需要滚动
-	watch(
-		() => [foodData.breakfast, foodData.lunch, foodData.dinner],
-		() => {
-			nextTick(() => {
-				checkNeedScroll()
-			})
-		},
-		{ deep: true },
-	)
-
-	// 在窗口大小改变时重新检查是否需要滚动
-	const handleResize = debounce(() => {
-		checkNeedScroll()
-	}, 200)
-
-	window.addEventListener("resize", handleResize)
-
-	onUnmounted(() => {
-		window.removeEventListener("resize", handleResize)
-	})
-})
-
-// 全屏切换
-const toggleFullScreen = async () => {
-	const element = containerRef.value
-	if (!element) return
-
-	try {
-		if (!isFullscreen.value) {
-			if (element.requestFullscreen) {
-				await element.requestFullscreen()
-			} else if ((element as any).webkitRequestFullscreen) {
-				await (element as any).webkitRequestFullscreen()
-			} else if ((element as any).msRequestFullscreen) {
-				await (element as any).msRequestFullscreen()
-			} else if ((element as any).mozRequestFullScreen) {
-				await (element as any).mozRequestFullScreen()
-			}
-			isFullscreen.value = true
-		} else {
-			if (document.exitFullscreen) {
-				await document.exitFullscreen()
-			} else if ((document as any).webkitExitFullscreen) {
-				await (document as any).webkitExitFullscreen()
-			} else if ((document as any).msExitFullscreen) {
-				await (document as any).msExitFullscreen()
-			} else if ((document as any).mozCancelFullScreen) {
-				await (document as any).mozCancelFullScreen()
-			}
-			isFullscreen.value = false
-		}
-	} catch (err) {
-		console.error("全屏切换失败:", err)
-	}
-}
-
-// 计算容器和网格布局
-const containerStyle = computed(() => {
-	const headerHeight = 120
-	const footerHeight = 50
-	const padding = 32
-	const extraOffset = isFullscreen.value ? 0 : 60 // 非全屏状态下额外偏移量
-
-	return {
-		height: `calc(100vh - ${headerHeight + footerHeight + padding + extraOffset}px)`,
-		marginBottom: isFullscreen.value ? "0" : "60px", // 非全屏状态添加底部边距
-	}
-})
-
-const gridStyle = computed(() => {
-	const totalItems = foodData.breakfast.length + foodData.lunch.length + foodData.dinner.length
-	if (totalItems === 0) return {}
-
-	// 计算行列数
-	const aspectRatio = window.innerWidth / window.innerHeight
-	let columns = Math.ceil(Math.sqrt(totalItems * aspectRatio)) - 1
-	let rows = Math.ceil(totalItems / columns)
-
-	// 占满屏幕
-	while (rows * columns < totalItems) {
-		columns++
-	}
-
-	return {
-		gridTemplateColumns: `repeat(${columns}, 1fr)`,
-		gridTemplateRows: `repeat(${rows}, 1fr)`,
-	}
-})
-
 // 防抖函数
 function debounce(fn: Function, delay: number) {
 	let timer: number | null = null
@@ -474,146 +298,14 @@ function debounce(fn: Function, delay: number) {
 </script>
 
 <style scoped lang="scss">
-.bg-pattern {
-	background-image: url("data:image/svg+xml,%3Csvg width='60' height='60' viewBox='0 0 60 60' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M54.627 0l.83.828-1.415 1.415L51.8 0h2.827zM5.373 0l-.83.828L5.96 2.243 8.2 0H5.374zM48.97 0l3.657 3.657-1.414 1.414L46.143 0h2.828zM11.03 0L7.372 3.657 8.787 5.07 13.857 0H11.03zm32.284 0L49.8 6.485 48.384 7.9l-7.9-7.9h2.83zM16.686 0L10.2 6.485 11.616 7.9l7.9-7.9h-2.83zm20.97 0l9.315 9.314-1.414 1.414L34.828 0h2.83zM22.344 0L13.03 9.314l1.414 1.414L25.172 0h-2.83zM32 0l12.142 12.142-1.414 1.414L30 .828 17.272 13.556l-1.414-1.414L28 0h4zM.284 0l28 28-1.414 1.414L0 2.544V0h.284zM0 5.373l25.456 25.455-1.414 1.415L0 8.2V5.374zm0 5.656l22.627 22.627-1.414 1.414L0 13.86v-2.83zm0 5.656l19.8 19.8-1.415 1.413L0 19.514v-2.83zm0 5.657l16.97 16.97-1.414 1.415L0 25.172v-2.83zM0 28l14.142 14.142-1.414 1.414L0 30.828V28zm0 5.657L11.314 44.97 9.9 46.386l-9.9-9.9v-2.828zm0 5.657L8.485 47.8 7.07 49.212 0 42.143v-2.83zm0 5.657l5.657 5.657-1.414 1.415L0 47.8v-2.83zm0 5.657l2.828 2.83-1.414 1.413L0 53.456v-2.83zM54.627 60L30 35.373 5.373 60H8.2L30 38.2 51.8 60h2.827zm-5.656 0L30 41.03 11.03 60h2.828L30 43.858 46.142 60h2.83zm-5.656 0L30 46.686 16.686 60h2.83L30 49.515 40.485 60h2.83zm-5.657 0L30 52.343 22.344 60h2.83L30 55.172 34.828 60h2.83zM32 60l-2-2-2 2h4zM59.716 0l-28 28 1.414 1.414L60 2.544V0h-.284zM60 5.373L34.544 30.828l1.414 1.415L60 8.2V5.374zm0 5.656L37.373 33.656l1.414 1.414L60 13.86v-2.83zm0 5.656l-19.8 19.8 1.415 1.413L60 19.514v-2.83zm0 5.657l-16.97 16.97 1.414 1.415L60 25.172v-2.83zM60 28L45.858 42.142l1.414 1.414L60 30.828V28zm0 5.657L48.686 44.97l1.415 1.415 9.9-9.9v-2.828zm0 5.657L51.515 47.8l1.414 1.413 7.07-7.07v-2.83zm0 5.657l-5.657 5.657 1.414 1.415L60 47.8v-2.83zm0 5.657l-2.828 2.83 1.414 1.413L60 53.456v-2.83zM39.9 16.385l1.414-1.414L30 3.658 18.686 14.97l1.415 1.415 9.9-9.9 9.9 9.9zm-2.83 2.828l1.415-1.414L30 9.313 21.515 17.8l1.414 1.413L30 11.8l7.07 7.414v-.002zm-2.827 2.83l1.414-1.416L30 14.97l-5.657 5.657 1.414 1.415L30 17.8l4.243 4.242zm-2.83 2.827l1.415-1.414L30 20.626l-2.828 2.83 1.414 1.414L30 23.456l1.414 1.414zM56.87 59.414L58.284 58 30 29.716 1.716 58l1.414 1.414L30 32.544l26.87 26.87z' fill='%23F7D6C3' fill-opacity='0.05' fill-rule='evenodd'/%3E%3C/svg%3E");
-}
-
 .pattern-dots {
-	background-image: radial-gradient(#f7d6c3 1px, transparent 1px);
-	background-size: calc(10 * 1px) calc(10 * 1px);
+	background-image: radial-gradient(#eff4ee 1px, transparent 10px);
+	background-size: 10px 10px;
 }
-
-.gradient-text {
-	background: linear-gradient(-45deg, #f7d6c3, #1d4ed8, #2563eb, #3b82f6);
-	background-size: 200% 200%;
-	-webkit-background-clip: text;
-	background-clip: text;
-	-webkit-text-fill-color: transparent;
-	animation: gradientBG 6s ease infinite;
-}
-
-.flow-text {
-	position: relative;
-	overflow: hidden;
-
-	&::before {
-		content: "";
-		position: absolute;
-		left: -100%;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		background: linear-gradient(90deg, transparent 0%, rgba(255, 255, 255, 0.2) 50%, transparent 100%);
-		animation: flowLight 3s infinite linear;
-	}
-}
-
-@keyframes flowLight {
-	0% {
-		left: -100%;
-	}
-	100% {
-		left: 100%;
-	}
-}
-
-.continuous-flow-stripe {
-	position: relative;
-	overflow: hidden;
-
-	&::before {
-		content: "";
-		position: absolute;
-		top: 0;
-		left: -100%;
-		width: 200%;
-		height: 100%;
-		background: linear-gradient(
-			90deg,
-			transparent 0%,
-			rgba(74, 136, 255, 0.1) 20%,
-			rgba(74, 136, 255, 0.3) 30%,
-			rgba(74, 136, 255, 0.3) 40%,
-			rgba(74, 136, 255, 0.1) 50%,
-			transparent 60%
-		);
-		animation: continuousFlow 3s linear infinite;
-	}
-}
-
-@keyframes gradientBG {
-	0% {
-		background-position: 0% 50%;
-	}
-	50% {
-		background-position: 100% 50%;
-	}
-	100% {
-		background-position: 0% 50%;
-	}
-}
-
 .ink-cloud {
 	background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Cpath fill='%23F7D6C3' d='M50,0C36.7,0,25,11.7,25,25c0,13.3,11.7,25,25,25s25-11.7,25-25C75,11.7,63.3,0,50,0z M50,40c-8.3,0-15-6.7-15-15s6.7-15,15-15s15,6.7,15,15S58.3,40,50,40z'%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 50 50' to='360 50 50' dur='20s' repeatCount='indefinite'/%3E%3C/path%3E%3C/svg%3E");
 	background-size: contain;
 	background-repeat: no-repeat;
 	background-position: center;
-	filter: blur(2px);
-}
-
-@keyframes continuousFlow {
-	from {
-		transform: translateX(-50%);
-	}
-	to {
-		transform: translateX(50%);
-	}
-}
-
-.border-flow-container {
-	position: relative;
-
-	&::before {
-		content: "";
-		position: absolute;
-		inset: 0;
-		background: linear-gradient(90deg, #f7d6c3 50%, transparent 50%);
-		background-size: 200% 100%;
-		animation: borderFlow 4s linear infinite;
-		mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
-		mask-composite: exclude;
-		padding: 1px;
-		border-radius: 4px;
-	}
-}
-
-@keyframes borderFlow {
-	0% {
-		background-position: 0% 0%;
-	}
-	100% {
-		background-position: 200% 0%;
-	}
-}
-
-.group {
-	display: grid;
-	grid-template-rows: auto 1fr;
-	min-height: 0;
-}
-
-.relative.h-32 {
-	height: auto;
-	aspect-ratio: 16/9;
-}
-
-.scroll-wrapper {
-	height: 100%;
-	overflow: hidden;
-	position: relative;
-}
-
-.scroll-content {
-	will-change: transform;
 }
 </style>

From 58e6f48738359f4dcfc26d6b661ab3ec08faeeda Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 22 Aug 2025 17:34:32 +0800
Subject: [PATCH 12/15] =?UTF-8?q?chore:=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarketerp/smErpTasteStock/form.vue   | 111 -----------------
 .../supermarketerp/smErpTasteStock/index.vue  | 115 ------------------
 .../components/package-unit.vue               |   5 +-
 .../supermarketerp/supermarketSpu/form.vue    |  11 +-
 4 files changed, 5 insertions(+), 237 deletions(-)
 delete mode 100644 src/views/supermarketerp/smErpTasteStock/form.vue
 delete mode 100644 src/views/supermarketerp/smErpTasteStock/index.vue

diff --git a/src/views/supermarketerp/smErpTasteStock/form.vue b/src/views/supermarketerp/smErpTasteStock/form.vue
deleted file mode 100644
index 1e39acf..0000000
--- a/src/views/supermarketerp/smErpTasteStock/form.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-      :close-on-click-modal="false" draggable>
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-       <el-row :gutter="24">
-    <el-col :span="12" class="mb20">
-      <el-form-item label="商品SPU ID" prop="spuId">
-        <el-input v-model="form.spuId" placeholder="请输入商品SPU ID"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="口味名称" prop="taste">
-        <el-input v-model="form.taste" placeholder="请输入口味名称"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="该口味的库存数量" prop="stock">
-        <el-input v-model="form.stock" placeholder="请输入该口味的库存数量"/>
-      </el-form-item>
-      </el-col>
-
-			</el-row>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
-</template>
-
-<script setup lang="ts" name="SmErpTasteStockDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/supermarketerp/smErpTasteStock'
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
-
-// 定义变量内容
-const dataFormRef = ref();
-const visible = ref(false)
-const loading = ref(false)
-// 定义字典
-
-// 提交表单数据
-const form = reactive({
-		id:'',
-	  spuId: '',
-	  taste: '',
-	  stock: '',
-});
-
-// 定义校验规则
-const dataRules = ref({
-})
-
-// 打开弹窗
-const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
-
-  // 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
-
-  // 获取smErpTasteStock信息
-  if (id) {
-    form.id = id
-    getsmErpTasteStockData(id)
-  }
-};
-
-// 提交
-const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
-
-	try {
-    loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
-	} catch (err: any) {
-		useMessage().error(err.msg);
-	} finally {
-    loading.value = false;
-  }
-};
-
-
-// 初始化表单数据
-const getsmErpTasteStockData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
-
-// 暴露变量
-defineExpose({
-  openDialog
-});
-</script>
diff --git a/src/views/supermarketerp/smErpTasteStock/index.vue b/src/views/supermarketerp/smErpTasteStock/index.vue
deleted file mode 100644
index a09fd06..0000000
--- a/src/views/supermarketerp/smErpTasteStock/index.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'supermarket_smErpTasteStock_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'supermarket_smErpTasteStock_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'supermarket_smErpTasteStock_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-				@selection-change="selectionChangHandle"
-        @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center" />
-        <el-table-column type="index" label="#" width="40" />
-          <el-table-column prop="spuId" label="商品SPU ID"  show-overflow-tooltip/>
-          <el-table-column prop="taste" label="口味名称"  show-overflow-tooltip/>
-          <el-table-column prop="stock" label="该口味的库存数量"  show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpTasteStock_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'supermarket_smErpTasteStock_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
-
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
-</template>
-
-<script setup lang="ts" name="systemSmErpTasteStock">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpTasteStock";
-import { useMessage, useMessageBox } from "/@/hooks/message";
-import { useDict } from '/@/hooks/dict';
-
-// 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-// 定义查询字典
-
-// 定义变量内容
-const formDialogRef = ref()
-// 搜索变量
-const queryRef = ref()
-const showSearch = ref(true)
-// 多选变量
-const selectObjs = ref([]) as any
-const multiple = ref(true)
-
-const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
-})
-
-//  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
-
-// 清空搜索条件
-const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
-}
-
-// 导出excel
-const exportExcel = () => {
-  downBlobFile('/supermarket/smErpTasteStock/export', Object.assign(state.queryForm, { ids: selectObjs }), 'smErpTasteStock.xlsx')
-}
-
-// 多选事件
-const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
-
-// 删除操作
-const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
-
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
-</script>
diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index 9fbca26..098fd61 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -150,7 +150,6 @@ export interface rowVU {
 	promotionPrice: number
 	costPrice: number
 	isBase?: boolean | null
-	flag?: string
 	tasteName?: string
 	tasteId: string
 }
@@ -210,7 +209,7 @@ const slotInputChange = (slotParams: any) => {
 }
 
 // 底部新增行
-const pushEvent = (flag?: "flag" | undefined) => {
+const pushEvent = () => {
 	const newRow: rowVU = {
 		id: "tmp_" + nanoid(5),
 		barCode: "",
@@ -226,8 +225,6 @@ const pushEvent = (flag?: "flag" | undefined) => {
 		tasteId: "",
 	}
 
-	if (flag) newRow.flag = "defaultPackageUnitRow"
-
 	packageUnitList.value.push(newRow)
 	nextTick(() => {
 		const $table = tableRef.value
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 6d826e3..87354fb 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -32,7 +32,7 @@
 
 <script setup lang="ts">
 import BaseInfo from "./components/base-info.vue"
-import { type rowVU } from "./components/package-unit.vue"
+import PackageUnit, { type rowVU } from "./components/package-unit.vue"
 import ProductInventory from "./components/product-inventory.vue"
 import AuxiliaryCode, { type rowVC } from "./components/auxiliary-code.vue"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/supermarketSpu"
@@ -143,11 +143,8 @@ const nextStep = () => {
 
 // 默认设置一行基础包装单位
 const setDefaultPackageUnit = () => {
-	if (!form.id && tabPaneActiveIndex.value == 1) {
-		const isFlagRowExist = form.smErpUnitEntityList.some((item: rowVU) => item.flag === "defaultPackageUnitRow")
-		if (isFlagRowExist) return
-
-		packageUnitRef.value.pushEvent("flag")
+	if (!form.id && tabPaneActiveIndex.value == 1 && form.smErpUnitEntityList.length === 0) {
+		packageUnitRef.value.pushEvent()
 		packageUnitRef.value.setRadioRow(0) // 自动设置基础包装单位的radio单选行
 	}
 }
@@ -236,7 +233,7 @@ const settlePackageUnitList = () => {
 		}
 		if (item.id.startsWith("tmp_")) item.id = ""
 		if (item.tasteId?.startsWith("tmp_")) {
-			item.tasteName = form.smErpTasteStockEntityList.find((tasteItem: any) => tasteItem.id === item.tasteId).tasteName
+			item.tasteName = form.smErpTasteStockEntityList.find((tasteItem: any) => tasteItem.id === item.tasteId)?.tasteName || ""
 			item.tasteId = ""
 		}
 		// 转换金额单位

From c96d92b5dd0cb975275b48190790bed62cdf02d3 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 25 Aug 2025 10:52:55 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E5=88=87=E7=AE=97=E6=B3=95=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |  4 +-
 .../components/package-unit.vue               | 40 -------------------
 2 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/.env b/.env
index d202065..f6d7a7d 100644
--- a/.env
+++ b/.env
@@ -30,10 +30,10 @@ VITE_OAUTH2_MOBILE_CLIENT='app:app'
 VITE_OAUTH2_SOCIAL_CLIENT='social:social'
 
 # 是否开启前端滑块验证码
-VITE_VERIFY_ENABLE = true
+VITE_VERIFY_ENABLE = false
 
 # 是否开启前端图形验证码
-VITE_VERIFY_IMAGE_ENABLE = false
+VITE_VERIFY_IMAGE_ENABLE = true
 
 # 是否开启websocket 消息接受,
 VITE_WEBSOCKET_ENABLE = false
diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index a021459..8b915da 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -208,45 +208,6 @@ const slotInputChange = (slotParams: any) => {
 		$table.updateStatus(slotParams)
 	}
 }
-
-// 底部新增行
-<<<<<<< HEAD
-const pushEvent = (row?: rowVU | undefined) => {
-	const newRow = {} as rowVU
-	if (row) {
-		Object.assign(newRow, row)
-	} else {
-1    row = {
-      id: "tmp_" + nanoid(5),
-      barCode: "",
-      spec: "",
-      unit: "",
-      status: "0",
-      packageNum: 1,
-      purchasePrice: 0,
-      retailPrice: 0.01,
-      promotionPrice: 0,
-      costPrice: 0,
-      tasteName: "",
-      tasteId: "",
-    }
-    Object.assign(newRow, row)1
-    const pushEvent = (flag?: "flag" | undefined) => {
-      const newRow: rowVU = {
-        id: "tmp_" + nanoid(5),
-        barCode: "",
-        spec: "",
-        unit: "",
-        status: "0",
-        packageNum: 1,
-        purchasePrice: 0,
-        retailPrice: 0.01,
-        promotionPrice: 0,
-        costPrice: 0,
-        tasteName: "",
-        tasteId: "",
-      }
-=======
 const pushEvent = (flag?: "flag" | undefined) => {
 	const newRow: rowVU = {
 		id: "tmp_" + nanoid(5),
@@ -262,7 +223,6 @@ const pushEvent = (flag?: "flag" | undefined) => {
 		tasteName: "",
 		tasteId: "",
 	}
->>>>>>> 09ed9cd1a67bafec7fdb6796de0dcfbb0b357dec
 
       if (flag) newRow.flag = "defaultPackageUnitRow"
 

From e98c4b5825e728bdd1f7014d4890fe15adde5f5c Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 25 Aug 2025 11:01:22 +0800
Subject: [PATCH 14/15] =?UTF-8?q?fix:=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/component/password.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/component/password.vue b/src/views/login/component/password.vue
index 0651a3c..1cca88b 100644
--- a/src/views/login/component/password.vue
+++ b/src/views/login/component/password.vue
@@ -122,7 +122,7 @@ const state = reactive({
 const loginRules = reactive({
 	username: [{ required: true, trigger: "blur", message: t("password.accountPlaceholder1") }], // 用户名校验规则
 	password: [{ required: true, trigger: "blur", message: t("password.accountPlaceholder2") }], // 密码校验规则
-	code: [{ required: true, trigger: "blur", message: t("verify.imageCode") }],
+	code: [{ required: true, trigger: "blur", message: "请输入验证码" }],
 })
 
 const verifyref = ref<InstanceType<typeof Verify>>(null) // 定义verify组件引用

From ad89129ed29534e93131e2df6b5e0179f0ee962d Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 25 Aug 2025 22:42:47 +0800
Subject: [PATCH 15/15] 1

---
 src/views/supermarketerp/supermarketSpu/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/index.vue b/src/views/supermarketerp/supermarketSpu/index.vue
index c7457b0..b85bb0a 100644
--- a/src/views/supermarketerp/supermarketSpu/index.vue
+++ b/src/views/supermarketerp/supermarketSpu/index.vue
@@ -149,13 +149,13 @@
 		<!-- 编辑、新增 -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 
-		<upload-excel ref="excelUploadRef" title="导入库存商品" url="/supermarket/supermarketSpu/importNew"
+		<upload-excel ref="excelUploadRef" title="导入库存商品" url="/supermarket/supermarketSpu/importNew" temp-url="/admin/sys-file/local/file/supermarketImport.xlsx"
 			@refreshDataList="refreshDataList" />
 
 		<upload-excel-update ref="excelUploadUpdateRef" title="覆盖导入库存商品"
 			url="/supermarket/supermarketSpu/importNewUpdate" @refreshDataList="refreshDataList" />
 
-		<upload-excel ref="excelUploadPd" title="导入库存盘点" url="/supermarket/supermarketSpu/importPDNew"
+		<upload-excel ref="excelUploadPd" title="导入库存盘点" url="/supermarket/supermarketSpu/importPDNew" temp-url="/admin/sys-file/local/file/supermarketPDImport.xlsx"
 			@refreshDataList="refreshDataList" />
 	</div>
 </template>