From 94f8204423684da1eb050872770d2b4e97be39fb Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 21 四月 2026 13:25:47 +0800
Subject: [PATCH] Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
---
src/views/procurementManagement/procurementReport/index.vue | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/src/views/procurementManagement/procurementReport/index.vue b/src/views/procurementManagement/procurementReport/index.vue
index adf554d..182e164 100644
--- a/src/views/procurementManagement/procurementReport/index.vue
+++ b/src/views/procurementManagement/procurementReport/index.vue
@@ -54,6 +54,10 @@
<span class="stat-label">鍟嗗搧绉嶇被锛�</span>
<span class="stat-value">{{ businessSummaryStats.productTypes }}</span>
</div>
+ <div class="stat-item">
+ <span class="stat-label">閫�娆炬�婚锛�</span>
+ <span class="stat-value">楼{{ businessSummaryStats.returnAmount.toLocaleString() }}</span>
+ </div>
</div>
</div>
@@ -77,7 +81,7 @@
import { ElMessage } from 'element-plus'
import { Download } from '@element-plus/icons-vue'
import PIMTable from '@/components/PIMTable/PIMTable.vue'
-import { procurementBusinessSummaryListPage } from '@/api/procurementManagement/procurementReport'
+import { procurementBusinessSummaryListPage, procurementBusinessSummaryStatistics } from '@/api/procurementManagement/procurementReport'
import { productTreeList } from '@/api/basicData/product'
const { proxy } = getCurrentInstance()
@@ -97,7 +101,8 @@
// 缁熻鏁版嵁
const businessSummaryStats = ref({
totalAmount: 0,
- productTypes: 0
+ productTypes: 0,
+ returnAmount: 0
})
// 琛ㄦ牸鍒楅厤缃紙鏍规嵁鍚庣瀛楁瀹氫箟锛�
@@ -111,6 +116,10 @@
prop: 'specificationModel',
},
{
+ label: '鍘氬害(mm)',
+ prop: 'thickness',
+ },
+ {
label: '閲囪喘鏁伴噺',
prop: 'purchaseNum',
width: 120,
@@ -119,7 +128,23 @@
}
},
{
- label: '閲囪喘閲戦',
+ label: '閫�璐ф暟閲�',
+ prop: 'returnQuantity',
+ width: 120,
+ formatData: (val) => {
+ return val ? parseFloat(val).toLocaleString() : '0'
+ }
+ },
+ {
+ label: '閫�璐ч噾棰�',
+ prop: 'returnAmount',
+ width: 120,
+ formatData: (val) => {
+ return val ? `楼${parseFloat(val).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}` : '楼0.00'
+ }
+ },
+ {
+ label: '閫�娆惧偍閲�',
prop: 'purchaseAmount',
formatData: (val) => {
return val ? `楼${parseFloat(val).toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}` : '楼0.00'
@@ -233,18 +258,15 @@
page.current = Number(res.data.current ?? page.current)
page.size = Number(res.data.size ?? page.size)
}
-
- // 璁＄畻缁熻鏁版嵁
- if (businessSummaryData.value.length > 0) {
- businessSummaryStats.value.totalAmount = businessSummaryData.value.reduce((sum, item) => {
- return sum + (parseFloat(item.purchaseAmount) || 0)
- }, 0)
- businessSummaryStats.value.productTypes = new Set(businessSummaryData.value.map(item => item.productCategory)).size
- } else {
- businessSummaryStats.value = {
- totalAmount: 0,
- productTypes: 0
- }
+ }
+
+ // 鑾峰彇缁熻鏁版嵁
+ const statsRes = await procurementBusinessSummaryStatistics(params)
+ if (statsRes && statsRes.data) {
+ businessSummaryStats.value = {
+ totalAmount: statsRes.data.purchaseTotalAmount || 0,
+ productTypes: statsRes.data.productCategoryCount || 0,
+ returnAmount: statsRes.data.returnTotalAmount || 0
}
}
} catch (error) {
--
Gitblit v1.9.3