From 40896dfb1829b413bb065da579722c42b05a73de Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Wed, 8 Jan 2025 12:38:52 +0800
Subject: [PATCH] 1

---
 src/components/Upload/Image.vue              |  1 +
 src/views/canteen/canteenOnlineSpu/form.vue  | 12 ++++++++----
 src/views/canteen/canteenOnlineSpu/index.vue | 13 +++++++++++--
 src/views/canteen/canteenSpu/form.vue        |  6 +-----
 src/views/canteen/canteenSpu/index.vue       | 20 +++++++++++++-------
 5 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/components/Upload/Image.vue b/src/components/Upload/Image.vue
index 5388b76..fdc80db 100644
--- a/src/components/Upload/Image.vue
+++ b/src/components/Upload/Image.vue
@@ -194,6 +194,7 @@ const uploadError = () => {
 	});
 };
 </script>
+
 <style scoped lang="scss">
 .is-error {
 	.upload {
diff --git a/src/views/canteen/canteenOnlineSpu/form.vue b/src/views/canteen/canteenOnlineSpu/form.vue
index dfbc140..07623b5 100644
--- a/src/views/canteen/canteenOnlineSpu/form.vue
+++ b/src/views/canteen/canteenOnlineSpu/form.vue
@@ -19,12 +19,12 @@
 				</el-col>
 				<el-col :span="12" class="mb20">
 					<el-form-item label="商品价格" prop="price">
-						<el-input-number v-model="form.price" placeholder="请输入商品价格" />
+						<el-input-number v-model="form.price" :precision="2" placeholder="请输入商品价格" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="12" class="mb20">
 					<el-form-item label="市场价" prop="marketPrice">
-						<el-input-number v-model="form.marketPrice" placeholder="请输入市场价" />
+						<el-input-number v-model="form.marketPrice" :precision="2" placeholder="请输入市场价" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="12" class="mb20">
@@ -75,6 +75,7 @@ import { useDict } from '/@/hooks/dict';
 import { useMessage } from '/@/hooks/message';
 import { getObj, addObj, putObj } from '/@/api/canteen/canteenOnlineSpu';
 import { rule } from '/@/utils/validate';
+import { storePrice } from '/@/utils/formatMoney';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
@@ -140,7 +141,8 @@ const onSubmit = async () => {
 
 	try {
 		loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
+		const _pa = { ...form, price: storePrice(form.price), marketPrice: storePrice(form.marketPrice) };
+		form.id ? await putObj(_pa) : await addObj(_pa);
 		useMessage().success(form.id ? '修改成功' : '添加成功');
 		visible.value = false;
 		emit('refresh');
@@ -157,7 +159,9 @@ const getcanteenOnlineSpuData = (id: string) => {
 	loading.value = true;
 	getObj(id)
 		.then((res: any) => {
-			Object.assign(form, res.data);
+			// Object.assign(form, res.data, {
+			// 	res.data.
+			// });
 		})
 		.finally(() => {
 			loading.value = false;
diff --git a/src/views/canteen/canteenOnlineSpu/index.vue b/src/views/canteen/canteenOnlineSpu/index.vue
index 6b22f13..39df1c2 100644
--- a/src/views/canteen/canteenOnlineSpu/index.vue
+++ b/src/views/canteen/canteenOnlineSpu/index.vue
@@ -64,8 +64,16 @@
 						<dict-tag :options="spu_status" :value="scope.row.status" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="price" label="商品价格" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="price" label="商品价格" show-overflow-tooltip min-width="100">
+					<template #default="scope">
+						{{ displayPrice(scope.row.price) }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip min-width="100">
+					<template #default="scope">
+						{{ displayPrice(scope.row.marketPrice) }}
+					</template>
+				</el-table-column>
 				<el-table-column prop="stock" label="库存" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="salesCount" label="商品销量" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
@@ -93,6 +101,7 @@ import { BasicTableProps, useTable } from '/@/hooks/table';
 import { fetchList, delObjs } from '/@/api/canteen/canteenOnlineSpu';
 import { useMessage, useMessageBox } from '/@/hooks/message';
 import { useDict } from '/@/hooks/dict';
+import { displayPrice } from '/@/utils/formatMoney';
 
 const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
 // 引入组件
diff --git a/src/views/canteen/canteenSpu/form.vue b/src/views/canteen/canteenSpu/form.vue
index d5cae4d..9bdcda4 100644
--- a/src/views/canteen/canteenSpu/form.vue
+++ b/src/views/canteen/canteenSpu/form.vue
@@ -14,11 +14,7 @@
 				</el-col>
 				<el-col :span="12" class="mb20">
 					<el-form-item label="商品分类" prop="categoryId">
-						<el-select v-model="form.categoryId" placeholder="请选择商品分类">
-							<el-option placeholder="请选择商品分类" v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
-							<!--               <el-option v-for="categoryList" :key="item.value" :label="item.label"-->
-							<!--                          :value="item.value"></el-option>-->
-						</el-select>
+						<select-ctcg v-model="form.categoryId" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
diff --git a/src/views/canteen/canteenSpu/index.vue b/src/views/canteen/canteenSpu/index.vue
index 70a955c..0c10a95 100644
--- a/src/views/canteen/canteenSpu/index.vue
+++ b/src/views/canteen/canteenSpu/index.vue
@@ -6,11 +6,8 @@
 					<el-form-item label="商品名称" prop="name">
 						<el-input placeholder="请输入商品名称" v-model="state.queryForm.name" />
 					</el-form-item>
-					<el-form-item label="商品分类编号" prop="categoryId">
-						<el-select v-model="state.queryForm.categoryId" placeholder="请选择商品分类编号">
-							<el-option label="??" :value="0" />
-							<el-option label="??" :value="1" />
-						</el-select>
+					<el-form-item label="商品分类" prop="categoryId">
+						<select-ctcg v-model="state.queryForm.categoryId" style="width: 200px" />
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
@@ -61,8 +58,16 @@
 						<dict-tag :options="spu_status" :value="scope.row.status"></dict-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="price" label="商品价格" show-overflow-tooltip />
-				<el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip />
+				<el-table-column prop="price" label="商品价格" show-overflow-tooltip>
+					<template #default="scope">
+						{{ displayPrice(scope.row.price) }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="marketPrice" label="市场价" show-overflow-tooltip>
+					<template #default="scope">
+						{{ displayPrice(scope.row.marketPrice) }}
+					</template>
+				</el-table-column>
 				<el-table-column prop="costPrice" label="成本价" show-overflow-tooltip />
 				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
 				<!-- <el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip /> -->
@@ -91,6 +96,7 @@ import { BasicTableProps, useTable } from '/@/hooks/table';
 import { fetchList, delObjs } from '/@/api/canteen/canteenSpu';
 import { useMessage, useMessageBox } from '/@/hooks/message';
 import { useDict } from '/@/hooks/dict';
+import { displayPrice } from '/@/utils/formatMoney';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));