diff --git a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html index 16d61cc7f..bfd9dc75e 100755 --- a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html +++ b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html @@ -7,8 +7,7 @@
-
@@ -16,11 +15,9 @@
- +
- @@ -29,8 +26,7 @@
-
- +
@@ -51,8 +45,7 @@ - @@ -118,69 +111,80 @@
- - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + +
- - - - - - - (单位:元) - - (单位:元) - - (单位:元) - - (单位:元) - - (单位:元) - - (单位:元) - - (单位:元) - - (单位:元) - - -
+ + + + + + + (单位:元) + + (单位:元) + + (单位:元) + + (单位:元) + + (单位:元) + + (单位:元) + + (单位:元) + + (单位:元) + + + + +
{{index+1}}{{fee.feeTypeCd}}{{fee.feeName}}{{fee.hisOweAmount}}{{fee.curReceivableAmount}}{{_computeSum(fee.hisOweAmount,fee.curReceivableAmount)}}{{fee.curReceivedAmount}}{{fee.hisOweReceivedAmount}}{{fee.preReceivedAmount}} - {{_computeSum(_computeSum(fee.hisOweReceivedAmount,fee.preReceivedAmount),fee.curReceivedAmount)}} - {{_computeOweFee(fee)}}{{fee.updateTime}}
{{index+1}}{{fee.feeTypeCd}}{{fee.feeName}}{{fee.hisOweAmount}}{{fee.curReceivableAmount}}{{_computeSum(fee.hisOweAmount,fee.curReceivableAmount)}}{{fee.curReceivedAmount}}{{fee.hisOweReceivedAmount}}{{fee.preReceivedAmount}} + {{_computeSum(_computeSum(fee.hisOweReceivedAmount,fee.preReceivedAmount),fee.curReceivedAmount)}} + {{_computeOweFee(fee)}}{{fee.updateTime}} +
+ +
+
-
    -
    +
      +
      @@ -188,72 +192,71 @@
      -
      -
      - -
      -       - +
      +
      + +
      + +
      : {{reportFeeBreakdownInfo.totalReceivableAmount}} - -
      -
      - : {{reportFeeBreakdownInfo.allReceivableAmount}} - -
      -       - + +
      +
      + : {{reportFeeBreakdownInfo.allReceivableAmount}} + +
      + +
      : {{reportFeeBreakdownInfo.totalReceivedAmount}} - -
      -
      - : {{reportFeeBreakdownInfo.allReceivedAmount}} - -
      -       - + +
      +
      + : {{reportFeeBreakdownInfo.allReceivedAmount}} + +
      + +
      : {{_computeTotalOweAmount()}} - -
      -
      - : {{reportFeeBreakdownInfo.allOweAmount}} - -
      -       - + +
      +
      + : {{reportFeeBreakdownInfo.allOweAmount}} + +
      + +
      : {{_computeTotalHisOweReceivedAmount()}} - -
      -
      - : {{reportFeeBreakdownInfo.allHisOweReceivedAmount}} - -
      -       -
      -
      -
      -
      - = 历史欠费 + - 当月应收 - 当月实收 - 欠费追回 -
      -
      - ：当月之前欠费；当月应收：当前月收费；当月实收：当月收到中属于当前月应收费用部分； -
      -
      - ：当月收到中属于历史欠费部分；预交费用：当月收到中属于预交费用部分 -
      -
      -
      - -
      -
      -
      - + + +
      + : {{reportFeeBreakdownInfo.allHisOweReceivedAmount}} + +
      + + +
      +
      +
      + = 历史欠费 + 当月应收 - 当月实收 - 欠费追回 +
      +
      + ：当月之前欠费；当月应收：当前月收费；当月实收：当月收到中属于当前月应收费用部分； +
      +
      + ：当月收到中属于历史欠费部分；预交费用：当月收到中属于预交费用部分
      - +
      + +
      + + + + + + \ No newline at end of file diff --git a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js index 279309438..e02927299 100755 --- a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js +++ b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js @@ -1,7 +1,7 @@ /** 入驻小区 **/ -(function (vc) { +(function(vc) { var DEFAULT_PAGE = 1; var DEFAULT_ROWS = 10; vc.extends({ @@ -36,28 +36,28 @@ } } }, - _initMethod: function () { + _initMethod: function() { //vc.component._initDate(); //$that.reportFeeBreakdownInfo.conditions.yearMonth = $that._getCurrentMonth(); $that._listFees(DEFAULT_PAGE, DEFAULT_ROWS); //关联字典表费用类型 - vc.getDict('pay_fee_config', "fee_type_cd", function (_data) { + vc.getDict('pay_fee_config', "fee_type_cd", function(_data) { vc.component.reportFeeBreakdownInfo.feeTypeCds = _data; }); }, - _initEvent: function () { - vc.on('reportFeeBreakdown', 'chooseFloor', function (_param) { + _initEvent: function() { + vc.on('reportFeeBreakdown', 'chooseFloor', function(_param) { vc.component.reportFeeBreakdownInfo.conditions.floorId = _param.floorId; vc.component.reportFeeBreakdownInfo.conditions.floorName = _param.floorName; vc.component.loadUnits(_param.floorId); }); - vc.on('pagination', 'page_event', function (_currentPage) { + vc.on('pagination', 'page_event', function(_currentPage) { vc.component._listFees(_currentPage, DEFAULT_ROWS); }); }, methods: { - _initDate: function () { + _initDate: function() { $(".startTime").datetimepicker({ minView: "month", language: 'zh-CN', @@ -79,12 +79,12 @@ todayBtn: true }); $('.startTime').datetimepicker() - .on('changeDate', function (ev) { + .on('changeDate', function(ev) { var value = $(".startTime").val(); vc.component.reportFeeBreakdownInfo.conditions.startTime = value; }); $('.endTime').datetimepicker() - .on('changeDate', function (ev) { + .on('changeDate', function(ev) { var value = $(".endTime").val(); vc.component.reportFeeBreakdownInfo.conditions.endTime = value; let start = Date.parse(new Date($that.reportFeeBreakdownInfo.conditions.startTime)) @@ -108,11 +108,11 @@ } }, //查询 - _queryMethod: function () { + _queryMethod: function() { vc.component._listFees(DEFAULT_PAGE, DEFAULT_ROWS); }, //查询方法 - _listFees: function (_page, _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; @@ -122,7 +122,7 @@ //发送get请求 vc.http.apiGet('/reportFeeMonthStatistics/queryFeeBreakdown', param, - function (json, res) { + function(json, res) { var _reportFeeBreakdownInfo = JSON.parse(json); vc.component.reportFeeBreakdownInfo.total = _reportFeeBreakdownInfo.total; vc.component.reportFeeBreakdownInfo.records = _reportFeeBreakdownInfo.records; @@ -154,17 +154,17 @@ currentPage: _page }); }, - function (errInfo, error) { + function(errInfo, error) { console.log('请求失败处理'); } ); }, //重置 - _resetMethod: function () { + _resetMethod: function() { vc.component._resetListFee(DEFAULT_PAGE, DEFAULT_ROWS); }, //重置方法 - _resetListFee: function (_page, _rows) { + _resetListFee: function(_page, _rows) { vc.component.reportFeeBreakdownInfo.conditions.floorId = ""; vc.component.reportFeeBreakdownInfo.conditions.floorName = ""; vc.component.reportFeeBreakdownInfo.conditions.unitId = ""; @@ -176,7 +176,7 @@ vc.component.reportFeeBreakdownInfo.conditions.yearMonth = ""; $that._listFees(DEFAULT_PAGE, DEFAULT_ROWS); }, - loadUnits: function (_floorId) { + loadUnits: function(_floorId) { let param = { params: { floorId: _floorId, @@ -187,7 +187,7 @@ 'room', 'loadUnits', param, - function (json, res) { + function(json, res) { //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); if (res.status == 200) { let tmpUnits = JSON.parse(json); @@ -196,48 +196,48 @@ } vc.toast(json); }, - function (errInfo, error) { + function(errInfo, error) { console.log('请求失败处理'); vc.toast(errInfo); }); }, - _openChooseFloorMethod: function () { + _openChooseFloorMethod: function() { vc.emit('searchFloor', 'openSearchFloorModel', {}); }, - _moreCondition: function () { + _moreCondition: function() { if (vc.component.reportFeeBreakdownInfo.moreCondition) { vc.component.reportFeeBreakdownInfo.moreCondition = false; } else { vc.component.reportFeeBreakdownInfo.moreCondition = true; } }, - _exportExcel: function () { + _exportExcel: function() { vc.jumpToPage('/callComponent/exportReportFee/exportData?pagePath=reportFeeBreakdown&' + vc.objToGetParam($that.reportFeeBreakdownInfo.conditions)); }, - _computeSum: function (a, b) { + _computeSum: function(a, b) { return (parseFloat(a) + parseFloat(b)).toFixed(2) }, - _computeOweFee: function (fee) { + _computeOweFee: function(fee) { let _oweFee = (parseFloat(fee.hisOweAmount) + parseFloat(fee.curReceivableAmount) - parseFloat(fee.curReceivedAmount) - parseFloat(fee.hisOweReceivedAmount)).toFixed(2); if (_oweFee < 0) { return 0; } return _oweFee; }, - _computeTotalOweAmount: function () { + _computeTotalOweAmount: function() { if (!window.$that) { return 0; } - if (!$that.reportFloorUnitFeeSummaryInfo) { + if (!$that.reportFeeBreakdownInfo) { return 0; } let _amount = 0; - $that.reportFloorUnitFeeSummaryInfo.fees.forEach(item => { + $that.reportFeeBreakdownInfo.fees.forEach(item => { _amount += parseFloat($that._computeOweFee(item)); }) return _amount.toFixed(2); }, - _getCurrentMonth: function () { + _getCurrentMonth: function() { let date = new Date(); let year = date.getFullYear(); let month = date.getMonth() + 1; @@ -246,18 +246,32 @@ } return year + '' + month; }, - _computeTotalHisOweReceivedAmount: function () { + _computeTotalHisOweReceivedAmount: function() { if (!window.$that) { return 0; } - if (!$that.reportFloorUnitFeeSummaryInfo) { + if (!$that.reportFeeBreakdownInfo) { return 0; } let _amount = 0; - $that.reportFloorUnitFeeSummaryInfo.fees.forEach(item => { + $that.reportFeeBreakdownInfo.fees.forEach(item => { _amount += parseFloat(item.hisOweReceivedAmount); }) return _amount.toFixed(2); + }, + _toDetail: function(_fee) { + let _condition = { + floorId: vc.component.reportFeeBreakdownInfo.conditions.floorId, + floorName: vc.component.reportFeeBreakdownInfo.conditions.floorName, + unitId: vc.component.reportFeeBreakdownInfo.conditions.unitId, + roomNum: vc.component.reportFeeBreakdownInfo.conditions.roomNum, + startTime: vc.component.reportFeeBreakdownInfo.conditions.startTime, + endTime: vc.component.reportFeeBreakdownInfo.conditions.endTime, + feeTypeCd: vc.component.reportFeeBreakdownInfo.conditions.feeTypeCd, + yearMonth: vc.component.reportFeeBreakdownInfo.conditions.yearMonth, + } + vc.jumpToPage('/#/pages/property/reportFeeBreakdownDetail?configId=' + _fee.configId + + "&" + vc.objToGetParam(_condition)) } } }); diff --git a/public/pages/property/reportFeeBreakdownDetail/reportFeeBreakdownDetail.html b/public/pages/property/reportFeeBreakdownDetail/reportFeeBreakdownDetail.html new file mode 100644 index 000000000..3cec5ea48 --- /dev/null +++ b/public/pages/property/reportFeeBreakdownDetail/reportFeeBreakdownDetail.html @@ -0,0 +1,91 @@ +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + (单位:元) + + (单位:元) + + (单位:元) + + (单位:元) + + (单位:元) + + (单位:元) + + (单位:元) + + (单位:元) + + +
      {{fee.objName}}{{fee.feeName}}{{fee.hisOweAmount}}{{fee.curReceivableAmount}}{{_computeSum(fee.hisOweAmount,fee.curReceivableAmount)}}{{fee.curReceivedAmount}}{{fee.hisOweReceivedAmount}}{{fee.preReceivedAmount}} + {{_computeSum(_computeSum(fee.hisOweReceivedAmount,fee.preReceivedAmount),fee.curReceivedAmount)}} + {{_computeOweFee(fee)}}{{fee.updateTime}}
      +
        +
        + + + +
        +
        + +
        +
        +
        +
        +
        +
        +
        \ No newline at end of file diff --git a/public/pages/property/reportFeeBreakdownDetail/reportFeeBreakdownDetail.js b/public/pages/property/reportFeeBreakdownDetail/reportFeeBreakdownDetail.js new file mode 100644 index 000000000..1280e130a --- /dev/null +++ b/public/pages/property/reportFeeBreakdownDetail/reportFeeBreakdownDetail.js @@ -0,0 +1,88 @@ +/** + 入驻小区 + **/ +(function(vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 20; + vc.extends({ + data: { + reportFeeBreakdownDetailInfo: { + fees: [], + conditions: { + floorId: '', + floorName: '', + roomNum: '', + unitId: '', + configId: '', + feeTypeCd: '', + startTime: '', + endTime: '', + yearMonth: '', + communityId: vc.getCurrentCommunity().communityId, + } + } + }, + _initMethod: function() { + $that.reportFeeBreakdownDetailInfo.conditions.floorId = vc.getParam('floorId'); + $that.reportFeeBreakdownDetailInfo.conditions.floorName = vc.getParam('floorName'); + $that.reportFeeBreakdownDetailInfo.conditions.roomNum = vc.getParam('roomNum'); + $that.reportFeeBreakdownDetailInfo.conditions.unitId = vc.getParam('unitId'); + $that.reportFeeBreakdownDetailInfo.conditions.startTime = vc.getParam('startTime'); + $that.reportFeeBreakdownDetailInfo.conditions.endTime = vc.getParam('endTime'); + $that.reportFeeBreakdownDetailInfo.conditions.feeYear = vc.getParam('feeTypeCd'); + $that.reportFeeBreakdownDetailInfo.conditions.feeMonth = vc.getParam('yearMonth'); + $that.reportFeeBreakdownDetailInfo.conditions.configId = vc.getParam('configId'); + $that._listFees(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _initEvent: function() { + vc.on('pagination', 'page_event', function(_currentPage) { + $that._listFees(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + //查询方法 + _listFees: function(_page, _rows) { + $that.reportFeeBreakdownDetailInfo.conditions.page = _page; + $that.reportFeeBreakdownDetailInfo.conditions.row = _rows; + $that.reportFeeBreakdownDetailInfo.conditions.communityId = vc.getCurrentCommunity().communityId; + var param = { + params: $that.reportFeeBreakdownDetailInfo.conditions + }; + //发送get请求 + vc.http.apiGet('/reportFeeMonthStatistics/queryReportFeeBreakdownDetail', + param, + function(json, res) { + var _reportFeeBreakdownDetailInfo = JSON.parse(json); + $that.reportFeeBreakdownDetailInfo.total = _reportFeeBreakdownDetailInfo.total; + $that.reportFeeBreakdownDetailInfo.records = _reportFeeBreakdownDetailInfo.records; + $that.reportFeeBreakdownDetailInfo.fees = _reportFeeBreakdownDetailInfo.data; + vc.emit('pagination', 'init', { + total: $that.reportFeeBreakdownDetailInfo.records, + dataCount: $that.reportFeeBreakdownDetailInfo.total, + currentPage: _page + }); + }, + function(errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _exportExcel: function() { + vc.jumpToPage('/callComponent/exportReportFee/exportData?pagePath=reportFeeBreakdownDetail&' + vc.objToGetParam($that.reportFeeBreakdownDetailInfo.conditions)); + }, + _goBack: function() { + vc.goBack(); + }, + _computeSum: function(a, b) { + return (parseFloat(a) + parseFloat(b)).toFixed(2) + }, + _computeOweFee: function(fee) { + let _oweFee = (parseFloat(fee.hisOweAmount) + parseFloat(fee.curReceivableAmount) - parseFloat(fee.curReceivedAmount) - parseFloat(fee.hisOweReceivedAmount)).toFixed(2); + if (_oweFee < 0) { + return 0; + } + return _oweFee; + }, + } + }); +})(window.vc); \ No newline at end of file