From aafc93ba6151d04b37c170a9a982237109f56eb1 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Mon, 13 Jan 2025 16:55:56 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=BE=93=E5=85=A5=E7=A9=BA=E6=A0=BC=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E5=92=8C=E6=95=B0=E5=AD=97=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarket/supermarketBrand/form.vue     |  96 +++---
 .../supermarket/supermarketBrand/index.vue    |  79 +++--
 .../supermarket/supermarketCategory/form.vue  |  90 ++---
 .../supermarket/supermarketCategory/index.vue |  79 +++--
 src/views/supermarket/supermarketSpu/form.vue | 320 +++++++++---------
 .../supermarket/supermarketSpu/index.vue      | 117 ++++---
 6 files changed, 437 insertions(+), 344 deletions(-)

diff --git a/src/views/supermarket/supermarketBrand/form.vue b/src/views/supermarket/supermarketBrand/form.vue
index 3bddb84..41a0de8 100644
--- a/src/views/supermarket/supermarketBrand/form.vue
+++ b/src/views/supermarket/supermarketBrand/form.vue
@@ -10,7 +10,7 @@
 
 				<el-col :span="14" class="mb20">
 					<el-form-item label="品牌名称" prop="name">
-						<el-input v-model="form.name" placeholder="请输入品牌名称" />
+						<el-input v-model.trim="form.name" placeholder="请输入品牌名称" />
 					</el-form-item>
 				</el-col>
 
@@ -22,20 +22,22 @@
 
 				<el-col :span="14" class="mb20">
 					<el-form-item label="品牌排序" prop="sort">
-						<el-input-number :min="1" :max="1000" v-model="form.sort" placeholder="请输入品牌排序" />
+						<el-input-number :min="1" :max="1000" :precision="0" v-model="form.sort" />
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="14" class="mb20">
 					<el-form-item label="品牌描述" prop="description">
-						<el-input v-model="form.description" placeholder="请输入品牌描述" />
+						<el-input v-model.trim="form.description" placeholder="请输入品牌描述" />
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="24" class="mb20">
 					<el-form-item label="状态" prop="status">
 						<el-radio-group v-model="form.status">
-							<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
+							<el-radio :label="item.value" v-for="(item, index) in status" border :key="index"
+								>{{ item.label }}
+							</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
@@ -51,87 +53,87 @@
 </template>
 
 <script setup lang="ts" name="SupermarketBrandDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from '/@/hooks/message';
-import { getObj, addObj, putObj } from '/@/api/supermarket/supermarketBrand';
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/supermarket/supermarketBrand"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
-const visible = ref(false);
-const loading = ref(false);
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
 // 定义字典
-const { status } = useDict('status');
+const { status } = useDict("status")
 
 // 提交表单数据
 const form = reactive({
-	id: '',
-	merchantId: '',
-	name: '',
-	picUrl: '',
+	id: "",
+	merchantId: "",
+	name: "",
+	picUrl: "",
 	sort: 0,
-	description: '',
-	status: '',
-});
+	description: "",
+	status: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-	merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
-	name: [{ required: true, message: '品牌名称不能为空', trigger: 'blur' }],
-	sort: [{ validator: rule.number, trigger: 'blur' }],
-});
+	merchantId: [{ required: true, message: "商户不能为空", trigger: "blur" }],
+	name: [{ required: true, message: "品牌名称不能为空", trigger: "blur" }],
+	sort: [{ validator: rule.number, trigger: "blur" }],
+})
 
 // 打开弹窗
 const openDialog = (id: string) => {
-	visible.value = true;
-	form.id = '';
+	visible.value = true
+	form.id = ""
 
 	// 重置表单数据
 	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+		dataFormRef.value?.resetFields()
+	})
 
 	// 获取supermarketBrand信息
 	if (id) {
-		form.id = id;
-		getsupermarketBrandData(id);
+		form.id = id
+		getsupermarketBrandData(id)
 	}
-};
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	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');
+		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);
+		useMessage().error(err.msg)
 	} finally {
-		loading.value = false;
+		loading.value = false
 	}
-};
+}
 
 // 初始化表单数据
 const getsupermarketBrandData = (id: string) => {
 	// 获取数据
-	loading.value = true;
+	loading.value = true
 	getObj(id)
 		.then((res: any) => {
-			Object.assign(form, res.data);
+			Object.assign(form, res.data)
 		})
 		.finally(() => {
-			loading.value = false;
-		});
-};
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
 	openDialog,
-});
+})
 </script>
diff --git a/src/views/supermarket/supermarketBrand/index.vue b/src/views/supermarket/supermarketBrand/index.vue
index af7a60f..ffdf083 100644
--- a/src/views/supermarket/supermarketBrand/index.vue
+++ b/src/views/supermarket/supermarketBrand/index.vue
@@ -14,7 +14,13 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'supermarket_supermarketBrand_add'">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'supermarket_supermarketBrand_add'"
+					>
 						新 增
 					</el-button>
 					<el-button
@@ -72,7 +78,13 @@
 						>
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketBrand_del'" @click="handleDelete([scope.row.id])">
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'supermarket_supermarketBrand_del'"
+							@click="handleDelete([scope.row.id])"
+						>
 							删除
 						</el-button>
 					</template>
@@ -87,66 +99,71 @@
 </template>
 
 <script setup lang="ts" name="systemSupermarketBrand">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/supermarket/supermarketBrand';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/supermarket/supermarketBrand"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 
-const { status } = useDict('status');
+const { status } = useDict("status")
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = 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 { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/supermarket/supermarketBrand/export', Object.assign(state.queryForm, { ids: selectObjs }), 'supermarketBrand.xlsx');
-};
+	downBlobFile(
+		"/supermarket/supermarketBrand/export",
+		Object.assign(state.queryForm, { ids: selectObjs }),
+		"supermarketBrand.xlsx",
+	)
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/supermarket/supermarketCategory/form.vue b/src/views/supermarket/supermarketCategory/form.vue
index 609686e..2f27196 100644
--- a/src/views/supermarket/supermarketCategory/form.vue
+++ b/src/views/supermarket/supermarketCategory/form.vue
@@ -10,7 +10,7 @@
 
 				<el-col :span="14" class="mb20">
 					<el-form-item label="分类名称" prop="name">
-						<el-input v-model="form.name" placeholder="请输入分类名称" />
+						<el-input v-model.trim="form.name" placeholder="请输入分类名称" />
 					</el-form-item>
 				</el-col>
 
@@ -22,14 +22,16 @@
 
 				<el-col :span="14" class="mb20">
 					<el-form-item label="分类排序" prop="sort">
-						<el-input-number :min="1" :max="1000" v-model="form.sort" placeholder="请输入分类排序" />
+						<el-input-number v-model="form.sort" :min="1" :max="1000" :precision="0" />
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="24" class="mb20">
 					<el-form-item label="开启状态" prop="status">
 						<el-radio-group v-model="form.status">
-							<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
+							<el-radio :label="item.value" v-for="(item, index) in status" border :key="index"
+								>{{ item.label }}
+							</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
@@ -52,85 +54,85 @@
 </template>
 
 <script setup lang="ts" name="SupermarketCategoryDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from '/@/hooks/message';
-import { getObj, addObj, putObj } from '/@/api/supermarket/supermarketCategory';
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/supermarket/supermarketCategory"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
-const visible = ref(false);
-const loading = ref(false);
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
 // 定义字典
