From 7fdb9cec42625d414994b5727a9e2aff27280395 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Sun, 27 Apr 2025 16:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AE=9E=E9=99=85=E8=BF=9B=E4=BB=B7=E7=9A=84=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseManagement/smErpCgBack/form.vue   |  2 +-
 .../smErpCgInventory/form.vue                 | 47 ++++++++++---------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
index 35d3c26..6d33ac8 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
@@ -88,7 +88,7 @@
 				</el-button> -->
 				<el-button type="primary" plain @click="handleClickSpuSelect">商品选择</el-button>
 				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
-				<el-button type="danger" @click="clearData">清空数据</el-button>
+				<el-button type="danger" plain @click="clearData">清空数据</el-button>
 			</el-row>
 
 			<vxe-table
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index 30c3b2f..171638b 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -150,32 +150,31 @@
 						<el-input v-model="row.quantity" />
 					</template>
 				</vxe-column>
-
-        <vxe-column field="unitPrice" title="原进价">
-          <template #default="{ row }">
-            {{
-              row.purchasePrice
-                  ? displayPrice(row.purchasePrice)
-                  : displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
-            }}
-          </template>
-        </vxe-column>
-        <vxe-column field="realPrice" title="实际进价">
-          <template #default="{ row }">
-            {{
-              row.real_price
-                  ? displayPrice(row.real_price)
-                  : displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
-            }}
-          </template>
-        </vxe-column>
+				<vxe-column field="unitPrice" title="原进价">
+					<template #default="{ row }">
+						{{
+							row.purchasePrice
+								? displayPrice(row.purchasePrice)
+								: displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
+						}}
+					</template>
+				</vxe-column>
+				<vxe-column field="retailPrice" title="实际进价">
+					<template #default="{ row }">
+						{{
+							row.retailPrice
+								? displayPrice(row.retailPrice)
+								: displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.retailPrice)
+						}}
+					</template>
+				</vxe-column>
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
 						<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
-							{{ displayPrice(row.quantity * parseFloat(row.purchasePrice)) }}
+							{{ displayPrice(row.quantity * parseFloat(row.retailPrice)) }}
 						</span>
 						<span v-if="row.unitId && row.quantity && row.erpUnitVos">
-							{{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity) }}
+							{{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.retailPrice) * row.quantity) }}
 						</span>
 					</template>
 				</vxe-column>
@@ -486,7 +485,8 @@ const cgPlanSpuItems = computed(() => {
 				erpSpuId: item.erpSpuId,
 				quantity: item.quantity,
 				unitPrice: unit.purchasePrice ? Number(unit?.purchasePrice) : 0,
-				totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
+				retailPrice: unit.retailPrice ? Number(unit?.retailPrice) : 0,
+				totalAmount: Number(unit?.retailPrice || 0) * item.quantity,
 				remark: item.remark,
 				unitId: item.unitId,
 			}
@@ -496,7 +496,8 @@ const cgPlanSpuItems = computed(() => {
 				erpSpuId: item.erpSpuId,
 				quantity: item.quantity,
 				unitPrice: item.purchasePrice ? Number(item.purchasePrice) : 0,
-				totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0,
+				retailPrice: item.retailPrice ? Number(item.retailPrice) : 0,
+				totalAmount: item?.retailPrice && item.quantity ? Number(item.retailPrice) * item.quantity : 0,
 				remark: item.remark,
 				unitId: item.unitId,
 			}