Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud

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,
+	})
 }
-
-

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>