-const { status } = useDict('status');
+const { status } = useDict("status")
 
 // 提交表单数据
 const form = reactive({
-	id: '',
-	merchantId: '',
-	name: '',
-	picUrl: '',
+	id: "",
+	merchantId: "",
+	name: "",
+	picUrl: "",
 	sort: 0,
-	status: '',
-});
+	status: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-	merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
-	name: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
-});
+	merchantId: [{ required: true, message: "商户不能为空", trigger: "blur" }],
+	name: [{ required: true, message: "分类名称不能为空", trigger: "blur" }],
+})
 
 // 打开弹窗
 const openDialog = (id: string) => {
-	visible.value = true;
-	form.id = '';
+	visible.value = true
+	form.id = ""
 
 	// 重置表单数据
 	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+		dataFormRef.value?.resetFields()
+	})
 
 	// 获取supermarketCategory信息
 	if (id) {
-		form.id = id;
-		getsupermarketCategoryData(id);
+		form.id = id
+		getsupermarketCategoryData(id)
 	}
-};
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	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');
+		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);
+		useMessage().error(err.msg)
 	} finally {
-		loading.value = false;
+		loading.value = false
 	}
-};
+}
 
 // 初始化表单数据
 const getsupermarketCategoryData = (id: string) => {
 	// 获取数据
-	loading.value = true;
+	loading.value = true
 	getObj(id)
 		.then((res: any) => {
-			Object.assign(form, res.data);
+			Object.assign(form, res.data)
 		})
 		.finally(() => {
-			loading.value = false;
-		});
-};
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
 	openDialog,
-});
+})
 </script>
diff --git a/src/views/supermarket/supermarketCategory/index.vue b/src/views/supermarket/supermarketCategory/index.vue
index 95d0ef1..ba764af 100644
--- a/src/views/supermarket/supermarketCategory/index.vue
+++ b/src/views/supermarket/supermarketCategory/index.vue
@@ -14,7 +14,13 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'supermarket_supermarketCategory_add'">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'supermarket_supermarketCategory_add'"
+					>
 						新 增
 					</el-button>
 					<el-button
@@ -73,7 +79,13 @@
 						>
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketCategory_del'" @click="handleDelete([scope.row.id])">
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'supermarket_supermarketCategory_del'"
+							@click="handleDelete([scope.row.id])"
+						>
 							删除
 						</el-button>
 					</template>
@@ -88,67 +100,72 @@
 </template>
 
 <script setup lang="ts" name="systemSupermarketCategory">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/supermarket/supermarketCategory';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/supermarket/supermarketCategory"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
-const { status } = useDict('status');
+const { status } = useDict("status")
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = 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 { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/supermarket/supermarketCategory/export', Object.assign(state.queryForm, { ids: selectObjs }), 'supermarketCategory.xlsx');
-};
+	downBlobFile(
+		"/supermarket/supermarketCategory/export",
+		Object.assign(state.queryForm, { ids: selectObjs }),
+		"supermarketCategory.xlsx",
+	)
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index 88760ad..99bf759 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -11,23 +11,28 @@
 						</el-col>
 						<el-col :span="12" class="mb20">
 							<el-form-item label="货号" prop="productCode">
-								<el-input v-model="form.productCode" placeholder="请输入货号" />
+								<el-input v-model.trim="form.productCode" placeholder="请输入货号" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12" class="mb20">
 							<el-form-item label="自编码/条码" prop="barcode">
-								<el-input v-model="form.barcode" placeholder="请输入自编码/条码" />
+								<el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12" class="mb20">
 							<el-form-item label="商品名称" prop="productName">
-								<el-input v-model="form.productName" placeholder="请输入商品名称" />
+								<el-input v-model.trim="form.productName" placeholder="请输入商品名称" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12" class="mb20">
 							<el-form-item label="货商" prop="supplierId">
 								<el-select v-model="form.supplierId" placeholder="请选择货商">
-									<el-option v-for="item in supplierOptions" :key="item?.id" :label="item?.typeName" :value="item?.id" />
+									<el-option
+										v-for="item in supplierOptions"
+										:key="item?.id"
+										:label="item?.typeName"
+										:value="item?.id"
+									/>
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -50,13 +55,18 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-            <el-col :span="12" class="mb20">
-              <el-form-item label="商品性质" prop="productNature">
-                <el-select v-model="form.productNature" placeholder="请选择商品性质">
-                  <el-option :value="item.value" :label="item.label" v-for="(item, index) in supermarket_nature" :key="index"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="商品性质" prop="productNature">
+								<el-select v-model="form.productNature" placeholder="请选择商品性质">
+									<el-option
+										:value="item.value"
+										:label="item.label"
+										v-for="(item, index) in supermarket_nature"
+										:key="index"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
 						<el-col :span="24" class="mb20">
 							<el-form-item label="商品封面图" prop="picUrl">
 								<upload-img v-model:imageUrl="form.picUrl"></upload-img>
@@ -69,56 +79,58 @@
 						</el-col>
 						<el-col :span="12" class="mb20">
 							<el-form-item label="排序字段" prop="sort">
-								<el-input-number :min="0" :max="1000" v-model="form.sort" placeholder="请输入排序字段"></el-input-number>
+								<el-input-number :min="0" :max="1000" :precision="0" v-model="form.sort" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="24" class="mb20">
 							<el-form-item label="商品状态" prop="status">
 								<el-radio-group v-model="form.status">
-									<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
+									<el-radio :label="item.value" v-for="(item, index) in status" border :key="index"
+										>{{ item.label }}
+									</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
-<!--						<el-col :span="12" class="mb20">-->
-<!--							<el-form-item label="成本单价" prop="costPrice">-->
-<!--								<el-input-number v-model="form.costPrice" placeholder="请输入成本单价，单位:分"></el-input-number>-->
-<!--							</el-form-item>-->
-<!--						</el-col>-->
+						<!--						<el-col :span="12" class="mb20">-->
+						<!--							<el-form-item label="成本单价" prop="costPrice">-->
+						<!--								<el-input-number v-model="form.costPrice" placeholder="请输入成本单价，单位:分"></el-input-number>-->
+						<!--							</el-form-item>-->
+						<!--						</el-col>-->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="库存" prop="stock">
-								<el-input-number v-model="form.stock" placeholder="请输入库存"></el-input-number>
+								<el-input-number v-model="form.stock" :min="0" :precision="0" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12" class="mb20">
 							<el-form-item label="赠送积分" prop="giveIntegral">
-								<el-input-number v-model="form.giveIntegral" placeholder="请输入赠送积分"></el-input-number>
+								<el-input-number v-model="form.giveIntegral" :min="0" :precision="0" />
 							</el-form-item>
 						</el-col>
-<!--						<el-col :span="12" class="mb20">-->
-<!--							<el-form-item label="规格" prop="specification">-->
-<!--								<el-input v-model="form.specification" placeholder="请输入规格" />-->
-<!--							</el-form-item>-->
-<!--						</el-col>-->
+						<!--						<el-col :span="12" class="mb20">-->
+						<!--							<el-form-item label="规格" prop="specification">-->
+						<!--								<el-input v-model="form.specification" placeholder="请输入规格" />-->
+						<!--							</el-form-item>-->
+						<!--						</el-col>-->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="产地" prop="origin">
-								<el-input v-model="form.origin" placeholder="请输入产地" />
+								<el-input v-model.trim="form.origin" placeholder="请输入产地" />
 							</el-form-item>
 						</el-col>
