diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.js b/public/components/property/simplifyRoomFee/simplifyRoomFee.js
index 12a49b5f3..5630c817e 100644
--- a/public/components/property/simplifyRoomFee/simplifyRoomFee.js
+++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.js
@@ -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') {
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js
index ef1b6f359..4ffebc30a 100644
--- a/public/pages/property/listRoomFee/listRoomFee.js
+++ b/public/pages/property/listRoomFee/listRoomFee.js
@@ -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') {
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html
index d57684440..a161614a3 100644
--- a/public/pages/property/payFeeOrder/payFeeOrder.html
+++ b/public/pages/property/payFeeOrder/payFeeOrder.html
@@ -162,7 +162,7 @@
+ {{return vc.dateSubOneDay(payFeeOrderInfo.endTime,vc.dateFormat(payFeeOrderInfo.showEndTime),payFeeOrderInfo.feeFlag)}}
diff --git a/public/pages/property/printPayFee/printPayFee.html b/public/pages/property/printPayFee/printPayFee.html
index 851723013..d29c0473b 100644
--- a/public/pages/property/printPayFee/printPayFee.html
+++ b/public/pages/property/printPayFee/printPayFee.html
@@ -31,7 +31,7 @@
| {{index +1}} |
{{item.feeName}} |
- {{vc.dateFormat(item.startTime)}}至{{vc.dateSub(vc.dateFormat(item.endTime),item.feeFlag)}} |
+ {{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}} |
{{item.cycle}} |
{{item.squarePrice}} |
diff --git a/public/pages/property/propertyFee/propertyFee.html b/public/pages/property/propertyFee/propertyFee.html
index 881822f5e..753f0f76b 100644
--- a/public/pages/property/propertyFee/propertyFee.html
+++ b/public/pages/property/propertyFee/propertyFee.html
@@ -65,7 +65,7 @@
{{vc.dateFormat(feeDetail.startTime)}}
{{vc.dateFormat(feeDetail.endTime)}} |
- {{vc.dateSub(vc.dateFormat(feeDetail.endTime),feeDetail.feeFlag)}} |
+ {{vc.dateSubOneDay(vc.dateFormat(feeDetail.endTime),vc.dateFormat(feeDetail.endTime),feeDetail.feeFlag)}} |
{{feeDetail.stateName}}
|
diff --git a/public/pages/property/reportFeeDetail/reportFeeDetail.html b/public/pages/property/reportFeeDetail/reportFeeDetail.html
index 46648af78..754fc02f4 100644
--- a/public/pages/property/reportFeeDetail/reportFeeDetail.html
+++ b/public/pages/property/reportFeeDetail/reportFeeDetail.html
@@ -117,7 +117,7 @@
{{vc.dateFormat(fee.feeCreateTime)}} |
{{vc.dateFormat(fee.deadlineTime)}} |
- {{vc.dateSub(vc.dateFormat(fee.deadlineTime),fee.feeFlag)}} |
+ {{vc.dateSubOneDay(vc.dateFormat(fee.feeCreateTime),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 44da5dac9..f7e363e62 100644
--- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html
+++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html
@@ -137,7 +137,7 @@
{{vc.dateFormat(fee.startTime)}} |
{{vc.dateFormat(fee.endTime)}}
|
- {{vc.dateSub(vc.dateFormat(fee.endTime),fee.feeFlag)}} |
+ {{vc.dateSubOneDay(vc.dateFormat(fee.startTime),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 9717499da..b2a54d6f2 100644
--- a/public/vcCore/vcFramework.js
+++ b/public/vcCore/vcFramework.js
@@ -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;