diff --git a/public/components/frame/menu/menu.js b/public/components/frame/menu/menu.js index cb1036240..6be758d75 100644 --- a/public/components/frame/menu/menu.js +++ b/public/components/frame/menu/menu.js @@ -120,20 +120,19 @@ vc.setMenuState('OFF'); }, _gotoPage: function (_href) { - let copyMenus = this.menus; - for (var menuIndex = 0; menuIndex < copyMenus.length; menuIndex++) { - if (copyMenus[menuIndex].hasOwnProperty('childs')) { - var _childs = copyMenus[menuIndex].childs; + for (var menuIndex = 0; menuIndex < this.menus.length; menuIndex++) { + if (this.menus[menuIndex].hasOwnProperty('childs')) { + var _childs = this.menus[menuIndex].childs; for(var childIndex = 0; childIndex < _childs.length; childIndex++){ if(_href == _childs[childIndex].href){ - copyMenus[menuIndex].childs[childIndex].active = true; + this.menus[menuIndex].childs[childIndex].active = true; } else { - copyMenus[menuIndex].childs[childIndex].active = false; + this.menus[menuIndex].childs[childIndex].active = false; } } } } - this.$set(this.menus, copyMenus); + this.$forceUpdate(); vc.jumpToPage(_href); } diff --git a/public/index.html b/public/index.html index bdede314b..b598a66a3 100644 --- a/public/index.html +++ b/public/index.html @@ -16,7 +16,6 @@ - diff --git a/public/pages/property/listCarFee/listCarFee.html b/public/pages/property/listCarFee/listCarFee.html index 93699d300..59f3856f1 100644 --- a/public/pages/property/listCarFee/listCarFee.html +++ b/public/pages/property/listCarFee/listCarFee.html @@ -5,10 +5,10 @@
{{listCarFeeInfo.carNum}}费用({{listCarFeeInfo.parkingName}})
- + -->
@@ -15,7 +18,8 @@ v-model="reportFeeBreakdownInfo.conditions.floorName" class=" form-control">
@@ -32,20 +36,36 @@ -
+
-
- +
-
+
+
+ +
+
+
+
+ +
+ +
+
@@ -71,8 +102,7 @@
费用分项表
@@ -81,17 +111,19 @@ 费用编号 + 费用类型 费用项 费用开始时间 缴费时间 - 应收金额 - 实收金额 - 欠费金额 + 应收金额(单位:元) + 实收金额(单位:元) + 欠费金额(单位:元) {{index+1}} + {{fee.feeTypeCd}} {{fee.feeName}} {{fee.feeCreateTime}} {{fee.createTime}} diff --git a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js index ce9406085..2713fa3f3 100644 --- a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js +++ b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js @@ -13,24 +13,30 @@ moreCondition: false, title: '', roomUnits: [], + feeConfigDtos: [], + feeTypeCds: [], conditions: { floorId: '', floorName: '', roomNum: '', unitId: '', - startTime:'', - endTime:'' + configId: '', + feeTypeCd: '', + startTime: '', + endTime: '' } } }, _initMethod: function () { vc.component._initDate(); vc.component._listFees(DEFAULT_PAGE, DEFAULT_ROWS); - + //关联字典表费用类型 + vc.getDict('pay_fee_config', "fee_type_cd", function (_data) { + vc.component.reportFeeBreakdownInfo.feeTypeCds = _data; + }); // vc.initDateMonth('startTime', function (_startTime) { // $that.reportFeeBreakdownInfo.conditions.startTime = _startTime; // }); - // vc.initDateMonth('endTime', function (_endTime) { // $that.reportFeeBreakdownInfo.conditions.endTime = _endTime; // let start = Date.parse(new Date($that.reportFeeBreakdownInfo.conditions.startTime + "-01")) @@ -40,10 +46,8 @@ // $that.reportFeeBreakdownInfo.conditions.endTime = ''; // } // }); - }, _initEvent: function () { - vc.on('reportFeeBreakdown', 'chooseFloor', function (_param) { vc.component.reportFeeBreakdownInfo.conditions.floorId = _param.floorId; vc.component.reportFeeBreakdownInfo.conditions.floorName = _param.floorName; @@ -93,18 +97,18 @@ } }); }, - _queryMethod:function(){ + //查询 + _queryMethod: function () { vc.component._listFees(DEFAULT_PAGE, DEFAULT_ROWS); }, + //查询方法 _listFees: function (_page, _rows) { - vc.component.reportFeeBreakdownInfo.conditions.page = _page; vc.component.reportFeeBreakdownInfo.conditions.row = _rows; vc.component.reportFeeBreakdownInfo.conditions.communityId = vc.getCurrentCommunity().communityId; var param = { params: vc.component.reportFeeBreakdownInfo.conditions }; - //发送get请求 vc.http.apiGet('/reportFeeMonthStatistics/queryFeeBreakdown', param, @@ -113,6 +117,46 @@ vc.component.reportFeeBreakdownInfo.total = _reportFeeBreakdownInfo.total; vc.component.reportFeeBreakdownInfo.records = _reportFeeBreakdownInfo.records; vc.component.reportFeeBreakdownInfo.fees = _reportFeeBreakdownInfo.data; + if (_reportFeeBreakdownInfo.data.length > 0) { + vc.component.reportFeeBreakdownInfo.feeConfigDtos = _reportFeeBreakdownInfo.data[0].feeConfigDtos; + } + vc.emit('pagination', 'init', { + total: vc.component.reportFeeBreakdownInfo.records, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + //重置 + _resetMethod: function () { + vc.component._resetListFee(DEFAULT_PAGE, DEFAULT_ROWS); + }, + //重置方法 + _resetListFee: function (_page, _rows) { + vc.component.reportFeeBreakdownInfo.conditions.floorId = ""; + vc.component.reportFeeBreakdownInfo.conditions.floorName = ""; + vc.component.reportFeeBreakdownInfo.conditions.unitId = ""; + vc.component.reportFeeBreakdownInfo.conditions.roomNum = ""; + vc.component.reportFeeBreakdownInfo.conditions.configId = ""; + vc.component.reportFeeBreakdownInfo.conditions.startTime = ""; + vc.component.reportFeeBreakdownInfo.conditions.endTime = ""; + vc.component.reportFeeBreakdownInfo.conditions.feeTypeCd = ""; + var param = { + params: vc.component.reportFeeBreakdownInfo.conditions + }; + //发送get请求 + vc.http.apiGet('/reportFeeMonthStatistics/queryFeeBreakdown', + param, + function (json, res) { + var _reportFeeBreakdownInfo = JSON.parse(json); + vc.component.reportFeeBreakdownInfo.total = _reportFeeBreakdownInfo.total; + vc.component.reportFeeBreakdownInfo.records = _reportFeeBreakdownInfo.records; + vc.component.reportFeeBreakdownInfo.fees = _reportFeeBreakdownInfo.data; + if (_reportFeeBreakdownInfo.data.length > 0) { + vc.component.reportFeeBreakdownInfo.feeConfigDtos = _reportFeeBreakdownInfo.data[0].feeConfigDtos; + } vc.emit('pagination', 'init', { total: vc.component.reportFeeBreakdownInfo.records, currentPage: _page @@ -147,11 +191,18 @@ vc.toast(errInfo); }); }, - _openChooseFloorMethod:function(){ - vc.emit('searchFloor','openSearchFloorModel',{}); + _openChooseFloorMethod: function () { + vc.emit('searchFloor', 'openSearchFloorModel', {}); }, - _exportFee:function(){ - vc.jumpToPage('/callComponent/exportReportFee/exportData?communityId='+vc.getCurrentCommunity().communityId+"&pagePath=reportFeeBreakdown"); + _moreCondition: function () { + if (vc.component.reportFeeBreakdownInfo.moreCondition) { + vc.component.reportFeeBreakdownInfo.moreCondition = false; + } else { + vc.component.reportFeeBreakdownInfo.moreCondition = true; + } + }, + _exportFee: function () { + vc.jumpToPage('/callComponent/exportReportFee/exportData?communityId=' + vc.getCurrentCommunity().communityId + "&pagePath=reportFeeBreakdown"); } } }); diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.html b/public/pages/property/reportFeeSummary/reportFeeSummary.html index 904ac16fe..fda6a71fa 100644 --- a/public/pages/property/reportFeeSummary/reportFeeSummary.html +++ b/public/pages/property/reportFeeSummary/reportFeeSummary.html @@ -87,15 +87,15 @@ - - - - + + + + - + diff --git a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html index 3e2448e15..02157089c 100644 --- a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html +++ b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html @@ -17,7 +17,8 @@ class=" form-control">
@@ -82,17 +83,17 @@
缴费时间应收金额实收金额欠费金额日期应收金额(单位:元)实收金额(单位:元)欠费金额(单位:元)
{{fee.createTime}}{{fee.feeYear+'年'+fee.feeMonth+'月'}} {{fee.receivableAmount}} {{fee.receivedAmount}} {{fee.oweAmount}}
- + - - - + + + - + diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html index 39f04c325..26d642b8e 100644 --- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html +++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html @@ -79,6 +79,20 @@ +
+
+
+ +
+
+
diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js index bc25e2e85..74ea0401a 100644 --- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js +++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js @@ -14,6 +14,7 @@ title: '', roomUnits: [], primeRates: [], + feeConfigDtos: [], totalReceivableAmount: 0.0, totalReceivedAmount: 0.0, allReceivableAmount: 0.0, @@ -23,6 +24,7 @@ floorName: '', roomNum: '', unitId: '', + configId: '', primeRate: '', startTime: '', endTime: '' @@ -136,6 +138,7 @@ vc.component.reportPayFeeDetailInfo.totalReceivedAmount = _reportPayFeeDetailInfo.data[0].totalReceivedAmount; vc.component.reportPayFeeDetailInfo.allReceivableAmount = _reportPayFeeDetailInfo.data[0].allReceivableAmount; vc.component.reportPayFeeDetailInfo.allReceivedAmount = _reportPayFeeDetailInfo.data[0].allReceivedAmount; + vc.component.reportPayFeeDetailInfo.feeConfigDtos = _reportPayFeeDetailInfo.data[0].feeConfigDtos; } else { vc.component.reportPayFeeDetailInfo.totalReceivableAmount = "0.0"; vc.component.reportPayFeeDetailInfo.totalReceivedAmount = "0.0"; @@ -164,6 +167,7 @@ vc.component.reportPayFeeDetailInfo.conditions.primeRate = ""; vc.component.reportPayFeeDetailInfo.conditions.startTime = ""; vc.component.reportPayFeeDetailInfo.conditions.endTime = ""; + vc.component.reportPayFeeDetailInfo.conditions.configId = ""; var param = { params: vc.component.reportPayFeeDetailInfo.conditions }; @@ -180,6 +184,7 @@ vc.component.reportPayFeeDetailInfo.totalReceivedAmount = _reportPayFeeDetailInfo.data[0].totalReceivedAmount; vc.component.reportPayFeeDetailInfo.allReceivableAmount = _reportPayFeeDetailInfo.data[0].allReceivableAmount; vc.component.reportPayFeeDetailInfo.allReceivedAmount = _reportPayFeeDetailInfo.data[0].allReceivedAmount; + vc.component.reportPayFeeDetailInfo.feeConfigDtos = _reportPayFeeDetailInfo.data[0].feeConfigDtos; } else { vc.component.reportPayFeeDetailInfo.totalReceivableAmount = 0.0; vc.component.reportPayFeeDetailInfo.totalReceivedAmount = 0.0;
缴费日期日期 楼栋 单元应收金额实收金额欠费金额应收金额(单位:元)实收金额(单位:元)欠费金额(单位:元)
{{fee.createTime}}{{fee.feeYear+'年'+fee.feeMonth+'月'}} {{fee.floorNum}}号楼 {{fee.unitNum}}单元 {{fee.receivableAmount}}