diff --git a/public/components/property/reportHuaningOweFee/reportHuaningOweFee.js b/public/components/property/reportHuaningOweFee/reportHuaningOweFee.js index 460adb021..54777e6ee 100644 --- a/public/components/property/reportHuaningOweFee/reportHuaningOweFee.js +++ b/public/components/property/reportHuaningOweFee/reportHuaningOweFee.js @@ -20,21 +20,21 @@ _initEvent: function () { //切换 至费用页面 vc.on('reportHuaningOweFee', 'switch', function (_param) { - $that.clearReportProficientRoomFeeInfo(); + $that.clearReportHuaningOweFeeInfo(); $that.reportHuaningOweFeeInfo.conditions = _param; console.log($that.reportHuaningOweFeeInfo.conditions) - $that._listReportProficientRoomFee(DEFAULT_PAGE, DEFAULT_ROWS); + $that._listReportHuaningOweFee(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('reportHuaningOweFee', 'notify', function () { - $that._listReportProficientRoomFee(DEFAULT_PAGE, DEFAULT_ROWS); + $that._listReportHuaningOweFee(DEFAULT_PAGE, DEFAULT_ROWS); }); vc.on('reportHuaningOweFee', 'paginationPlus', 'page_event', function (_currentPage) { - vc.component._listReportProficientRoomFee(_currentPage, DEFAULT_ROWS); + vc.component._listReportHuaningOweFee(_currentPage, DEFAULT_ROWS); }); }, methods: { - _listReportProficientRoomFee: function (_page, _row) { + _listReportHuaningOweFee: function (_page, _row) { $that.reportHuaningOweFeeInfo.conditions.page = _page; $that.reportHuaningOweFeeInfo.conditions.row = _row; $that.reportHuaningOweFeeInfo.conditions.communityId = vc.getCurrentCommunity().communityId; @@ -80,7 +80,7 @@ }); return _value; }, - clearReportProficientRoomFeeInfo: function () { + clearReportHuaningOweFeeInfo: function () { $that.reportHuaningOweFeeInfo = { fees: [], roomId: '', @@ -115,7 +115,7 @@ return year + "年前未收金额"; }, _getPreAmount:function(_fee){ - return parseFloat(_fee.oweAmount) - parseFloat(_fee.curOweAmount); + return (parseFloat(_fee.oweAmount) - parseFloat(_fee.curOweAmount)).toFixed(2); } } }); diff --git a/public/components/property/reportHuaningPayFee/reportHuaningPayFee.html b/public/components/property/reportHuaningPayFee/reportHuaningPayFee.html new file mode 100644 index 000000000..3eb999b09 --- /dev/null +++ b/public/components/property/reportHuaningPayFee/reportHuaningPayFee.html @@ -0,0 +1,40 @@ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
楼栋号每月应收{{reportHuaningPayFeeInfo.conditions.month}}月实收{{reportHuaningPayFeeInfo.conditions.month}}月实收中属于{{reportHuaningPayFeeInfo.conditions.year}}年1-{{reportHuaningPayFeeInfo.conditions.month}}月部分{{reportHuaningPayFeeInfo.conditions.month}}月实收中属于{{reportHuaningPayFeeInfo.conditions.year}}年{{reportHuaningPayFeeInfo.conditions.month}}月部分{{reportHuaningPayFeeInfo.conditions.month}}月实收中属于{{_getNextMonth()}}起预收部分{{reportHuaningPayFeeInfo.conditions.month}}月实收中属于收{{reportHuaningPayFeeInfo.conditions.year}}年前部分
{{fee.floorNum}}{{fee.receivableAmount}}{{fee.receivedAmount}}{{fee.receivedAmount1}}{{fee.receivedAmount2}}{{fee.receivedAmount3}}{{fee.receivedAmount4}}
+
+
+
+
+ +
+
+ +
+
+
+
\ No newline at end of file diff --git a/public/components/property/reportHuaningPayFee/reportHuaningPayFee.js b/public/components/property/reportHuaningPayFee/reportHuaningPayFee.js new file mode 100644 index 000000000..219669a7b --- /dev/null +++ b/public/components/property/reportHuaningPayFee/reportHuaningPayFee.js @@ -0,0 +1,83 @@ +/** + 入驻小区 + **/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + reportHuaningPayFeeInfo: { + fees: [], + listColumns: [], + roomId: '', + roomName: '', + conditions: { + year: new Date().getFullYear(), + month: new Date().getMonth() + 1 + }, + dateStr: vc.dateFormat(new Date().getTime()) + } + }, + _initMethod: function () { + }, + _initEvent: function () { + //切换 至费用页面 + vc.on('reportHuaningPayFee', 'switch', function (_param) { + $that.clearReportProficientRoomFeeInfo(); + $that.reportHuaningPayFeeInfo.conditions = _param; + $that._listReportHuaningPayFee(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('reportHuaningPayFee', 'notify', function () { + $that._listReportHuaningPayFee(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('reportHuaningPayFee', 'paginationPlus', 'page_event', + function (_currentPage) { + vc.component._listReportHuaningPayFee(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _listReportHuaningPayFee: function (_page, _row) { + $that.reportHuaningPayFeeInfo.conditions.page = _page; + $that.reportHuaningPayFeeInfo.conditions.row = _row; + $that.reportHuaningPayFeeInfo.conditions.communityId = vc.getCurrentCommunity().communityId; + let param = { + params: $that.reportHuaningPayFeeInfo.conditions + }; + //发送get请求 + vc.http.apiGet('/reportFeeMonthStatistics/queryHuaningPayFee', + param, + function (json) { + let _feeConfigInfo = JSON.parse(json); + vc.component.reportHuaningPayFeeInfo.total = _feeConfigInfo.total; + vc.component.reportHuaningPayFeeInfo.records = _feeConfigInfo.records; + vc.component.reportHuaningPayFeeInfo.fees = _feeConfigInfo.data; + vc.emit('reportHuaningPayFee', 'paginationPlus', 'init', { + total: _feeConfigInfo.records, + currentPage: _page + }); + }, function () { + console.log('请求失败处理'); + } + ); + }, + clearReportProficientRoomFeeInfo: function () { + $that.reportHuaningPayFeeInfo = { + fees: [], + roomId: '', + roomName: '', + name: '', + conditions: { + year: new Date().getFullYear(), + month: new Date().getMonth() + 1 + }, + dateStr: vc.dateFormat(new Date().getTime()) + } + }, + _getNextMonth: function () { + let _date = vc.addMonth(new Date(), 1); + let date = new Date(_date); + return date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + } + } + }); +})(window.vc); diff --git a/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.html b/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.html new file mode 100644 index 000000000..b396878d2 --- /dev/null +++ b/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.html @@ -0,0 +1,38 @@ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
楼栋号应收已收促收优惠未收预收
{{fee.floorNum}}{{fee.receivableAmount}}{{fee.receivedAmount}}{{fee.receivedAmount1}}{{fee.receivedAmount2}}{{fee.receivedAmount3}}
+
+
+
+
+ +
+
+ +
+
+
+
\ No newline at end of file diff --git a/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.js b/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.js new file mode 100644 index 000000000..58cd77cc0 --- /dev/null +++ b/public/components/property/reportHuaningPayFeeTwo/reportHuaningPayFeeTwo.js @@ -0,0 +1,78 @@ +/** + 入驻小区 + **/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + reportHuaningPayFeeTwoInfo: { + fees: [], + listColumns: [], + roomId: '', + roomName: '', + conditions: { + year: new Date().getFullYear(), + month: new Date().getMonth() + 1 + }, + dateStr: vc.dateFormat(new Date().getTime()) + } + }, + _initMethod: function () { + }, + _initEvent: function () { + //切换 至费用页面 + vc.on('reportHuaningPayFeeTwo', 'switch', function (_param) { + $that.clearReportHuaningPayFeeTwoInfo(); + $that.reportHuaningPayFeeTwoInfo.conditions = _param; + $that._listReportHuaningPayFeeTwo(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('reportHuaningPayFeeTwo', 'notify', function () { + $that._listReportHuaningPayFeeTwo(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('reportHuaningPayFeeTwo', 'paginationPlus', 'page_event', + function (_currentPage) { + vc.component._listReportHuaningPayFeeTwo(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _listReportHuaningPayFeeTwo: function (_page, _row) { + $that.reportHuaningPayFeeTwoInfo.conditions.page = _page; + $that.reportHuaningPayFeeTwoInfo.conditions.row = _row; + $that.reportHuaningPayFeeTwoInfo.conditions.communityId = vc.getCurrentCommunity().communityId; + let param = { + params: $that.reportHuaningPayFeeTwoInfo.conditions + }; + //发送get请求 + vc.http.apiGet('/reportFeeMonthStatistics/queryHuaningPayFeeTwo', + param, + function (json) { + let _feeConfigInfo = JSON.parse(json); + vc.component.reportHuaningPayFeeTwoInfo.total = _feeConfigInfo.total; + vc.component.reportHuaningPayFeeTwoInfo.records = _feeConfigInfo.records; + vc.component.reportHuaningPayFeeTwoInfo.fees = _feeConfigInfo.data; + vc.emit('reportHuaningPayFeeTwo', 'paginationPlus', 'init', { + total: _feeConfigInfo.records, + currentPage: _page + }); + }, function () { + console.log('请求失败处理'); + } + ); + }, + clearReportHuaningPayFeeTwoInfo: function () { + $that.reportHuaningPayFeeTwoInfo = { + fees: [], + roomId: '', + roomName: '', + name: '', + conditions: { + year: new Date().getFullYear(), + month: new Date().getMonth() + 1 + }, + dateStr: vc.dateFormat(new Date().getTime()) + } + }, + } + }); +})(window.vc); diff --git a/public/pages/property/reportHuaning/reportHuaning.html b/public/pages/property/reportHuaning/reportHuaning.html index 839e0cad3..2b8cd21db 100644 --- a/public/pages/property/reportHuaning/reportHuaning.html +++ b/public/pages/property/reportHuaning/reportHuaning.html @@ -35,9 +35,14 @@
- +
@@ -50,6 +55,19 @@
+
+ +
+ +
+
+
+ +
+
+
@@ -62,17 +80,24 @@ v-on:click="changeTab('reportHuaningOweFee')">未收情况表
  • - 当月收费情况表 + 当月收费情况表 +
    • +
  • + 当月收费情况表2
    • - + +
    + +
    +
    + +
    \ No newline at end of file diff --git a/public/pages/property/reportHuaning/reportHuaning.js b/public/pages/property/reportHuaning/reportHuaning.js index e356554ef..667dbf066 100644 --- a/public/pages/property/reportHuaning/reportHuaning.js +++ b/public/pages/property/reportHuaning/reportHuaning.js @@ -13,12 +13,13 @@ _currentTab: 'reportHuaningOweFee', feeTypeCds: [], feeConfigDtos: [], + floors: [], conditions: { configId: '', feeTypeCd: '', - startTime: '', - endTime: '', - objName: '' + floorNum: '', + year: new Date().getFullYear(), + month: new Date().getMonth() + 1 } } }, @@ -28,6 +29,7 @@ vc.getDict('pay_fee_config', "fee_type_cd", function (_data) { vc.component.reportHuaningInfo.feeTypeCds = _data; }); + $that._listFloorData(); }, _initEvent: function () { vc.on("indexContext", "_queryIndexContextData", function (_param) { @@ -43,7 +45,7 @@ let param = { params: { page: 1, - row: 50, + row: 100, communityId: vc.getCurrentCommunity().communityId, feeTypeCd: $that.reportHuaningInfo.conditions.feeTypeCd, isDefault: '', @@ -95,7 +97,29 @@ + "&feeTypeCd=" + $that.reportHuaningInfo.conditions.feeTypeCd + "&objType=" + _objType + "&pagePath=reportYearCollection"); - } + }, + _listFloorData: function (_page, _rows) { + var param = { + params: { + communityId:vc.getCurrentCommunity().communityId, + row:50, + page:1 + } + }; + + //发送get请求 + vc.http.get('listFloor', + 'list', + param, + function (json, res) { + var listFloorData = JSON.parse(json); + vc.component.reportHuaningInfo.floors = listFloorData.apiFloorDataVoList; + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + + }, } }) })(window.vc); \ No newline at end of file