From 5726b757652cc28f951839fc37f08d5068d3a3df Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 16 Aug 2021 12:01:13 +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

---
 .../reportHuaningPayFeeTwo.html                     |  8 ++++----
 .../reportHuaningPayFeeTwo.js                       | 13 +++++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.html b/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.html
index 613884f1f..cd2b40a4d 100644
--- a/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.html
+++ b/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.html
@@ -16,11 +16,11 @@
                     <tbody>
                         <tr v-for="fee in reportHuaningPayFeeTwoInfo.fees">
                             <td class="text-center ">{{fee.floorNum}}</td>
-                            <td class="text-center ">{{fee.receivableAmount}}</td>
-                            <td class="text-center ">{{fee.receivedAmount}}</td>
-                            <td class="text-center">{{fee.receivedAmount1}}</td>
+                            <td class="text-center ">{{fee.receivableAmount || 0}}</td>
+                            <td class="text-center ">{{fee.receivedAmount || 0}}</td>
+                            <td class="text-center">{{fee.receivedAmount1 || 0}}</td>
                             <td class="text-center">{{_getOweFeeTwo(fee)}}</td>
-                            <td class="text-center">{{fee.receivedAmount2}}</td>
+                            <td class="text-center">{{fee.receivedAmount2 || 0}}</td>
                         </tr>
                     </tbody>
                 </table>
diff --git a/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.js b/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.js
index 000038629..62e41a35b 100644
--- a/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.js
+++ b/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.js
@@ -73,8 +73,17 @@
                     dateStr: vc.dateFormat(new Date().getTime())
                 }
             },
-            _getOweFeeTwo:function(_fee){
-               return  _fee.receivedAmount2 + _fee.receivableAmount - _fee.receivedAmount - _fee.receivedAmount1;
+            _getOweFeeTwo: function (_fee) {
+                let _receivedAmount2 = _fee.receivedAmount2 || 0;
+                let _receivableAmount = _fee.receivableAmount || 0;
+                let _receivedAmount = _fee.receivedAmount || 0;
+                let _receivedAmount1 = _fee.receivedAmount1 || 0;
+                let _temp = _receivedAmount2 + _receivableAmount - _receivedAmount - _receivedAmount1;
+                if (_temp < 0) {
+                    return 0;
+                }
+
+                return _temp;
             }
         }
     });