From 38428651e53d055bfcca06fadc6c41ca206d519f Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Fri, 23 Oct 2020 11:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 8 ++-- .../payFeeAuditManage/payFeeAuditManage.html | 10 +++-- .../payFeeAuditManage/payFeeAuditManage.js | 4 +- .../property/payFeeOrder/payFeeOrder.html | 36 +++++++++++++++++- .../pages/property/payFeeOrder/payFeeOrder.js | 38 +++++++++++++------ .../property/propertyFee/propertyFee.html | 4 +- public/vcCore/vcFramework.js | 38 ++++++++++++++++++- 7 files changed, 112 insertions(+), 26 deletions(-) diff --git a/app.js b/app.js index 2f1c18d48..3aa078f84 100644 --- a/app.js +++ b/app.js @@ -36,12 +36,12 @@ let opts = { //app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); -//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); +app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts)); +app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts)); -app.use('/callComponent',proxy('http://192.168.1.16:8012',opts)); -app.use('/app',proxy('http://192.168.1.16:8012',opts)); +//app.use('/callComponent',proxy('http://192.168.1.16:8012',opts)); +//app.use('/app',proxy('http://192.168.1.16:8012',opts)); //app.listen(3000); app.use(express.json()); diff --git a/public/pages/property/payFeeAuditManage/payFeeAuditManage.html b/public/pages/property/payFeeAuditManage/payFeeAuditManage.html index e43ad80a1..a21fc23b3 100644 --- a/public/pages/property/payFeeAuditManage/payFeeAuditManage.html +++ b/public/pages/property/payFeeAuditManage/payFeeAuditManage.html @@ -5,9 +5,9 @@
查询条件
- + -->
@@ -87,7 +87,11 @@ {{payFee.receivedAmount}} {{payFee.userName}} {{payFee.createTime}} - {{_getState(payFee.state)}} + + {{_getState(payFee.state)}} + {{_getState(payFee.state)}} + {{_getState(payFee.state)}} + {{payFee.message}} {{payFee.remark}} diff --git a/public/pages/property/payFeeAuditManage/payFeeAuditManage.js b/public/pages/property/payFeeAuditManage/payFeeAuditManage.js index cda8aaafe..af3bf87d0 100644 --- a/public/pages/property/payFeeAuditManage/payFeeAuditManage.js +++ b/public/pages/property/payFeeAuditManage/payFeeAuditManage.js @@ -19,7 +19,7 @@ startTime: '', endTime: '', userCode:'', - state:'' + state:'1010' }, curPayFee:{} } @@ -33,7 +33,7 @@ }, _initEvent: function () { vc.on('pagination', 'page_event', function (_currentPage) { - vc.component._listpayFees(_currentPage, DEFAULT_ROWS); + vc.component._listPayFees(_currentPage, DEFAULT_ROWS); }); vc.on('payFeeAuditManage','audtiNotify',function(_param){ diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html index b3df7fa59..3823e7f8f 100644 --- a/public/pages/property/payFeeOrder/payFeeOrder.html +++ b/public/pages/property/payFeeOrder/payFeeOrder.html @@ -104,7 +104,7 @@
+ @click="_openPayFee()">提交收费
@@ -133,4 +133,38 @@ + \ No newline at end of file diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js index 9a6de9b1e..cac21f8ee 100644 --- a/public/pages/property/payFeeOrder/payFeeOrder.js +++ b/public/pages/property/payFeeOrder/payFeeOrder.js @@ -18,12 +18,12 @@ communityId: vc.getCurrentCommunity().communityId, roomName: '', squarePrice: '', - additionalAmount: '', remark: '', builtUpArea: 0.0, squarePrice: 0.0, additionalAmount: 0.0, - receiptId:'' + receiptId: '', + showEndTime:'' } }, _initMethod: function () { @@ -90,11 +90,11 @@ ] }); }, - _payFee: function (_page, _row) { + _openPayFee: function () { if ($that.payFeeOrderInfo.tempCycles != "" && $that.payFeeOrderInfo.tempCycles != '-102') { $that.payFeeOrderInfo.cycles = $that.payFeeOrderInfo.tempCycles; } - if($that.payFeeOrderInfo.feeFlag == '2006012'){ + if ($that.payFeeOrderInfo.feeFlag == '2006012') { $that.payFeeOrderInfo.cycles = '1'; } if ($that.payFeeOrderInfo.cycles == "") { @@ -105,8 +105,22 @@ return; } - - + if (!(/(^[1-9]\d*$)/.test($that.payFeeOrderInfo.cycles))) { + $that.payFeeOrderInfo.showEndTime = ''; + }else{ + console.log('cycle',$that.payFeeOrderInfo.cycles) + $that.payFeeOrderInfo.showEndTime = vc.addMonth(new Date($that.payFeeOrderInfo.endTime),parseInt($that.payFeeOrderInfo.cycles)); + } + //关闭model + $("#doPayFeeModal").modal('show'); + }, + _closeDoPayFeeModal: function () { + //关闭model + $("#doPayFeeModal").modal('hide') + $that.payFeeOrderInfo.showEndTime = ''; + }, + _payFee: function (_page, _row) { + $that._closeDoPayFeeModal(); let _printFees = []; _printFees.push({ feeId: $that.payFeeOrderInfo.feeId, @@ -157,16 +171,16 @@ return; } let _newCycles = _cycles; - + if (_cycles == '') { _newCycles = $that.payFeeOrderInfo.paymentCycles[0]; } vc.component.payFeeOrderInfo.totalFeePrice = Math.floor(parseFloat(_newCycles) * parseFloat(vc.component.payFeeOrderInfo.feePrice) * 100) / 100; vc.component.payFeeOrderInfo.receivedAmount = vc.component.payFeeOrderInfo.totalFeePrice; }, - changeCycle:function(_cycles){ - if(_cycles == ''){ - return ; + changeCycle: function (_cycles) { + if (_cycles == '') { + return; } vc.component.payFeeOrderInfo.totalFeePrice = Math.floor(parseFloat(_cycles) * parseFloat(vc.component.payFeeOrderInfo.feePrice) * 100) / 100; vc.component.payFeeOrderInfo.receivedAmount = vc.component.payFeeOrderInfo.totalFeePrice; @@ -175,14 +189,14 @@ $('#payFeeResult').modal("hide"); vc.getBack(); }, - _goBack:function(){ + _goBack: function () { vc.goBack(); }, _printAndBack: function () { //$('#payFeeResult').modal("hide"); window.open("/print.html#/pages/property/printPayFee?receiptId=" + $that.payFeeOrderInfo.receiptId) }, - _mathCeil:function(_price){ + _mathCeil: function (_price) { return Math.ceil(_price); } } diff --git a/public/pages/property/propertyFee/propertyFee.html b/public/pages/property/propertyFee/propertyFee.html index 454ca3b09..19e0da201 100644 --- a/public/pages/property/propertyFee/propertyFee.html +++ b/public/pages/property/propertyFee/propertyFee.html @@ -45,7 +45,7 @@ 缴费时间 缴费起始时间 缴费结束时间 - 退费标识 + 状态 操作 @@ -82,7 +82,7 @@ {{feeDetail.stateName}} -
+
diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js index 0c8f2ff16..c9336d909 100644 --- a/public/vcCore/vcFramework.js +++ b/public/vcCore/vcFramework.js @@ -965,7 +965,7 @@ Vue.http.headers.common['REQ-TIME'] = vcFramework.getDateYYYYMMDDHHMISS(); Vue.http.headers.common['SIGN'] = ''; if (api.indexOf('/') >= 0) { - _api = '/app' + api; + _api = '/app' + api; } else { _api = '/callComponent/' + api; } @@ -1029,7 +1029,7 @@ Vue.http.headers.common['USER-ID'] = '-1'; if (api.indexOf('/') >= 0) { - _api = '/app' + api; + _api = '/app' + api; } else { _api = '/callComponent/' + api; } @@ -1599,6 +1599,40 @@ }); } + daysInMonth = function (year, month) { + if (month == 1) { + if (year % 4 == 0 && year % 100 != 0) + return 29; + else + return 28; + } else if ((month <= 6 && month % 2 == 0) || (month = 6 && month % 2 == 1)) + return 31; + else + return 30; + } + + vcFramework.addMonth = function (_date, _month) { + let y = _date.getFullYear(); + let m = _date.getMonth(); + let nextY = y; + let nextM = m; + //如果当前月+要加上的月>11 这里之所以用11是因为 js的月份从0开始 + if ((m + _month) > 11) { + nextY = y + 1; + nextM = parseInt(m + _month) - 12; + } else { + nextM = m + _month + } + let daysInNextMonth = daysInMonth(nextY, nextM); + let day = _date.getDate(); + if (day > daysInNextMonth) { + day = daysInNextMonth; + } + let _newDate = new Date(nextY, nextM, day) + return _newDate.getFullYear() + '-' + (_newDate.getMonth() + 1) + '-' + _newDate.getDay() + " " + _date.getHours() + ":" + _date.getMinutes() + ":" + _date.getSeconds(); + }; + + })(window.vcFramework);