admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-24 05:46:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

有效起始日期和止期去掉时分秒和周期性日期止期需要减去一天

Browse Source
This commit is contained in:
fuqiuchang 2020-12-30 18:35:54 +08:00
parent fd3ead6771
commit 1edb91276d
7 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/components/property/simplifyRoomFee/simplifyRoomFee.js
View File

@ -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', {

4
public/pages/property/listRoomFee/listRoomFee.js
View File

@ -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', {

4
public/pages/property/payFeeOrder/payFeeOrder.html
View File

@ -161,8 +161,8 @@
</div>
<div class="row" v-if="payFeeOrderInfo.feeFlag != '2006012' && payFeeOrderInfo.showEndTime != ''">
<label class="col-sm-3 col-form-label">缴费时间段：</label>
<label class="col-sm-8 col-form-label">{{payFeeOrderInfo.endTime}} 至
{{payFeeOrderInfo.showEndTime}}</label>
<label class="col-sm-8 col-form-label">{{vc.dateFormat(payFeeOrderInfo.endTime)}} 至
{{vc.dateSub(vc.dateFormat(payFeeOrderInfo.showEndTime),payFeeOrderInfo.feeFlag)}}</label>
</div>
<div class="row">
<label class="col-sm-3 col-form-label">应收金额：</label>

4
public/pages/property/printPayFee/printPayFee.html
View File

@ -31,8 +31,8 @@
<tr v-for="(item,index) in printPayFeeInfo.fees" class="vc-table-border">
<th scope="row" class="text-center">{{index +1}}</th>
<td class="text-center">{{item.feeName}}</td>
<!-- <td class="text-center">{{vc.dateFormat(item.startTime)}}至{{vc.dateFormat(item.endTime)}}</td> -->
<td class="text-center">{{item.startTime}}至{{item.endTime}}</td>
<td class="text-center">{{vc.dateFormat(item.startTime)}}至{{vc.dateSub(vc.dateFormat(item.endTime),item.feeFlag)}}</td>
<!--<td class="text-center">{{item.startTime}}至{{item.endTime}}</td>-->
<td class="text-center">{{item.cycle}}</td>
<td class="text-center">{{item.squarePrice}}</td>
<td class="text-center">{{item.area}}</td>

6
public/pages/property/reportFeeDetail/reportFeeDetail.html
View File

@ -114,8 +114,10 @@
<td class="text-center">{{index+1}}</td>
<td class="text-center">{{fee.objName}}</td>
<td class="text-center">{{fee.feeName}}</td>
<td class="text-center">{{fee.feeCreateTime}}</td>
<td class="text-center">{{fee.deadlineTime}}</td>
<td class="text-center">{{vc.dateFormat(fee.feeCreateTime)}}</td>
<!--<td class="text-center">{{fee.deadlineTime}}</td>-->
<td class="text-center" v-if="fee.feeCreateTime >= fee.deadlineTime">{{vc.dateFormat(fee.deadlineTime)}}</td>
<td class="text-center" v-else>{{vc.dateSub(vc.dateFormat(fee.deadlineTime),fee.feeFlag)}}</td>
<td class="text-center">{{fee.createTime}}</td>
<td class="text-center">{{fee.receivableAmount}}</td>
<td class="text-center">{{fee.receivedAmount}}</td>

5
public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html
View File

@ -115,8 +115,9 @@
<td class="text-center">{{fee.objName}}</td>
<td class="text-center">{{fee.feeName}}</td>
<td class="text-center">{{fee.primeRate}}</td>
<td class="text-center">{{fee.startTime}}</td>
<td class="text-center">{{fee.endTime}}</td>
<td class="text-center">{{vc.dateFormat(fee.startTime)}}</td>
<td class="text-center" v-if="fee.startTime >= fee.endTime">{{vc.dateFormat(fee.endTime)}}</td>
<td class="text-center" v-else>{{vc.dateSub(vc.dateFormat(fee.endTime),fee.feeFlag)}}</td>
<td class="text-center">{{fee.createTime}}</td>
<td class="text-center">{{fee.receivableAmount}}</td>
<td class="text-center">{{fee.receivedAmount}}</td>

13
public/vcCore/vcFramework.js
View File

@ -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();