-<!--						<el-col :span="12" class="mb20">-->
-<!--							<el-form-item label="装数" prop="packingQuantity">-->
-<!--								<el-input-number :min="0" v-model="form.packingQuantity" placeholder="请输入装数"></el-input-number>-->
-<!--							</el-form-item>-->
-<!--						</el-col>-->
-<!--						<el-col :span="12" class="mb20">-->
-<!--							<el-form-item label="零售价" prop="retailPrice">-->
-<!--								<el-input-number v-model="form.retailPrice" placeholder="请输入零售价"></el-input-number>-->
-<!--							</el-form-item>-->
-<!--						</el-col>-->
-<!--						<el-col :span="12" class="mb20">-->
-<!--							<el-form-item label="进价" prop="purchasePrice">-->
-<!--								<el-input-number v-model="form.purchasePrice" placeholder="请输入进价"></el-input-number>-->
-<!--							</el-form-item>-->
-<!--						</el-col>-->
+						<!--						<el-col :span="12" class="mb20">-->
+						<!--							<el-form-item label="装数" prop="packingQuantity">-->
+						<!--								<el-input-number :min="0" v-model="form.packingQuantity" placeholder="请输入装数"></el-input-number>-->
+						<!--							</el-form-item>-->
+						<!--						</el-col>-->
+						<!--						<el-col :span="12" class="mb20">-->
+						<!--							<el-form-item label="零售价" prop="retailPrice">-->
+						<!--								<el-input-number v-model="form.retailPrice" placeholder="请输入零售价"></el-input-number>-->
+						<!--							</el-form-item>-->
+						<!--						</el-col>-->
+						<!--						<el-col :span="12" class="mb20">-->
+						<!--							<el-form-item label="进价" prop="purchasePrice">-->
+						<!--								<el-input-number v-model="form.purchasePrice" placeholder="请输入进价"></el-input-number>-->
+						<!--							</el-form-item>-->
+						<!--						</el-col>-->
 						<!--						<el-col :span="12" class="mb20">-->
 						<!--							<el-form-item label="会员价1" prop="memberPrice1">-->
 						<!--								<el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>-->
@@ -149,11 +161,11 @@
 						<!--								<el-input-number v-model="form.wholesalePrice3" placeholder="请输入批发价3"></el-input-number>-->
 						<!--							</el-form-item>-->
 						<!--						</el-col>-->
-<!--						<el-col :span="12" class="mb20">-->
-<!--							<el-form-item label="促销价" prop="promotionPrice">-->
-<!--								<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价"></el-input-number>-->
-<!--							</el-form-item>-->
-<!--						</el-col>-->
+						<!--						<el-col :span="12" class="mb20">-->
+						<!--							<el-form-item label="促销价" prop="promotionPrice">-->
+						<!--								<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价"></el-input-number>-->
+						<!--							</el-form-item>-->
+						<!--						</el-col>-->
 						<!-- <el-col :span="24" class="mb20">
 							<el-form-item label="商品简介" prop="introduction">
 								<el-input type="textarea" v-model="form.introduction" rows="4" placeholder="请输入商品简介" maxlength="400" show-word-limit />
@@ -166,17 +178,17 @@
 						</el-col>
 						<el-col :span="12" class="mb20">
 							<el-form-item label="库存上限" prop="inventoryUpperLimit">
-								<el-input-number v-model="form.inventoryUpperLimit" placeholder="请输入库存上限"></el-input-number>
+								<el-input-number v-model="form.inventoryUpperLimit" :min="0" :precision="0" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12" class="mb20">
 							<el-form-item label="库存下限" prop="inventoryLowerLimit">
-								<el-input-number v-model="form.inventoryLowerLimit" placeholder="请输入库存下限"></el-input-number>
+								<el-input-number v-model="form.inventoryLowerLimit" :min="0" :precision="0" />
 							</el-form-item>
 						</el-col>
 						<el-col :span="12" class="mb20">
 							<el-form-item label="毛利率" prop="grossMargin">
-								<el-input-number v-model="form.grossMargin" placeholder="请输入毛利率"></el-input-number>
+								<el-input-number v-model="form.grossMargin" :min="0" :precision="2" />
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -185,7 +197,9 @@
 					<supermarketUnit v-model:supermarketUnitEntityList="form.supermarketUnitEntityList" />
 				</el-tab-pane>
 				<el-tab-pane label="辅助条码" name="辅助条码" style="overflow-y: auto; height: 60vh">
-					<supermarketAuxiliaryCode v-model:supermarketAuxiliaryCodeEntityList="form.supermarketAuxiliaryCodeEntityList" />
+					<supermarketAuxiliaryCode
+						v-model:supermarketAuxiliaryCodeEntityList="form.supermarketAuxiliaryCodeEntityList"
+					/>
 				</el-tab-pane>
 			</el-tabs>
 		</el-form>
@@ -195,54 +209,56 @@
 				<el-button @click="visible = false">取消</el-button>
 				<el-button v-if="currentTabPaneIndex != 0" type="primary" @click="currentTabPaneIndex--">上一步</el-button>
 				<el-button v-if="currentTabPaneIndex != 2" type="primary" @click="currentTabPaneIndex++">下一步</el-button>
-				<el-button v-if="currentTabPaneIndex == 2" type="primary" @click="onSubmit" :disabled="loading">确 认</el-button>
+				<el-button v-if="currentTabPaneIndex == 2" type="primary" @click="onSubmit" :disabled="loading"
+					>确 认</el-button
+				>
 			</span>
 		</template>
 	</el-dialog>
 </template>
 
 <script setup lang="ts">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from '/@/hooks/message';
-import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from '/@/api/supermarket/supermarketSpu';
-import { getSupplierTypeOptions } from '/@/api/supermarketerp/smErpSupplier';
-import { rule } from '/@/utils/validate';
-import supermarketAuxiliaryCode from './components/supermarketAuxiliaryCode/index.vue';
-import supermarketUnit from './components/supermarketUnit/index.vue';
-import { TabPaneName } from 'element-plus';
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarket/supermarketSpu"
+import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
+import { rule } from "/@/utils/validate"
+import supermarketAuxiliaryCode from "./components/supermarketAuxiliaryCode/index.vue"
+import supermarketUnit from "./components/supermarketUnit/index.vue"
+import { TabPaneName } from "element-plus"
 
-const emit = defineEmits(['refresh']);
+const emit = defineEmits(["refresh"])
 
