diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.js b/public/components/property/simplifyRoomFee/simplifyRoomFee.js index b38ce700d..54705691b 100644 --- a/public/components/property/simplifyRoomFee/simplifyRoomFee.js +++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.js @@ -120,14 +120,13 @@ if (_fee.state == '2009001') { return "-"; } - - return _fee.deadlineTime; + return vc.dateSub(_fee.deadlineTime,_fee.feeFlag); }, _getEndTime: function (_fee) { if (_fee.state == '2009001') { return "-"; } - return _fee.endTime; + return vc.dateFormat(_fee.endTime); }, _openProxyFeeModal: function () { //创建代收费用 vc.emit('addProxyFee', 'openAddProxyFeeModal', { diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js index 634a03ee1..c1d5e31de 100644 --- a/public/pages/property/listRoomFee/listRoomFee.js +++ b/public/pages/property/listRoomFee/listRoomFee.js @@ -128,13 +128,13 @@ if (_fee.state == '2009001') { return "-"; } - return _fee.deadlineTime; + return vc.dateSub(_fee.deadlineTime,_fee.feeFlag); }, _getEndTime: function (_fee) { if (_fee.state == '2009001') { return "-"; } - return _fee.endTime; + return vc.dateFormat(_fee.endTime); }, _openProxyFeeModal: function () { //创建代收费用 vc.emit('addProxyFee', 'openAddProxyFeeModal', { diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html index aa2c6a1d0..d57684440 100644 --- a/public/pages/property/payFeeOrder/payFeeOrder.html +++ b/public/pages/property/payFeeOrder/payFeeOrder.html @@ -161,8 +161,8 @@
- +
diff --git a/public/pages/property/printPayFee/printPayFee.html b/public/pages/property/printPayFee/printPayFee.html index e5bb02cd3..851723013 100644 --- a/public/pages/property/printPayFee/printPayFee.html +++ b/public/pages/property/printPayFee/printPayFee.html @@ -31,8 +31,8 @@ {{index +1}} {{item.feeName}} - - {{item.startTime}}至{{item.endTime}} + {{vc.dateFormat(item.startTime)}}至{{vc.dateSub(vc.dateFormat(item.endTime),item.feeFlag)}} + {{item.cycle}} {{item.squarePrice}} {{item.area}} diff --git a/public/pages/property/reportFeeDetail/reportFeeDetail.html b/public/pages/property/reportFeeDetail/reportFeeDetail.html index 1453e07da..46648af78 100644 --- a/public/pages/property/reportFeeDetail/reportFeeDetail.html +++ b/public/pages/property/reportFeeDetail/reportFeeDetail.html @@ -114,8 +114,10 @@ {{index+1}} {{fee.objName}} {{fee.feeName}} - {{fee.feeCreateTime}} - {{fee.deadlineTime}} + {{vc.dateFormat(fee.feeCreateTime)}} + + {{vc.dateFormat(fee.deadlineTime)}} + {{vc.dateSub(vc.dateFormat(fee.deadlineTime),fee.feeFlag)}} {{fee.createTime}} {{fee.receivableAmount}} {{fee.receivedAmount}} diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html index 28a9555f7..39f04c325 100644 --- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html +++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html @@ -115,8 +115,9 @@ {{fee.objName}} {{fee.feeName}} {{fee.primeRate}} - {{fee.startTime}} - {{fee.endTime}} + {{vc.dateFormat(fee.startTime)}} + {{vc.dateFormat(fee.endTime)}} + {{vc.dateSub(vc.dateFormat(fee.endTime),fee.feeFlag)}} {{fee.createTime}} {{fee.receivableAmount}} {{fee.receivedAmount}} diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js index 0c83c6d5c..413db5805 100644 --- a/public/vcCore/vcFramework.js +++ b/public/vcCore/vcFramework.js @@ -1587,6 +1587,19 @@ return y + '-' + add0(m) + '-' + add0(d); } + vcFramework.dateSub = function (dateTime,feeFlag) { + if(!dateTime || dateTime == '-'){ + return dateTime + } + console.log("feeFlag:"+feeFlag); + dateTime = new Date(dateTime); + if(feeFlag!="2006012"){ + dateTime=dateTime.setDate(dateTime.getDate()-1); + } + dateTime = vcFramework.dateFormat(dateTime) + return dateTime; + } + vcFramework.getDateYYYYMMDDHHMISS = function () { let date = new Date(); let year = date.getFullYear();