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] =?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 = ""
 		}
 		// 转换金额单位