-const tabPaneEnum = ['基础信息', '包装单位', '辅助条码'];
-const dataFormRef = ref();
-const visible = ref(false);
-const loading = ref(false);
-const currentTabPaneIndex = ref(0);
-const tabPaneActiveName = computed(() => tabPaneEnum[currentTabPaneIndex.value]);
+const tabPaneEnum = ["基础信息", "包装单位", "辅助条码"]
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+const currentTabPaneIndex = ref(0)
+const tabPaneActiveName = computed(() => tabPaneEnum[currentTabPaneIndex.value])
 
 // 提交表单数据
 const form = reactive({
-	id: '',
-	merchantId: '',
-	productCode: '',
-	barcode: '',
-	productName: '',
-	unit: '',
-	categoryId: '',
-	brandId: '',
-	picUrl: '',
-	sliderPicUrls: '',
+	id: "",
+	merchantId: "",
+	productCode: "",
+	barcode: "",
+	productName: "",
+	unit: "",
+	categoryId: "",
+	brandId: "",
+	picUrl: "",
+	sliderPicUrls: "",
 	sort: 0,
-	status: '',
+	status: "",
 	costPrice: 0,
 	stock: 0,
 	giveIntegral: 0,
-	specification: '',
-	origin: '',
+	specification: "",
+	origin: "",
 	packingQuantity: 0,
 	retailPrice: 0,
 	purchasePrice: 0,
-	supplierId: '',
+	supplierId: "",
 	memberPrice1: 0,
 	memberPrice2: 0,
 	memberPrice3: 0,
@@ -250,147 +266,149 @@ const form = reactive({
 	wholesalePrice2: 0,
 	wholesalePrice3: 0,
 	promotionPrice: 0,
-	productNature: '',
-	introduction: '',
-	description: '<p></p>',
+	productNature: "",
+	introduction: "",
+	description: "<p></p>",
 	inventoryUpperLimit: 0,
 	inventoryLowerLimit: 0,
 	grossMargin: 0,
 	supermarketUnitEntityList: [],
 	supermarketAuxiliaryCodeEntityList: [],
-});
+})
 // 定义校验规则
 const dataRules = {
-  productNature : [{ required: true, message: '请选择商品性质', trigger: 'blur' }],
-	merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
-	productCode: [{ required: true, message: '货号不能为空', trigger: 'blur' }],
-	barcode: [{ required: true, message: '自编码/条码不能为空', trigger: 'blur' }],
-	productName: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
-	unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
-	categoryId: [{ required: true, message: '商品分类不能为空', trigger: 'blur' }],
-	brandId: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
-	picUrl: [{ required: true, message: '商品封面图不能为空', trigger: 'blur' }],
-	status: [{ required: true, message: '请选择商品状态', trigger: 'blur' }],
-	supplierId: [{ required: true, message: '请选择货商', trigger: 'blur' }],
-	supermarketUnitEntityList: [{ required: true, message: '请添加包装单位', trigger: 'change' }],
-	supermarketAuxiliaryCodeEntityList: [{ required: true, message: '请添加辅助条码', trigger: 'change' }],
-};
-const { supermarket_nature, status } = useDict('supermarket_nature', 'status');
-const categoryOptions = ref<any>([]); // 商品分类的下拉选项
-const brandOptions = ref<any>([]); // 超市品牌的下拉选项
-const supplierOptions = ref<any>([]); // 货商的下拉选项
+	productNature: [{ required: true, message: "请选择商品性质", trigger: "blur" }],
+	merchantId: [{ required: true, message: "商户不能为空", trigger: "blur" }],
+	productCode: [{ required: true, message: "货号不能为空", trigger: "blur" }],
+	barcode: [{ required: true, message: "自编码/条码不能为空", trigger: "blur" }],
+	productName: [{ required: true, message: "商品名称不能为空", trigger: "blur" }],
+	unit: [{ required: true, message: "单位不能为空", trigger: "blur" }],
+	categoryId: [{ required: true, message: "商品分类不能为空", trigger: "blur" }],
+	brandId: [{ required: true, message: "品牌不能为空", trigger: "blur" }],
+	picUrl: [{ required: true, message: "商品封面图不能为空", trigger: "blur" }],
+	status: [{ required: true, message: "请选择商品状态", trigger: "blur" }],
+	supplierId: [{ required: true, message: "请选择货商", trigger: "blur" }],
+	supermarketUnitEntityList: [{ required: true, message: "请添加包装单位", trigger: "change" }],
+	supermarketAuxiliaryCodeEntityList: [{ required: true, message: "请添加辅助条码", trigger: "change" }],
+}
+const { supermarket_nature, status } = useDict("supermarket_nature", "status")
+const categoryOptions = ref<any>([]) // 商品分类的下拉选项
+const brandOptions = ref<any>([]) // 超市品牌的下拉选项
+const supplierOptions = ref<any>([]) // 货商的下拉选项
 
 // 初始化表单数据
 const getsupermarketSpuData = (id: string) => {
 	// 获取数据
-	loading.value = true;
+	loading.value = true
 	getObj(id)
 		.then((res: any) => {
-			Object.assign(form, res.data);
+			Object.assign(form, res.data)
 		})
 		.finally(() => {
-			loading.value = false;
-		});
-};
+			loading.value = false
+		})
+}
 
 // 打开弹窗
 const openDialog = async (id: string) => {
-	visible.value = true;
-	currentTabPaneIndex.value = 0;
-	form.id = '';
+	visible.value = true
+	currentTabPaneIndex.value = 0
+	form.id = ""
 
 	// 重置表单数据
-	dataFormRef.value?.resetFields();
+	dataFormRef.value?.resetFields()
 
 	// 获取supermarketSpu信息
 	if (id) {
-		form.id = id;
-		getsupermarketSpuData(id);
+		form.id = id
+		getsupermarketSpuData(id)
 	}
 
 	// 获取分类下拉选项
 	if (categoryOptions.value.length <= 0) {
 		try {
-			const res = await getSupermarketCategory();
-			categoryOptions.value = res.data;
+			const res = await getSupermarketCategory()
+			categoryOptions.value = res.data
 		} catch (error) {
-			categoryOptions.value = [];
+			categoryOptions.value = []
 		}
 	}
 
 	// 获取品牌下拉选项
 	if (brandOptions.value.length <= 0) {
 		try {
-			const res = await getSupermarketBrand();
-			brandOptions.value = res.data;
+			const res = await getSupermarketBrand()
+			brandOptions.value = res.data
 		} catch (error) {
-			brandOptions.value = [];
+			brandOptions.value = []
 		}
 	}
 
 	// 获取货商下拉选项
 	if (supplierOptions.value.length <= 0) {
 		try {
-			const res = await getSupplierTypeOptions();
-			supplierOptions.value = res.data;
+			const res = await getSupplierTypeOptions()
+			supplierOptions.value = res.data
 		} catch (error) {
-			supplierOptions.value = [];
+			supplierOptions.value = []
 		}
 	}
-};
+}
 
 // tab栏切换
 const handleTabChange = (name: TabPaneName) => {
-	currentTabPaneIndex.value = tabPaneEnum.findIndex((item) => item === name);
-};
+	currentTabPaneIndex.value = tabPaneEnum.findIndex((item) => item === name)
+}
 
 // 提交
 const onSubmit = async () => {
-	console.log(form);
+	console.log(form)
 
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) useMessage().warning('基础信息必填项未填写完整');
-	if (!form.supermarketUnitEntityList || form.supermarketUnitEntityList.length <= 0) useMessage().warning('请添加包装单位');
-	if (!form.supermarketAuxiliaryCodeEntityList || form.supermarketAuxiliaryCodeEntityList.length <= 0) useMessage().warning('请添加辅助条码');
-	if (!valid) return false;
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) useMessage().warning("基础信息必填项未填写完整")
+	if (!form.supermarketUnitEntityList || form.supermarketUnitEntityList.length <= 0)
+		useMessage().warning("请添加包装单位")
+	if (!form.supermarketAuxiliaryCodeEntityList || form.supermarketAuxiliaryCodeEntityList.length <= 0)
+		useMessage().warning("请添加辅助条码")
+	if (!valid) return false
 
 	try {
-		loading.value = true;
+		loading.value = true
 		if (form.id) {
 			form.supermarketUnitEntityList.map((item: any) => {
 				if (item.isNew) {
-					item.id = '';
-					delete item.isNew;
+					item.id = ""
+					delete item.isNew
 				}
-			});
+			})
 			form.supermarketAuxiliaryCodeEntityList.map((item: any) => {
 				if (item.isNew) {
-					item.id = '';
-					delete item.isNew;
+					item.id = ""
+					delete item.isNew
 				}
-			});
-			await putObj(form);
+			})
+			await putObj(form)
 		} else {
 			form.supermarketUnitEntityList.map((item: any) => {
-				item.id = '';
-			});
+				item.id = ""
+			})
 			form.supermarketAuxiliaryCodeEntityList.map((item: any) => {
-				item.id = '';
-			});
-			await addObj(form);
+				item.id = ""
+			})
+			await addObj(form)
 		}
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-		loading.value = false;
+		loading.value = false
 	}
-};
+}
 
 // 暴露变量
 defineExpose({
 	openDialog,
-});
+})
 </script>
