From 1dd21a506157cdc5d32fcc9f7952bd51ca65a8af Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 27 Feb 2025 15:03:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E5=92=8C?=
 =?UTF-8?q?=E9=9B=B6=E5=94=AE=E9=80=80=E8=B4=A7=E8=B0=83=E6=95=B4=E3=80=81?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=E9=BB=98=E8=AE=A4=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85=E5=8D=95=E4=BD=8D=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/supermarketerp/smErpCgBack.ts         | 48 +++++++++++++++++++
 .../smErpInventoryRecordsItem.ts              | 41 ----------------
 src/api/supermarketerp/smErpRetailBack.ts     |  9 ++++
 .../components/linkCgCodeDialog.vue           |  4 +-
 .../smErpCgBack/smErpCgBackOption.vue         |  4 +-
 .../components/linkCgCodeDialog.vue           |  4 +-
 .../smErpRetailBack/smErpRetailBackOption.vue |  2 +-
 .../supermarketerp/supermarketSpu/form.vue    | 23 +++++----
 8 files changed, 78 insertions(+), 57 deletions(-)
 create mode 100644 src/api/supermarketerp/smErpCgBack.ts
 delete mode 100644 src/api/supermarketerp/smErpInventoryRecordsItem.ts
 create mode 100644 src/api/supermarketerp/smErpRetailBack.ts

