From 868c92fe67c9799bb0c91a645f5a103fa494cc23 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 16 Nov 2022 09:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=94=B6=E6=80=BB=E8=AE=A1=E4=B8=8E=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E6=94=B6=E5=85=A5=E6=80=BB=E8=AE=A1=20=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/formatMoney.js                     | 2 ++
 src/views/packManagement/PackCompanyList.vue | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/utils/formatMoney.js b/src/utils/formatMoney.js
index 6dc73fd..2277f99 100644
--- a/src/utils/formatMoney.js
+++ b/src/utils/formatMoney.js
@@ -9,6 +9,8 @@ export function formatMoney(money) {
   if (num.indexOf('.') !== -1) {
     point = num.substring(num.indexOf('.'))
     num = parseInt(num)
+  }else {
+    point = '.00'
   }
 
   // 循环添加逗号
diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue
index 6d06463..a60515f 100644
--- a/src/views/packManagement/PackCompanyList.vue
+++ b/src/views/packManagement/PackCompanyList.vue
@@ -94,8 +94,8 @@
 
               <template slot="allMoney" slot-scope="text">
                 <a-tooltip>
-                  <template slot="title">{{ formatMoney(text) }}</template>
-                  <div class="table-text">{{ formatMoney(text) }}</div>
+                  <template slot="title">{{ formatMoney(text+'') }}</template>
+                  <div class="table-text">{{ formatMoney(text+'') }}</div>
                 </a-tooltip>
               </template>
 
@@ -283,8 +283,8 @@ export default {
             id: '1',
             title: '总计',
             packChargeTotal: res.result.sumOfMoney || '0.00' + '',
-            receiptExpense: res.result.sumOfReallyMoney || '0.00' + '',
-            confirmAmount: res.result.sumOfConfirmAmount || '0.00' + '',
+            receiptExpense: res.result.sumOfConfirmAmount || '0.00' + '',
+            confirmAmount: res.result.sumOfReallyMoney || '0.00' + '',
 
           }
           this.footerDataSource = [obj]