diff --git a/src/views/supermarket/supermarketSpu/index.vue b/src/views/supermarket/supermarketSpu/index.vue
index affa3c2..76980f8 100644
--- a/src/views/supermarket/supermarketSpu/index.vue
+++ b/src/views/supermarket/supermarketSpu/index.vue
@@ -20,7 +20,13 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'supermarket_supermarketSpu_add'">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'supermarket_supermarketSpu_add'"
+					>
 						新 增
 					</el-button>
 					<el-button
@@ -63,6 +69,11 @@
 						{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
 					</template>
 				</el-table-column>
+				<el-table-column prop="brandId" label="品牌" show-overflow-tooltip>
+					<template #default="scope">
+						{{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}
+					</template>
+				</el-table-column>
 				<el-table-column prop="picUrl" label="封面图" width="100">
 					<template #default="scope">
 						<preview-image style="width: 50px; height: 50px" :src="imageBaseUrl + scope.row.picUrl" />
@@ -91,13 +102,24 @@
 				<!-- <el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="grossMargin" label="毛利率" show-overflow-tooltip /> -->
-				<el-table-column prop="brandId" label="品牌" show-overflow-tooltip />
 				<el-table-column label="操作" width="150" fixed="right">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_supermarketSpu_edit'" @click="formDialogRef.openDialog(scope.row.id)">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'supermarket_supermarketSpu_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+						>
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketSpu_del'" @click="handleDelete([scope.row.id])">
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'supermarket_supermarketSpu_del'"
+							@click="handleDelete([scope.row.id])"
+						>
 							删除
 						</el-button>
 					</template>
@@ -106,84 +128,99 @@
 			<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="systemSupermarketSpu">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs, getSupermarketCategory } from '/@/api/supermarket/supermarketSpu';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
-const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarket/supermarketSpu"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 
-const { supermarket_nature, status } = useDict('supermarket_nature', 'status');
+const { supermarket_nature, status } = useDict("supermarket_nature", "status")
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 // 商品分类
-const supermarketCategory = ref<any>([]);
+const supermarketCategory = ref<any>([])
+// 商品品牌
+const supermarketBrand = ref<any>([])
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/supermarket/supermarketSpu/export', Object.assign(state.queryForm, { ids: selectObjs }), 'supermarketSpu.xlsx');
-};
+	downBlobFile(
+		"/supermarket/supermarketSpu/export",
+		Object.assign(state.queryForm, { ids: selectObjs }),
+		"supermarketSpu.xlsx",
+	)
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 
 onMounted(async () => {
+	// 商品分类
 	try {
-		const res = await getSupermarketCategory();
-		supermarketCategory.value = res.data;
+		const res = await getSupermarketCategory()
+		supermarketCategory.value = res.data
 	} catch (error) {
-		supermarketCategory.value = [];
+		supermarketCategory.value = []
 	}
-});
+	// 商品品牌
+	try {
+		const res = await getSupermarketBrand()
+		supermarketBrand.value = res.data
+	} catch (error) {
+		supermarketBrand.value = []
+	}
+})
 </script>

From 62f19c9e4f6d654f8822838512b917c5d6ad1fed Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Mon, 13 Jan 2025 18:21:52 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B6=85=E5=B8=82=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=B8=85=E9=99=A4=E7=A9=BA=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=9A=84=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarketAuxiliaryCode/form.vue         |  46 ++++----
 .../components/supermarketUnit/form.vue       | 100 +++++++++---------
 .../components/supermarketUnit/index.vue      |  71 ++++++++-----
 src/views/supermarket/supermarketSpu/form.vue |  37 ++++---
 .../supermarket/supermarketSpu/index.vue      |   4 +-
 5 files changed, 146 insertions(+), 112 deletions(-)

diff --git a/src/views/supermarket/supermarketSpu/components/supermarketAuxiliaryCode/form.vue b/src/views/supermarket/supermarketSpu/components/supermarketAuxiliaryCode/form.vue
index 7f7de51..e4e15cd 100644
--- a/src/views/supermarket/supermarketSpu/components/supermarketAuxiliaryCode/form.vue
+++ b/src/views/supermarket/supermarketSpu/components/supermarketAuxiliaryCode/form.vue
@@ -4,7 +4,7 @@
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="条码" prop="barCode">
-						<el-input v-model="form.barCode" placeholder="请输入条码" />
+						<el-input v-model.trim="form.barCode" placeholder="请输入条码" />
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -19,56 +19,56 @@
 </template>
 
 <script setup lang="ts" name="SupermarketAuxiliaryCodeDialog">
-import { nanoid } from 'nanoid';
+import { nanoid } from "nanoid"
 
-const emit = defineEmits(['refresh']);
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
-const visible = ref(false);
-const loading = ref(false);
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
 
 // 提交表单数据
 const form = reactive<any>({
-	id: '',
-	barCode: '',
-});
+	id: "",
+	barCode: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-	barCode: [{ required: true, message: '条码不能为空', trigger: 'blur' }],
-	spuId: [{ required: true, message: 'spuID不能为空', trigger: 'blur' }],
-});
+	barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
+	spuId: [{ required: true, message: "spuID不能为空", trigger: "blur" }],
+})
 
 // 打开弹窗
 const openDialog = (rowData: any = null) => {
-	visible.value = true;
-	form.id = nanoid(5);
+	visible.value = true
+	form.id = nanoid(5)
 
 	// 重置表单数据
-	dataFormRef.value?.resetFields();
+	dataFormRef.value?.resetFields()
 
 	if (rowData) {
-		Object.assign(form, rowData);
+		Object.assign(form, rowData)
 	}
-};
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	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 ? '修改成功' : '添加成功');
-	emit('refresh', { ...form });
-	visible.value = false;
+	emit("refresh", { ...form })
+	visible.value = false
 	// } catch (err: any) {
 	// 	useMessage().error(err.msg);
 	// } finally {
 	// 	loading.value = false;
 	// }
-};
+}
 
 // 初始化表单数据
 // const getsupermarketAuxiliaryCodeData = (id: string) => {
@@ -86,5 +86,5 @@ const onSubmit = async () => {
 // 暴露变量
 defineExpose({
 	openDialog,
-});
+})
 </script>
diff --git a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
index b86ee44..8622b09 100644
--- a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
+++ b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
@@ -4,19 +4,19 @@
 			<el-row :gutter="24">
 				<el-col :span="14" class="mb20">
 					<el-form-item label="条码" prop="barCode">
-						<el-input placeholder="请输入条码" v-model="form.barCode" />
+						<el-input placeholder="请输入条码" v-model.trim="form.barCode" />
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="14" class="mb20">
 					<el-form-item label="规格" prop="spec">
-						<el-input placeholder="请输入规格" v-model="form.spec" />
+						<el-input placeholder="请输入规格" v-model.trim="form.spec" />
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="14" class="mb20">
 					<el-form-item label="单位" prop="unit">
-						<el-input placeholder="请输入单位" v-model="form.unit" />
+						<el-input placeholder="请输入单位" v-model.trim="form.unit" />
 					</el-form-item>
 				</el-col>
 
@@ -31,29 +31,29 @@
 
 				<el-col :span="14" class="mb20">
 					<el-form-item label="内装数量" prop="packageNum">
-						<el-input-number v-model="form.packageNum" placeholder="请输入内装数量" />
+						<el-input-number v-model="form.packageNum" :min="0" :precision="0" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="14" class="mb20">
+					<el-form-item label="零售价" prop="retailPrice">
+						<el-input-number v-model="form.retailPrice" :min="0" :precision="2" />
 					</el-form-item>
 				</el-col>
