From d0ae18df78c3647cddada1d20e7d3410b7f334c0 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 14 Nov 2022 17:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=20=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=94=B6=E5=85=A5=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/formatMoney.js                     |  1 +
 src/views/packManagement/PackCompanyList.vue | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/utils/formatMoney.js b/src/utils/formatMoney.js
index 4cb8d52..6dc73fd 100644
--- a/src/utils/formatMoney.js
+++ b/src/utils/formatMoney.js
@@ -1,4 +1,5 @@
 export function formatMoney(money) {
+  if(money === 0) return  '0.00'
   if(money === '') return  ''
   var num = (money || 0).toString(),
     re = /\d{3}$/,
diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue
index 1e6cf6b..6d06463 100644
--- a/src/views/packManagement/PackCompanyList.vue
+++ b/src/views/packManagement/PackCompanyList.vue
@@ -146,6 +146,13 @@ const defaultTableColumns = [
     dataIndex: 'packChargeTotal',
     scopedSlots: { customRender: 'allMoney' }
   },
+  {
+    title: '确认收入',
+    align: 'center',
+    width: 180,
+    dataIndex: 'confirmAmount',
+    scopedSlots: { customRender: 'allMoney' }
+  },
   {
     title: '实际到账费用',
     align: 'center',
@@ -276,7 +283,9 @@ export default {
             id: '1',
             title: '总计',
             packChargeTotal: res.result.sumOfMoney || '0.00' + '',
-            receiptExpense: res.result.sumOfConfirmAmount || '0.00' + ''
+            receiptExpense: res.result.sumOfReallyMoney || '0.00' + '',
+            confirmAmount: res.result.sumOfConfirmAmount || '0.00' + '',
+
           }
           this.footerDataSource = [obj]
           if (pageListObj.total) {