From 4179cb549185980cbb0f0193bff91021b86bb9ae Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 18 Nov 2021 23:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportFeeBreakdown/reportFeeBreakdown.html  |  4 ++++
 .../reportFeeBreakdown/reportFeeBreakdown.js    | 15 +++++++++++++++
 .../reportFloorUnitFeeSummary.html              |  8 ++++----
 .../reportFloorUnitFeeSummary.js                | 17 ++++++++++++++++-
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html
index 892c7a6da..e3aca5ef1 100755
--- a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html
+++ b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html
@@ -166,6 +166,10 @@
                             <div class="row">欠费: {{_computeTotalOweAmount()}}元</div>
                             <div class="row">欠费: {{reportFeeBreakdownInfo.allOweAmount}}元</div>
                         </span>
+                        <span class="col-md-2">
+                            <div class="row">欠费追回: {{_computeTotalHisOweReceivedAmount()}}元</div>
+                            <div class="row">欠费追回: {{reportFeeBreakdownInfo.allHisOweReceivedAmount}}元</div>
+                        </span>
                     </div>
                     <div class="row margin-top-xs">
                         <div class="col-sm-9">
diff --git a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js
index 0b6bf5036..723055df4 100755
--- a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js
+++ b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js
@@ -20,6 +20,7 @@
                 totalReceivedAmount: 0.0,
                 allReceivedAmount: 0.0,
                 totalPreferentialAmount: 0.0,
+                allHisOweReceivedAmount: 0.0,
                 allOweAmount: 0.0,
                 conditions: {
                     floorId: '',
@@ -149,6 +150,7 @@
                             $that.reportFeeBreakdownInfo.allReceivableAmount = _reportFeeBreakdownInfo.data[0].allReceivableAmount;
                             $that.reportFeeBreakdownInfo.allReceivedAmount = _reportFeeBreakdownInfo.data[0].allReceivedAmount;
                             $that.reportFeeBreakdownInfo.allOweAmount = _reportFeeBreakdownInfo.data[0].allOweAmount;
+                            $that.reportFeeBreakdownInfo.allHisOweReceivedAmount = _reportFeeBreakdownInfo.data[0].allHisOweReceivedAmount;
                         }
 
                         vc.emit('pagination', 'init', {
@@ -249,6 +251,19 @@
                 }
 
                 return year + '' + month;
+            },
+            _computeTotalHisOweReceivedAmount: function () {
+                if (!window.$that) {
+                    return 0;
+                }
+                if (!$that.reportFloorUnitFeeSummaryInfo) {
+                    return 0;
+                }
+                let _amount = 0;
+                $that.reportFloorUnitFeeSummaryInfo.fees.forEach(item => {
+                    _amount += parseFloat(item.hisOweReceivedAmount);
+                })
+                return _amount.toFixed(2);
             }
         }
     });
diff --git a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html
index b7f5d730b..1ad12461d 100755
--- a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html
+++ b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html
@@ -155,10 +155,10 @@
                             <div class="row">实收: {{reportFloorUnitFeeSummaryInfo.totalReceivedAmount}}元</div>
                             <div class="row">实收: {{reportFloorUnitFeeSummaryInfo.allReceivedAmount}}元</div>
                         </span>
-                        <!-- <span class="col-md-2">
-                            <div class="row">欠费: {{_computeTotalOweAmount()}}元</div>
-                            <div class="row">欠费: {{reportFloorUnitFeeSummaryInfo.allOweAmount}}元</div>
-                        </span> -->
+                        <span class="col-md-2">
+                            <div class="row">欠费追回: {{_computeTotalHisOweReceivedAmount()}}元</div>
+                            <div class="row">欠费追回: {{reportFloorUnitFeeSummaryInfo.allHisOweReceivedAmount}}元</div>
+                        </span>
                     </div>
                     <div class="row margin-top-xs">
                         <div class="col-sm-9">
diff --git a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.js b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.js
index 4d20ce9a5..4e01b5138 100755
--- a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.js
+++ b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.js
@@ -20,6 +20,7 @@
                 totalReceivedAmount:0.0,
                 allReceivedAmount:0.0,
                 totalPreferentialAmount:0.0,
+                allHisOweReceivedAmount: 0.0,
                 allOweAmount:0.0,
                 conditions: {
                     floorId: '',
@@ -173,11 +174,12 @@
                         $that.reportFloorUnitFeeSummaryInfo.totalReceivableAmount = _totalReceivableAmount.toFixed(2);
                         $that.reportFloorUnitFeeSummaryInfo.totalReceivedAmount = _totalReceivedAmount.toFixed(2);
                         $that.reportFloorUnitFeeSummaryInfo.totalPreferentialAmount = _totalPreferentialAmount.toFixed(2);
+                        $that.reportFloorUnitFeeSummaryInfo.totalPreferentialAmount = _totalPreferentialAmount.toFixed(2);
 
                         if(_reportFloorUnitFeeSummaryInfo.data.length>0){
                             $that.reportFloorUnitFeeSummaryInfo.allReceivableAmount = _reportFloorUnitFeeSummaryInfo.data[0].allReceivableAmount;
                             $that.reportFloorUnitFeeSummaryInfo.allReceivedAmount = _reportFloorUnitFeeSummaryInfo.data[0].allReceivedAmount;
-                            $that.reportFloorUnitFeeSummaryInfo.allOweAmount = _reportFloorUnitFeeSummaryInfo.data[0].allOweAmount;
+                            $that.reportFloorUnitFeeSummaryInfo.allHisOweReceivedAmount = _reportFloorUnitFeeSummaryInfo.data[0].allHisOweReceivedAmount;
                         }
                         vc.emit('pagination', 'init', {
                             total: vc.component.reportFloorUnitFeeSummaryInfo.records,
@@ -292,6 +294,19 @@
                 })
                 console.log(_amount)
                 return _amount.toFixed(2);
+            },
+            _computeTotalHisOweReceivedAmount: function () {
+                if (!window.$that) {
+                    return 0;
+                }
+                if (!$that.reportFloorUnitFeeSummaryInfo) {
+                    return 0;
+                }
+                let _amount = 0;
+                $that.reportFloorUnitFeeSummaryInfo.fees.forEach(item => {
+                    _amount += parseFloat(item.hisOweReceivedAmount);
+                })
+                return _amount.toFixed(2);
             }
         }
     });