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

优化时间显示bug

Browse Source
This commit is contained in:
java110 2021-01-19 09:06:00 +08:00
parent a485ec01a3
commit 88160e687e
8 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,8 @@
if (_fee.state == '2009001') {
return "-";
}
return vc.dateSub(_fee.deadlineTime, _fee.feeFlag);
//return vc.dateSub(_fee.deadlineTime, _fee.feeFlag);
return vc.dateSubOneDay(_fee.startTime,_fee.deadlineTime, _fee.feeFlag);
},
_getEndTime: function (_fee) {
if (_fee.state == '2009001') {

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

@ -132,7 +132,7 @@
if (_fee.state == '2009001') {
return "-";
}
return vc.dateSub(_fee.deadlineTime, _fee.feeFlag);
return vc.dateSubOneDay(_fee.startTime,_fee.deadlineTime, _fee.feeFlag);
},
_getEndTime: function (_fee) {
if (_fee.state == '2009001') {

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

@ -162,7 +162,7 @@
<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">{{vc.dateFormat(payFeeOrderInfo.endTime)}} 至
{{vc.dateSub(vc.dateFormat(payFeeOrderInfo.showEndTime),payFeeOrderInfo.feeFlag)}}</label>
{{return vc.dateSubOneDay(payFeeOrderInfo.endTime,vc.dateFormat(payFeeOrderInfo.showEndTime),payFeeOrderInfo.feeFlag)}}</label>
</div>
<div class="row">
<label class="col-sm-3 col-form-label">应收金额：</label>

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

@ -31,7 +31,7 @@
<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.dateSub(vc.dateFormat(item.endTime),item.feeFlag)}}</td>
<td class="text-center">{{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),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>

2
public/pages/property/propertyFee/propertyFee.html
View File

@ -65,7 +65,7 @@
{{vc.dateFormat(feeDetail.startTime)}}
</td>
<td class="text-center" v-if="feeDetail.startTime >= feeDetail.endTime">{{vc.dateFormat(feeDetail.endTime)}}</td>
<td class="text-center" v-else>{{vc.dateSub(vc.dateFormat(feeDetail.endTime),feeDetail.feeFlag)}}</td>
<td class="text-center" v-else>{{vc.dateSubOneDay(vc.dateFormat(feeDetail.endTime),vc.dateFormat(feeDetail.endTime),feeDetail.feeFlag)}}</td>
<td class="text-center">
{{feeDetail.stateName}}
</td>

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

@ -117,7 +117,7 @@
<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" v-else>{{vc.dateSubOneDay(vc.dateFormat(fee.feeCreateTime),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>

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

@ -137,7 +137,7 @@
<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" v-else>{{vc.dateSubOneDay(vc.dateFormat(fee.startTime),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>

58
public/vcCore/vcFramework.js
View File

@ -360,13 +360,13 @@
}
};
vcFramework.i18n = function(_key){
if(!window.hasOwnProperty('lang')){
vcFramework.i18n = function (_key) {
if (!window.hasOwnProperty('lang')) {
return _key;
}
let _lang = window.lang;
if(!_lang.hasOwnProperty(_key)){
if (!_lang.hasOwnProperty(_key)) {
return _key;
}
@ -376,7 +376,7 @@
/**
* 解析 i18n 标签
*/
parseVcI18N = function(){
parseVcI18N = function () {
let _tmpI18N = document.getElementsByTagName("vc:i18n");
for (let _vcElementIndex = 0; _vcElementIndex < _tmpI18N.length; _vcElementIndex++) {
let _vcElement = _tmpI18N[_vcElementIndex];
@ -384,11 +384,11 @@
let textNode = document.createTextNode(vc.i18n(_name));
_vcElement.parentNode.appendChild(textNode);
//_vcElement.parentNode.replaceChild(textNode,_vcElement);
}
for (let _vcElementIndex = 0; _vcElementIndex < _tmpI18N.length; _vcElementIndex++) {
let _vcElement = _tmpI18N[_vcElementIndex];
_vcElement.parentNode.removeChild(_vcElement);
_vcElement.parentNode.removeChild(_vcElement);
}
_tmpI18N = document.head.getElementsByTagName("vc:i18n");
for (let _vcElementIndex = 0; _vcElementIndex < _tmpI18N.length; _vcElementIndex++) {
@ -396,11 +396,11 @@
let _name = _vcElement.getAttribute('name');
let textNode = document.createTextNode(vc.i18n(_name));
_vcElement.parentNode.appendChild(textNode);
}
for (let _vcElementIndex = 0; _vcElementIndex < _tmpI18N.length; _vcElementIndex++) {
let _vcElement = _tmpI18N[_vcElementIndex];
_vcElement.parentNode.removeChild(_vcElement);
_vcElement.parentNode.removeChild(_vcElement);
}
}
@ -960,7 +960,7 @@
let _cacheData = vcFramework.getData(_getPath);
//浏览器缓存中能获取到
if (_cacheData != null && _cacheData != undefined) {
successCallback(JSON.stringify(_cacheData), {status: 200});
successCallback(JSON.stringify(_cacheData), { status: 200 });
return;
}
}
@ -1061,7 +1061,7 @@
let _cacheData = vcFramework.getData(_getPath);
//浏览器缓存中能获取到
if (_cacheData != null && _cacheData != undefined) {
successCallback(JSON.stringify(_cacheData), {status: 200});
successCallback(JSON.stringify(_cacheData), { status: 200 });
return;
}
}
@ -1565,7 +1565,7 @@
return m < 10 ? '0' + m : m
}
vcFramework.dateTimeFormat = function (shijianchuo) {
//shijianchuo是整数，否则要parseInt转换
@ -1587,14 +1587,40 @@
return y + '-' + add0(m) + '-' + add0(d);
}
vcFramework.dateSub = function (dateTime,feeFlag) {
if(!dateTime || dateTime == '-'){
vcFramework.dateSubOneDay = function (_startTime, _endTime, feeFlag) {
if (!_endTime || _endTime == '-') {
return _endTime
}
let dateTime = new Date(_endTime);
let startTime = new Date(_startTime);
//如果开始时间是31日 结束时间是30日 不做处理
let _startTimeLastDay = startTime.getDate();
let _endTimeLastDay = dateTime.getDate();
if (_startTimeLastDay == 31 && _endTimeLastDay == 30) {
return vcFramework.dateFormat(dateTime);
}
//2月份特殊处理
let _endTimeMonth = dateTime.getMonth();
if (_endTimeMonth == 1 && _endTimeLastDay > 26 && _startTimeLastDay > 26) {
return vcFramework.dateFormat(dateTime);
}
if (feeFlag != "2006012") {
dateTime = dateTime.setDate(dateTime.getDate() - 1);
}
dateTime = vcFramework.dateFormat(dateTime)
return dateTime;
}
vcFramework.dateSub = function (dateTime, feeFlag) {
if (!dateTime || dateTime == '-') {
return dateTime
}
console.log("feeFlag:"+feeFlag);
console.log("feeFlag:" + feeFlag);
dateTime = new Date(dateTime);
if(feeFlag!="2006012"){
dateTime=dateTime.setDate(dateTime.getDate()-1);
if (feeFlag != "2006012") {
dateTime = dateTime.setDate(dateTime.getDate() - 1);
}
dateTime = vcFramework.dateFormat(dateTime)
return dateTime;