diff --git a/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js b/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js index 952bf6187..7d0cf48de 100644 --- a/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js +++ b/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js @@ -9,6 +9,7 @@ dataReportFeeStatisticsInfo: { fees: [], feeTypeCds: [], + floors:[], ownerId: '', roomNum: '', startDate: '', @@ -37,45 +38,69 @@ }) }, methods: { - _loadDataReportFeeStatisticsData: function(_page, _row) { + _loadDataReportFeeStatisticsData: function(_page, _row,_floorIds) { let param = { params: { communityId: vc.getCurrentCommunity().communityId, startDate: $that.dataReportFeeStatisticsInfo.startDate, endDate: $that.dataReportFeeStatisticsInfo.endDate, - objName: $that.dataReportFeeStatisticsInfo.objName, - ownerName: $that.dataReportFeeStatisticsInfo.ownerName, - link: $that.dataReportFeeStatisticsInfo.link, + floorIds: _floorIds, page: _page, row: _row } }; //发送get请求 - vc.http.apiGet('/dataReport.queryOweDetailStatistics', + vc.http.apiGet('/dataReport.queryDataReportFeeStatistics', param, function(json) { let _json = JSON.parse(json); $that.dataReportFeeStatisticsInfo.fees = _json.data; - vc.emit('dataReportFeeStatistics', 'paginationPlus', 'init', { - total: _json.records, - dataCount: _json.total, - currentPage: _page - }); - let _feeAmount = 0.0; - if (_json.data && _json.data.length > 0) { - _json.data.forEach(item => { - _feeAmount += parseFloat(item.receivedFee); - }); - } + + // let _feeAmount = 0.0; + // if (_json.data && _json.data.length > 0) { + // _json.data.forEach(item => { + // _feeAmount += parseFloat(item.receivedFee); + // }); + // } - $that.dataReportFeeStatisticsInfo.feeAmount = _feeAmount.toFixed(2); + // $that.dataReportFeeStatisticsInfo.feeAmount = _feeAmount.toFixed(2); }, function() { console.log('请求失败处理'); } ); }, + _loadFloors:function(){ + var param = { + params: { + page:1, + row:100, + communityId:vc.getCurrentCommunity().communityId + } + }; + + //发送get请求 + vc.http.apiGet('/floor.queryFloors', + param, + function(json, res) { + var listFloorData = JSON.parse(json); + + vc.component.listFloorInfo.total = listFloorData.total; + vc.component.listFloorInfo.records = listFloorData.records; + vc.component.listFloorInfo.floors = listFloorData.apiFloorDataVoList; + + vc.emit('pagination', 'init', { + total: vc.component.listFloorInfo.records, + dataCount: vc.component.listFloorInfo.total, + currentPage: _page + }); + }, + function(errInfo, error) { + console.log('请求失败处理'); + } + ); + }, //查询 _qureyDataReportFeeStatistics: function() { $that._loadDataReportFeeStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);