From 310a54517fa2f65118a92e25a06c23f98f959a6e Mon Sep 17 00:00:00 2001
From: ctw <ctw@email.com>
Date: Tue, 4 Nov 2025 17:44:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/supermarket/mallProduct/form.vue    |  6 ++---
 .../supermarketerp/report/inventory/index.vue | 27 ++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/views/supermarket/mallProduct/form.vue b/src/views/supermarket/mallProduct/form.vue
index 619fe50..fe41dc4 100644
--- a/src/views/supermarket/mallProduct/form.vue
+++ b/src/views/supermarket/mallProduct/form.vue
@@ -72,7 +72,7 @@
 
 						<el-col :span="24" class="mb20">
 							<el-form-item label="轮播图" prop="carouselImages">
-								<upload-imgs v-model:imageUrl="form.carouselImages" />
+								<upload-imgs v-model="form.carouselImages" />
 							</el-form-item>
 						</el-col>
 
@@ -170,13 +170,13 @@
 								</template>
 							</el-table-column>
 
-							<el-table-column label="重量(克)" min-width="120" align="center">
+							<!-- <el-table-column label="重量(克)" min-width="120" align="center">
 								<template #default="scope">
 									<div class="sku-cell">
 										<el-input-number v-model="scope.row.weightG" :min="0" size="small" placeholder="0" />
 									</div>
 								</template>
-							</el-table-column>
+							</el-table-column> -->
 
 							<el-table-column label="状态" min-width="100" align="center">
 								<template #default="scope">
diff --git a/src/views/supermarketerp/report/inventory/index.vue b/src/views/supermarketerp/report/inventory/index.vue
index 7bc11a5..9993797 100644
--- a/src/views/supermarketerp/report/inventory/index.vue
+++ b/src/views/supermarketerp/report/inventory/index.vue
@@ -68,19 +68,19 @@
 				<el-table-column prop="packageNum" label="装数" show-overflow-tooltip min-width="80" align="right" />
 				<el-table-column prop="purchasePrice" label="参考进价(元)" show-overflow-tooltip min-width="110" align="right" />
 				<el-table-column prop="retailPrice" label="零售价(元)" show-overflow-tooltip min-width="110" align="right" />
-				
+
 				<el-table-column label="期初" align="center">
 					<el-table-column prop="openingQty" label="期初库存" show-overflow-tooltip min-width="100" align="right" />
 					<el-table-column prop="openingAmount" label="期初金额(元)" show-overflow-tooltip min-width="110" align="right" />
 				</el-table-column>
-				
+
 				<el-table-column label="采购" align="center">
 					<el-table-column prop="purchaseInQty" label="采购入库数量" show-overflow-tooltip min-width="120" align="right" />
 					<el-table-column prop="purchaseInAmount" label="采购入库金额(元)" show-overflow-tooltip min-width="130" align="right" />
 					<el-table-column prop="purchaseReturnQty" label="采购退货数量" show-overflow-tooltip min-width="120" align="right" />
 					<el-table-column prop="purchaseReturnAmount" label="采购退货金额(元)" show-overflow-tooltip min-width="130" align="right" />
 				</el-table-column>
-				
+
 				<el-table-column label="销售" align="center">
 					<el-table-column prop="salesQty" label="销售数量" show-overflow-tooltip min-width="100" align="right" />
 					<el-table-column prop="salesAmount" label="销售金额(元)" show-overflow-tooltip min-width="110" align="right" />
@@ -89,18 +89,26 @@
 					<el-table-column prop="actualSalesQty" label="实际销售数量" show-overflow-tooltip min-width="120" align="right" />
 					<el-table-column prop="actualSalesAmount" label="实际销售金额(元)" show-overflow-tooltip min-width="130" align="right" />
 				</el-table-column>
-				
+
 				<el-table-column label="成本与毛利" align="center">
-					<el-table-column prop="salesCost" label="销售成本(元)" show-overflow-tooltip min-width="120" align="right" />
-					<el-table-column prop="grossProfit" label="销售毛利(元)" show-overflow-tooltip min-width="120" align="right" />
+					<el-table-column prop="salesCost" label="销售成本(元)" show-overflow-tooltip min-width="120" align="right">
+						<template #default="{ row }">
+							{{ row.salesCost.toFixed(2) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="grossProfit" label="销售毛利(元)" show-overflow-tooltip min-width="120" align="right">
+						<template #default="{ row }">
+							{{ row.grossProfit.toFixed(2) }}
+						</template>
+					</el-table-column>
 				</el-table-column>
-				
+
 				<el-table-column label="期末" align="center">
 					<el-table-column prop="closingQty" label="期末数量" show-overflow-tooltip min-width="100" align="right" />
 					<el-table-column prop="closingAmount" label="期末库存金额(元)" show-overflow-tooltip min-width="130" align="right" />
 					<el-table-column prop="closingRetailAmount" label="期末库存售额(元)" show-overflow-tooltip min-width="130" align="right" />
 				</el-table-column>
-				
+
 				<el-table-column prop="firstPurchaseDate" label="首次进货日" show-overflow-tooltip min-width="120" />
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
@@ -157,7 +165,7 @@ const exportExcel = () => {
 		params.endDate = params.dateRange[1]
 	}
 	delete params.dateRange
-	
+
 	downBlobFile("/supermarket/superMarketReport/inventory/export", params, "进销存报表.xlsx")
 }
 
@@ -187,4 +195,3 @@ onMounted(() => {
 	getCategoryList()
 })
 </script>
-