diff --git a/src/api/supermarketerp/smErpCgBack.ts b/src/api/supermarketerp/smErpCgBack.ts
new file mode 100644
index 0000000..31bd4a8
--- /dev/null
+++ b/src/api/supermarketerp/smErpCgBack.ts
@@ -0,0 +1,48 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/supermarket/smErpCgBack/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/supermarket/smErpCgBack",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/supermarket/smErpCgBack/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/supermarket/smErpCgBack",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/supermarket/smErpCgBack",
+		method: "put",
+		data: obj,
+	})
+}
+
+export function getCgInventoryPage(params?: Object) {
+	return request({
+		url: "/smErpInventoryRecords/inventory/page",
+		method: "get",
+		params,
+	})
+}
diff --git a/src/api/supermarketerp/smErpInventoryRecordsItem.ts b/src/api/supermarketerp/smErpInventoryRecordsItem.ts
deleted file mode 100644
index 2ff6071..0000000
--- a/src/api/supermarketerp/smErpInventoryRecordsItem.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import request from "/@/utils/request"
-
-export function fetchList(query?: Object) {
-  return request({
-    url: '/supermarket/smErpInventoryRecordsItem/page',
-    method: 'get',
-    params: query
-  })
-}
-
-export function addObj(obj?: Object) {
-  return request({
-    url: '/supermarket/smErpInventoryRecordsItem',
-    method: 'post',
-    data: obj
-  })
-}
-
-export function getObj(id?: string) {
-  return request({
-    url: '/supermarket/smErpInventoryRecordsItem/' + id,
-    method: 'get'
-  })
-}
-
-export function delObjs(ids?: Object) {
-  return request({
-    url: '/supermarket/smErpInventoryRecordsItem',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function putObj(obj?: Object) {
-  return request({
-    url: '/supermarket/smErpInventoryRecordsItem',
-    method: 'put',
-    data: obj
-  })
-}
-
diff --git a/src/api/supermarketerp/smErpRetailBack.ts b/src/api/supermarketerp/smErpRetailBack.ts
new file mode 100644
index 0000000..3b9af8c
--- /dev/null
+++ b/src/api/supermarketerp/smErpRetailBack.ts
@@ -0,0 +1,9 @@
+import request from "/@/utils/request"
+
+export function getCgInventoryPage(params?: Object) {
+	return request({
+		url: "/smErpInventoryRecords/inventory/page",
+		method: "get",
+		params,
+	})
+}
diff --git a/src/views/supermarketerp/smErpCgBack/components/linkCgCodeDialog.vue b/src/views/supermarketerp/smErpCgBack/components/linkCgCodeDialog.vue
index 8b1f927..4d3d056 100644
--- a/src/views/supermarketerp/smErpCgBack/components/linkCgCodeDialog.vue
+++ b/src/views/supermarketerp/smErpCgBack/components/linkCgCodeDialog.vue
@@ -55,8 +55,8 @@
 
 <script setup lang="ts" name="linkCgCodeDialog">
 import { ref } from "vue"
-import { getCgddPage } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { VxeTableEvents } from "vxe-table"
+import { getCgInventoryPage } from "/@/api/supermarketerp/smErpCgBack"
 
 const linkCgCodeDialogVisible = defineModel()
 const emit = defineEmits(["getSelectedCgPlan"])
@@ -74,7 +74,7 @@ const openLinkCodeDialog = async () => {
 	step.value = 0
 	linkCodeLoading.value = true
 	try {
-		const res = await getCgddPage().finally(() => (linkCodeLoading.value = false))
+		const res = await getCgInventoryPage({ inventoryType: "3" }).finally(() => (linkCodeLoading.value = false))
 		if (res.code === 0) {
 			cgddPage.value = res.data.records
 		}
diff --git a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
index 7e1547f..c9391de 100644
--- a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
+++ b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
@@ -181,14 +181,14 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgBack"
 import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
-import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue"
+import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgBack/components/linkCgCodeDialog.vue"
 import { displayPrice } from "/@/utils/formatMoney"
 
 const router = useRouter()
diff --git a/src/views/supermarketerp/smErpRetailBack/components/linkCgCodeDialog.vue b/src/views/supermarketerp/smErpRetailBack/components/linkCgCodeDialog.vue
index 8b1f927..52ac77e 100644
--- a/src/views/supermarketerp/smErpRetailBack/components/linkCgCodeDialog.vue
+++ b/src/views/supermarketerp/smErpRetailBack/components/linkCgCodeDialog.vue
@@ -55,8 +55,8 @@
 
 <script setup lang="ts" name="linkCgCodeDialog">
 import { ref } from "vue"
-import { getCgddPage } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { VxeTableEvents } from "vxe-table"
+import { getCgInventoryPage } from "/@/api/supermarketerp/smErpRetailBack"
 
 const linkCgCodeDialogVisible = defineModel()
 const emit = defineEmits(["getSelectedCgPlan"])
@@ -74,7 +74,7 @@ const openLinkCodeDialog = async () => {
 	step.value = 0
 	linkCodeLoading.value = true
 	try {
-		const res = await getCgddPage().finally(() => (linkCodeLoading.value = false))
+		const res = await getCgInventoryPage({ inventoryType: "5" }).finally(() => (linkCodeLoading.value = false))
 		if (res.code === 0) {
 			cgddPage.value = res.data.records
 		}
diff --git a/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue b/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue
index 829e1a4..4544826 100644
--- a/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue
+++ b/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue
@@ -219,7 +219,7 @@ import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
-import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue"
+import linkCgCodeDialog from "/@/views/supermarketerp/smErpRetailBack/components/linkCgCodeDialog.vue"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
 import { useDict } from "/@/hooks/dict"
 
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 0895136..8110bf8 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -244,7 +244,10 @@ const openDialog = async (id: string) => {
 	// 获取supermarketSpu信息
 	if (id) {
 		form.id = id
-		getsupermarketSpuData(id)
+		await getsupermarketSpuData(id)
+
+		// 设置基础包装单位单选行
+		supermarketUnitEntityListRef.value.setRadioRow(form.smErpUnitEntityList.findIndex((item: any) => item.isBase))
 	}
 
 	// 获取分类下拉选项 & 获取品牌下拉选项 & 获取货商下拉选项
@@ -268,17 +271,19 @@ const getsupermarketSpuData = async (id: string) => {
 		if (res.code === 0) {
 			res.data.smErpUnitEntityList = res.data.smErpUnitEntityList.map((item: any) => {
 				// 格式化数据
-				item.retailPrice = displayPrice(item.retailPrice, "")
-				item.promotionPrice = displayPrice(item.promotionPrice, "")
-				item.purchasePrice = displayPrice(item.purchasePrice, "")
-				item.costPrice = displayPrice(item.costPrice, "")
+				item.retailPrice = parseFloat(displayPrice(item.retailPrice, ""))
+				item.promotionPrice = parseFloat(displayPrice(item.promotionPrice, ""))
+				item.purchasePrice = parseFloat(displayPrice(item.purchasePrice, ""))
+				item.costPrice = parseFloat(displayPrice(item.costPrice, ""))
 				return item
 			})
 
-			Object.assign(form, res.data)
-
-			// 设置基础包装单位单选行
-			supermarketUnitEntityListRef.value.setRadioRow(form.smErpUnitEntityList.findIndex((item: any) => item.isBase))
+			Object.assign(form, {
+				...res.data,
+				costPrice: parseFloat(displayPrice(res.data.costPrice, "")),
+				purchasePrice: parseFloat(displayPrice(res.data.purchasePrice, "")),
+				retailPrice: parseFloat(displayPrice(res.data.retailPrice, "")),
+			})
 
 			console.log("获取的商品详情：", res.data)
 		}