-        <el-col :span="14" class="mb20">
-          <el-form-item label="零售价" prop="retailPrice">
-            <el-input-number v-model="form.retailPrice" placeholder="请输入零售价" />
-          </el-form-item>
-        </el-col>
 
-        <el-col :span="14" class="mb20">
-          <el-form-item label="促销价" prop="promotionPrice">
-            <el-input-number v-model="form.promotionPrice" placeholder="请输入促销价" />
-          </el-form-item>
-        </el-col>
+				<el-col :span="14" class="mb20">
+					<el-form-item label="促销价" prop="promotionPrice">
+						<el-input-number v-model="form.promotionPrice" :min="0" :precision="2" />
+					</el-form-item>
+				</el-col>
 				<el-col :span="14" class="mb20">
 					<el-form-item label="进价" prop="purchasePrice">
-						<el-input-number v-model="form.purchasePrice" placeholder="请输入进价" />
+						<el-input-number v-model="form.purchasePrice" :min="0" :precision="2" />
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="14" class="mb20">
 					<el-form-item label="成本价" prop="costPrice">
-						<el-input-number v-model="form.costPrice" placeholder="请输入成本价" />
+						<el-input-number v-model="form.costPrice" :min="0" :precision="2" />
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -68,71 +68,71 @@
 </template>
 
 <script setup lang="ts" name="SupermarketAuxiliaryCodeDialog">
-import { nanoid } from 'nanoid';
+import { nanoid } from "nanoid"
 
-const emit = defineEmits(['refresh']);
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
-const visible = ref(false);
-const loading = ref(false);
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
 
 // 提交表单数据
 const form = reactive({
-	id: '',
-	barCode: '',
-	spec: '',
-	unit: '',
-	status: '',
+	id: "",
+	barCode: "",
+	spec: "",
+	unit: "",
+	status: "",
 	packageNum: 0,
-	purchasePrice: '',
-	retailPrice: '',
-	promotionPrice: '',
-	costPrice: '',
-});
+	purchasePrice: "",
+	retailPrice: "",
+	promotionPrice: "",
+	costPrice: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-	barCode: [{ required: true, message: '条码不能为空', trigger: 'blur' }],
-	spec: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
-	unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
-	status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
-	packageNum: [{ required: true, message: '内装数量不能为空', trigger: 'blur' }],
+	barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
+	spec: [{ required: true, message: "规格不能为空", trigger: "blur" }],
+	unit: [{ required: true, message: "单位不能为空", trigger: "blur" }],
+	status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
+	packageNum: [{ required: true, message: "内装数量不能为空", trigger: "blur" }],
 	// purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }],
-	retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
-  // promotionPrice: [{ required: true, message: '促销价不能为空', trigger: 'blur' }],
-});
+	retailPrice: [{ required: true, message: "零售价不能为空", trigger: "blur" }],
+	// promotionPrice: [{ required: true, message: '促销价不能为空', trigger: 'blur' }],
+})
 
 // 打开弹窗
 const openDialog = (rowData: any = null) => {
-	visible.value = true;
-	form.id = nanoid(5);
+	visible.value = true
+	form.id = nanoid(5)
 
 	// 重置表单数据
-	dataFormRef.value?.resetFields();
+	dataFormRef.value?.resetFields()
 
 	if (rowData) {
-		Object.assign(form, rowData);
+		Object.assign(form, rowData)
 	}
-};
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	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 ? '修改成功' : '添加成功');
-	emit('refresh', { ...form });
-	visible.value = false;
+	emit("refresh", { ...form })
+	visible.value = false
 	// } catch (err: any) {
 	// useMessage().error(err.msg);
 	// } finally {
 	// loading.value = false;
 	// }
-};
+}
 
 // 初始化表单数据
 // const getSupermarketUnitData = (id: string) => {
@@ -150,5 +150,5 @@ const onSubmit = async () => {
 // 暴露变量
 defineExpose({
 	openDialog,
-});
+})
 </script>
diff --git a/src/views/supermarket/supermarketSpu/components/supermarketUnit/index.vue b/src/views/supermarket/supermarketSpu/components/supermarketUnit/index.vue
index 4d30457..341346b 100644
--- a/src/views/supermarket/supermarketSpu/components/supermarketUnit/index.vue
+++ b/src/views/supermarket/supermarketSpu/components/supermarketUnit/index.vue
@@ -31,7 +31,12 @@
 		</el-row> -->
 		<el-row>
 			<div class="mb8" style="width: 100%">
-				<el-button icon="folder-add" type="primary" class="ml10" v-auth="'supermarket_supermarketUnit_add'" @click="formDialogRef.openDialog()"
+				<el-button
+					icon="folder-add"
+					type="primary"
+					class="ml10"
+					v-auth="'supermarket_supermarketUnit_add'"
+					@click="formDialogRef.openDialog()"
 					>新 增</el-button
 				>
 				<!-- <el-button
@@ -54,7 +59,12 @@
 			</div>
 		</el-row>
 		<el-form-item label="" prop="supermarketUnitEntityList">
-			<el-table :data="supermarketUnitEntityList" border :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle">
+			<el-table
+				:data="supermarketUnitEntityList"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+			>
 				<!-- <el-table-column type="selection" width="40" align="center" fixed /> -->
 				<el-table-column type="index" label="#" width="50" />
 				<el-table-column prop="barCode" label="条码" show-overflow-tooltip />
@@ -67,17 +77,30 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip />
-				<el-table-column prop="purchasePrice" label="进价" show-overflow-tooltip />
-				<el-table-column prop="retailPrice" label="零售价" show-overflow-tooltip />
+				<el-table-column prop="purchasePrice" label="进价(元)" show-overflow-tooltip />
+				<el-table-column prop="retailPrice" label="零售价(元)" show-overflow-tooltip />
 				<!-- <el-table-column prop="spuId" label="spuId" show-overflow-tooltip /> -->
-				<el-table-column prop="promotionPrice" label="促销价" show-overflow-tooltip />
-				<el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />
+				<el-table-column prop="promotionPrice" label="促销价(元)" show-overflow-tooltip />
+				<el-table-column prop="costPrice" label="成本价(元)" show-overflow-tooltip />
 				<el-table-column label="操作" width="150" fixed="right">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_supermarketUnit_edit'" @click="formDialogRef.openDialog(scope.row)">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'supermarket_supermarketUnit_edit'"
+							@click="formDialogRef.openDialog(scope.row)"
+						>
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketUnit_del'" @click="handleDelete(scope.row)">删除</el-button>
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'supermarket_supermarketUnit_del'"
+							@click="handleDelete(scope.row)"
+							>删除</el-button
+						>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -91,11 +114,11 @@
 
 <script setup lang="ts">
 // import { BasicTableProps, useTable } from '/@/hooks/table';
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 
-const supermarketUnitEntityList = defineModel<any>('supermarketUnitEntityList', { default: [] });
+const supermarketUnitEntityList = defineModel<any>("supermarketUnitEntityList", { default: [] })
 
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
 // const queryRef = ref();
 // const showSearch = ref(true);
