From 26f520ff7c243a30b86333651210ae69f13b622c Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 14 Aug 2025 09:24:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/canteen/canteenSpu.ts | 71 +++++++++++++++++------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/api/canteen/canteenSpu.ts b/src/api/canteen/canteenSpu.ts
index ee1d288..3eaa69e 100644
--- a/src/api/canteen/canteenSpu.ts
+++ b/src/api/canteen/canteenSpu.ts
@@ -1,59 +1,56 @@
 import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/canteen/canteenSpu/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenSpu/selectPage",
+		method: "get",
+		params: query,
+	})
 }
 
 export function fetchErpList(query?: Object) {
-  return request({
-    url: '/canteen/canteenSpu/erp/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenSpu/erp/page",
+		method: "get",
+		params: query,
+	})
 }
 
-
 export function fetchSimpleList(query?: Object) {
-  return request({
-    url: '/canteen/canteenSpu/getCanteenSpuSimplePage',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenSpu/getCanteenSpuSimplePage",
+		method: "get",
+		params: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/canteen/canteenSpu',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/canteen/canteenSpu",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/canteen/canteenSpu/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/canteen/canteenSpu/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/canteen/canteenSpu',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/canteen/canteenSpu",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/canteen/canteenSpu',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/canteen/canteenSpu",
+		method: "put",
+		data: obj,
+	})
 }
-
-

From 075b4f41bb47f65540291ecb72a670f2ad231bac Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 14 Aug 2025 09:59:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=85=A5=E5=BA=93=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/select-dialog.vue              | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/supermarketerp/components/select-dialog.vue b/src/views/supermarketerp/components/select-dialog.vue
index 0588b1a..b83e784 100644
--- a/src/views/supermarketerp/components/select-dialog.vue
+++ b/src/views/supermarketerp/components/select-dialog.vue
@@ -38,13 +38,25 @@
 			</el-table-column>
 			<el-table-column prop="stock" label="库存" min-width="80px" show-overflow-tooltip />
 			<el-table-column prop="productCode" label="货号" min-width="100px" show-overflow-tooltip />
-			<el-table-column label="包装单位" min-width="300px">
+			<el-table-column label="规格" min-width="240px">
+				<template #default="scope">
+					<div v-if="scope.row.erpUnitVos && scope.row.erpUnitVos.length > 0" class="flex justify-center flex-wrap gap-2">
+						<div v-for="unit in scope.row.erpUnitVos" :key="unit.id">
+							<el-tag v-if="unit.spec" :type="unit.isBase ? 'primary' : 'info'" size="small">
+								{{ unit.spec }}
+							</el-tag>
+						</div>
+					</div>
+				</template>
+			</el-table-column>
+			<el-table-column label="包装单位/价格" min-width="280px">
 				<template #default="scope">
 					<div v-if="scope.row.erpUnitVos && scope.row.erpUnitVos.length > 0">
-						<div class="flex flex-wrap gap-2">
-							<el-tag v-for="unit in scope.row.erpUnitVos" :key="unit.id" :type="unit.isBase ? 'primary' : 'info'" size="small">
+						<div class="flex justify-center flex-wrap gap-2">
+							<el-tag v-for="unit in scope.row.erpUnitVos" :key="unit.id" :type="unit.isBase ? 'primary' : 'info'">
 								{{ unit.unit }}
-								<span class="text-xs ml-1">({{ displayPrice(unit.purchasePrice, "") }}元)</span>
+								<span class="text-xs ml-1">(进价：{{ displayPrice(unit.purchasePrice, "") }}元)</span>
+								<span class="text-xs ml-1">(零售价：{{ displayPrice(unit.retailPrice, "") }}元)</span>
 							</el-tag>
 						</div>
 					</div>