diff --git a/public/pages/property/printOweFee/printOweFee.html b/public/pages/property/printOweFee/printOweFee.html index 9d6c48afa..47e1224b5 100755 --- a/public/pages/property/printOweFee/printOweFee.html +++ b/public/pages/property/printOweFee/printOweFee.html @@ -33,12 +33,12 @@ {{vc.dateFormat(item.endTime)}} - {{vc.dateFormat(item.deadlineTime)}}
+ {{_getDeadlineTime(item)}}
{{item.preDegrees}} 至 {{item.curDegrees}} - {{vc.dateFormat(item.endTime)}} + {{vc.dateFormat(item.endTime)}} - {{vc.dateFormat(item.deadlineTime)}} + {{_getDeadlineTime(item)}} {{(item.curDegrees-item.preDegrees).toFixed(2)}} diff --git a/public/pages/property/printOweFee/printOweFee.js b/public/pages/property/printOweFee/printOweFee.js index 2b685ada5..6c9e34909 100755 --- a/public/pages/property/printOweFee/printOweFee.js +++ b/public/pages/property/printOweFee/printOweFee.js @@ -154,6 +154,16 @@ } ); }, + _getDeadlineTime: function (_fee) { + if (_fee.amountOwed == 0 && _fee.endTime == _fee.deadlineTime) { + return "-"; + } + if (_fee.state == '2009001') { + return "-"; + } + //return vc.dateSub(_fee.deadlineTime, _fee.feeFlag); + return vc.dateSubOneDay(_fee.startTime, _fee.deadlineTime, _fee.feeFlag); + }, } });