@@ -112,25 +135,25 @@ const formDialogRef = ref();
 // const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
 
 const tableStyle = {
-	cellStyle: { textAlign: 'center' },
+	cellStyle: { textAlign: "center" },
 	headerCellStyle: {
-		textAlign: 'center',
-		background: 'var(--el-table-row-hover-bg-color)',
-		color: 'var(--el-text-color-primary)',
+		textAlign: "center",
+		background: "var(--el-table-row-hover-bg-color)",
+		color: "var(--el-text-color-primary)",
 	},
-};
+}
 
 const getDataList = (formData: any) => {
-	console.log(formData);
-	const index = supermarketUnitEntityList.value?.findIndex((item: any) => item.id === formData.id);
+	console.log(formData)
+	const index = supermarketUnitEntityList.value?.findIndex((item: any) => item.id === formData.id)
 	if (supermarketUnitEntityList.value == null || index == undefined) {
-		supermarketUnitEntityList.value = [{ ...formData, isNew: true }];
+		supermarketUnitEntityList.value = [{ ...formData, isNew: true }]
 	} else if (index === -1) {
-		supermarketUnitEntityList.value.push({ ...formData, isNew: true });
+		supermarketUnitEntityList.value.push({ ...formData, isNew: true })
 	} else {
-		supermarketUnitEntityList.value[index] = formData;
+		supermarketUnitEntityList.value[index] = formData
 	}
-};
+}
 
 // 清空搜索条件
 // const resetQuery = () => {
