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 @@
| {{fee.floorNum}} |
- {{fee.receivableAmount}} |
- {{fee.receivedAmount}} |
- {{fee.receivedAmount1}} |
+ {{fee.receivableAmount || 0}} |
+ {{fee.receivedAmount || 0}} |
+ {{fee.receivedAmount1 || 0}} |
{{_getOweFeeTwo(fee)}} |
- {{fee.receivedAmount2}} |
+ {{fee.receivedAmount2 || 0}} |
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;
}
}
});