@@ -156,7 +179,7 @@ const getDataList = (formData: any) => {
 
 // 删除操作
 const handleDelete = async (rowData: any) => {
-	supermarketUnitEntityList.value = supermarketUnitEntityList.value.filter((item: any) => item.id !== rowData.id);
+	supermarketUnitEntityList.value = supermarketUnitEntityList.value.filter((item: any) => item.id !== rowData.id)
 	// try {
 	// 	await useMessageBox().confirm('此操作将永久删除');
 	// } catch {
@@ -169,5 +192,5 @@ const handleDelete = async (rowData: any) => {
 	// } catch (err: any) {
 	// 	useMessage().error(err.msg);
 	// }
-};
+}
 </script>
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index 99bf759..52989b7 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -36,11 +36,6 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<!-- <el-col :span="12" class="mb20">
-							<el-form-item label="单位" prop="unit">
-								<el-input v-model="form.unit" placeholder="请输入单位" />
-							</el-form-item>
-						</el-col> -->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="商品分类" prop="categoryId">
 								<el-select v-model="form.categoryId" placeholder="请选择商品分类">
@@ -82,6 +77,11 @@
 								<el-input-number :min="0" :max="1000" :precision="0" v-model="form.sort" />
 							</el-form-item>
 						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="单位" prop="unit">
+								<el-input v-model="form.unit" placeholder="请输入单位" />
+							</el-form-item>
+						</el-col>
 						<el-col :span="24" class="mb20">
 							<el-form-item label="商品状态" prop="status">
 								<el-radio-group v-model="form.status">
@@ -226,6 +226,7 @@ import { rule } from "/@/utils/validate"
 import supermarketAuxiliaryCode from "./components/supermarketAuxiliaryCode/index.vue"
 import supermarketUnit from "./components/supermarketUnit/index.vue"
 import { TabPaneName } from "element-plus"
+import { displayPrice, storePrice } from "/@/utils/formatMoney"
 
 const emit = defineEmits(["refresh"])
 
@@ -297,16 +298,18 @@ const brandOptions = ref<any>([]) // 超市品牌的下拉选项
 const supplierOptions = ref<any>([]) // 货商的下拉选项
 
 // 初始化表单数据
-const getsupermarketSpuData = (id: string) => {
+const getsupermarketSpuData = async (id: string) => {
 	// 获取数据
 	loading.value = true
-	getObj(id)
-		.then((res: any) => {
-			Object.assign(form, res.data)
-		})
-		.finally(() => {
-			loading.value = false
-		})
+	const res = await getObj(id).finally(() => (loading.value = false))
+	res.data.supermarketUnitEntityList.map((item: any) => {
+		item.costPrice = displayPrice(item.costPrice, "")
+		item.promotionPrice = displayPrice(item.promotionPrice, "")
+		item.purchasePrice = displayPrice(item.purchasePrice, "")
+		item.retailPrice = displayPrice(item.retailPrice, "")
+	})
+	Object.assign(form, res.data)
+	console.log(res.data)
 }
 
 // 打开弹窗
@@ -376,6 +379,10 @@ const onSubmit = async () => {
 		loading.value = true
 		if (form.id) {
 			form.supermarketUnitEntityList.map((item: any) => {
+				item.costPrice = storePrice(item.costPrice)
+				item.promotionPrice = storePrice(item.promotionPrice)
+				item.purchasePrice = storePrice(item.purchasePrice)
+				item.retailPrice = storePrice(item.retailPrice)
 				if (item.isNew) {
 					item.id = ""
 					delete item.isNew
@@ -391,6 +398,10 @@ const onSubmit = async () => {
 		} else {
 			form.supermarketUnitEntityList.map((item: any) => {
 				item.id = ""
+				item.costPrice = storePrice(item.costPrice)
+				item.promotionPrice = storePrice(item.promotionPrice)
+				item.purchasePrice = storePrice(item.purchasePrice)
+				item.retailPrice = storePrice(item.retailPrice)
 			})
 			form.supermarketAuxiliaryCodeEntityList.map((item: any) => {
 				item.id = ""
diff --git a/src/views/supermarket/supermarketSpu/index.vue b/src/views/supermarket/supermarketSpu/index.vue
index 76980f8..c049ade 100644
--- a/src/views/supermarket/supermarketSpu/index.vue
+++ b/src/views/supermarket/supermarketSpu/index.vue
@@ -81,7 +81,7 @@
 				</el-table-column>
 				<el-table-column prop="status" label="商品状态" width="100">
 					<template #default="scope">
-						<dict-tag :options="status" :value="scope.row.status"></dict-tag>
+						<dict-tag :options="status" :value="scope.row.status" />
 					</template>
 				</el-table-column>
 				<!-- <el-table-column prop="costPrice" label="成本单价" show-overflow-tooltip width="100" /> -->
@@ -96,7 +96,7 @@
 				<!-- <el-table-column prop="promotionPrice" label="促销价" show-overflow-tooltip /> -->
 				<el-table-column prop="productNature" label="商品性质" show-overflow-tooltip width="150">
 					<template #default="scope">
-						<dict-tag :options="supermarket_nature" :value="scope.row.productNature"></dict-tag>
+						<dict-tag :options="supermarket_nature" :value="scope.row.productNature" />
 					</template>
 				</el-table-column>
 				<!-- <el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip /> -->

From adcc3888e7269f487ad626844d649b2b1adbbe0f Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Mon, 13 Jan 2025 19:39:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E8=8F=9C=E8=B0=B1?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8F=9C=E5=93=81=E7=B1=BB=E5=88=AB=E5=92=8C?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/canteenDailyMenu/form.vue  |  8 ++--
 src/views/canteen/canteenDailyMenu/index.vue | 44 +++++++++++++++-----
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/views/canteen/canteenDailyMenu/form.vue b/src/views/canteen/canteenDailyMenu/form.vue
index c1e8bf3..433ca34 100644
--- a/src/views/canteen/canteenDailyMenu/form.vue
+++ b/src/views/canteen/canteenDailyMenu/form.vue
@@ -35,12 +35,14 @@
 				<div class="food_list">
 					<td class="food_list_item" v-for="(item, index) in selectedList" :key="item.id">
 						<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
-						<div class="w-full flex justify-between items-center text-black">
+						<div class="w-full flex justify-around items-center text-black">
 							<span>{{ item.name }}</span>
 							<span class="mx-1">|</span>
-							<span>{{ "某分类" }}</span>
+							<span class="text-sm">
+								{{ categoryOptions.find((v: any) => v.id == item.categoryId)?.name ?? "未知" }}
+							</span>
 						</div>
-						<div class="w-full text-lg text-center text-red-600">{{ "￥6.6" }}</div>
+						<div class="w-full text-lg text-center text-red-600">{{ displayPrice(item.price) }}</div>
 					</td>
 				</div>
 			</tr>
diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index e156aee..73abfa2 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -33,7 +33,12 @@
 								fit="cover"
 								@click="delteData(item.tid)"
 							/>
-							<div class="w-full text-center text-black">{{ item.name }}</div>
+							<div class="w-full flex justify-around items-center text-black">
+								<span>{{ item.name }}</span>
+								<span class="mx-1">|</span>
+								<span class="text-sm">{{ canteenCategoryOption.find((v: any) => v.id == item.categoryId)?.name }}</span>
+							</div>
+							<div class="w-full text-lg text-center text-red-600">{{ displayPrice(item.price) }}</div>
 						</td>
 					</div>
 				</tr>
@@ -47,12 +52,12 @@
 								fit="cover"
 								@click="delteData(item.tid)"
 							/>
-							<div class="w-full flex justify-between items-center text-black">
+							<div class="w-full flex justify-around items-center text-black">
 								<span>{{ item.name }}</span>
 								<span class="mx-1">|</span>
-								<span>{{ "某分类" }}</span>
+								<span class="text-sm">{{ canteenCategoryOption.find((v: any) => v.id == item.categoryId)?.name }}</span>
 							</div>
-							<div class="w-full text-lg text-center text-red-600">{{ "￥6.6" }}</div>
+							<div class="w-full text-lg text-center text-red-600">{{ displayPrice(item.price) }}</div>
 						</td>
 					</div>
 				</tr>
@@ -66,7 +71,12 @@
 								fit="cover"
 								@click="delteData(item.tid)"
 							/>
-							<div class="w-full text-center text-black">{{ item.name }}</div>
+							<div class="w-full flex justify-around items-center text-black">
+								<span>{{ item.name }}</span>
+								<span class="mx-1">|</span>
+								<span class="text-sm">{{ canteenCategoryOption.find((v: any) => v.id == item.categoryId)?.name }}</span>
+							</div>
+							<div class="w-full text-lg text-center text-red-600">{{ displayPrice(item.price) }}</div>
 						</td>
 					</div>
 				</tr>
@@ -80,8 +90,10 @@
 
 <script setup lang="ts" name="systemCanteenDailyMenu">
 import { delObjs, selectTimeFoodApi, selectWeekInfo } from "/@/api/canteen/canteenDailyMenu"
-import { useMessage, useMessageBox } from "/@/hooks/message"
+import { fetchList } from "/@/api/canteen/canteenCategory"
+import { useMessage } from "/@/hooks/message"
 import { pageJoin } from "/@/api/wallet/mch-manage"
+import { displayPrice } from "/@/utils/formatMoney"
 
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
@@ -188,9 +200,8 @@ const delteData = async (tid: number) => {
 	selectTimeFood()
 }
 
-/** 初始化下拉框 */
+// 获取下拉框选项
 const merchantInit = async () => {
-	// 获取下拉框选项
 	const res = await pageJoin({ current: 1, size: 9999 })
 	merchantInfo.value = res.data.records
 
@@ -200,8 +211,21 @@ const merchantInit = async () => {
 		fetchData()
 	}
 }
-onMounted(() => {
-	merchantInit()
+
+const canteenCategoryOption = ref<any>([])
+// 获取菜品分类
+const getCanteenCategory = async () => {
+	const res = await fetchList({
+		current: 1,
+		size: 9999,
+	})
+	if (res.code === 0) {
+		canteenCategoryOption.value = res.data.records
+	}
+}
+onMounted(async () => {
+	await getCanteenCategory()
+	await merchantInit()
 })
 </script>
 

From b807e927440c3f312dcce65857aad57a43fad04b Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 14 Jan 2025 09:13:05 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AF=8F=E6=97=A5?=
 =?UTF-8?q?=E8=8F=9C=E5=93=81=E6=97=B6=E5=8F=AF=E5=88=A0=E9=99=A4=E8=8F=9C?=
 =?UTF-8?q?=E5=93=81=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/canteenDailyMenu/form.vue  | 32 +++++++++++++++-----
 src/views/canteen/canteenDailyMenu/index.vue |  1 +
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/views/canteen/canteenDailyMenu/form.vue b/src/views/canteen/canteenDailyMenu/form.vue
index 433ca34..43787f4 100644
--- a/src/views/canteen/canteenDailyMenu/form.vue
+++ b/src/views/canteen/canteenDailyMenu/form.vue
@@ -32,8 +32,20 @@
 		<h1 style="font-size: 16px; font-weight: bold; color: #000000; margin-top: 20px">预览图</h1>
 		<table>
 			<tr class="food">
-				<div class="food_list">
-					<td class="food_list_item" v-for="(item, index) in selectedList" :key="item.id">
+				<div class="food_list" @mouseleave="hoverIndex = -1">
+					<td
+						class="food_list_item"
+						v-for="(item, index) in selectedFood"
+						:key="item.id"
+						@mouseenter="hoverIndex = index"
+					>
+						<el-icon
+							v-show="hoverIndex === index"
+							@click="removeSelectedItem(item.id)"
+							class="absolute right-[-5px] top-[-8px] text-xl text-blue-600"
+						>
+							<CircleClose />
+						</el-icon>
 						<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
 						<div class="w-full flex justify-around items-center text-black">
 							<span>{{ item.name }}</span>
@@ -142,13 +154,14 @@ const dataFormRef = ref()
 const visible = ref(false)
 const queryRef = ref()
 const selectObjs = ref([]) as any // 表格多选的数据
-const selectedList = ref<any>([])
+const selectedFood = ref<any>([])
 const loading = ref(false)
 const selectDialogVisible = ref<boolean>(false) // 选择菜品对话框开关
 const { spu_status } = useDict("spu_status")
 const categoryOptions = ref<any>([]) // 商品分类选项
 const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
 const dataRules = ref({}) // 定义校验规则
+const hoverIndex = ref<number>(-1) // 预览图片hover的索引
 
 // 提交表单数据
 const form = reactive<any>({
@@ -159,7 +172,7 @@ const form = reactive<any>({
 })
 // 选择的菜品的id数组
 const spuIds = computed(() => {
-	return selectedList.value?.map((item: any) => item.id)
+	return selectedFood.value?.map((item: any) => item.id)
 })
 
 const state: BasicTableProps = reactive<BasicTableProps>({
@@ -191,7 +204,7 @@ const openDialog = (id: string, time?: string, hourType?: number, merchantId?: n
 	// 重置表单数据
 	dataFormRef.value?.resetFields()
 	selectObjs.value = []
-	selectedList.value = []
+	selectedFood.value = []
 	state.dataList = []
 
 	// 获取canteenDailyMenu信息
@@ -235,15 +248,20 @@ const handleClickSelect = async () => {
 	}
 }
 
+// 移除预览
+const removeSelectedItem = (id: string) => {
+	selectedFood.value = selectedFood.value.filter((item: any) => item.id !== id)
+}
+
 // 选择菜品点击确认
 const handleSelectDialogConfirm = () => {
 	selectDialogVisible.value = false
-	selectedList.value = selectObjs.value
+	selectedFood.value = selectObjs.value
 }
 
 // 提交
 const onSubmit = async () => {
-	if (selectedList.value.length <= 0) {
+	if (selectedFood.value.length <= 0) {
 		useMessage().warning("请选择菜品")
 		return
 	}
diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index 73abfa2..4572eb5 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -254,6 +254,7 @@ onMounted(async () => {
 		margin-left: 20px;
 
 		&_item {
+			position: relative;
 			display: flex;
 			flex-direction: column;
 			justify-content: space-between;