diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.html b/public/pages/property/reportFeeSummary/reportFeeSummary.html index 43c1f3eca..d8b47e1a2 100755 --- a/public/pages/property/reportFeeSummary/reportFeeSummary.html +++ b/public/pages/property/reportFeeSummary/reportFeeSummary.html @@ -2,7 +2,7 @@
-
+
  • 全部 diff --git a/public/pages/property/reportProficient/reportProficient.html b/public/pages/property/reportProficient/reportProficient.html index f590c3316..2fd57365d 100755 --- a/public/pages/property/reportProficient/reportProficient.html +++ b/public/pages/property/reportProficient/reportProficient.html @@ -1,58 +1,17 @@
    -
    -
    -
    -
    - {{reportProficientInfo.receivableAmount}} -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    +
    + +
    @@ -61,10 +20,10 @@
    @@ -72,10 +31,10 @@
    @@ -84,19 +43,23 @@
    + :placeholder="_getReportProficientRoomName()" + v-model="reportProficientInfo.conditions.objName">
    @@ -109,16 +72,20 @@ diff --git a/public/pages/property/reportProficient/reportProficient.js b/public/pages/property/reportProficient/reportProficient.js index 0e5d6f8ca..7eae2d786 100755 --- a/public/pages/property/reportProficient/reportProficient.js +++ b/public/pages/property/reportProficient/reportProficient.js @@ -23,7 +23,7 @@ } }, _initMethod: function() { - vc.component._queryIndexContextData(); + //vc.component._queryIndexContextData(); vc.component.changeTab($that.reportProficientInfo._currentTab); //关联字典表费用类型 vc.getDict('pay_fee_config', "fee_type_cd", function(_data) { @@ -33,7 +33,7 @@ }, _initEvent: function() { vc.on("indexContext", "_queryIndexContextData", function(_param) { - vc.component._queryIndexContextData(); + // vc.component._queryIndexContextData(); }); }, methods: { @@ -87,62 +87,62 @@ e.currentTarget.blur(); } }, - _queryIndexContextData: function() { - if (vc.getCurrentCommunity() == null || vc.getCurrentCommunity() == undefined) { - return; - } - let param = { - params: { - communityId: vc.getCurrentCommunity().communityId - } - } - //发送get请求 - vc.http.apiGet('/reportFeeMonthStatistics/queryReportProficient', - param, - function(json, res) { - let indexData = JSON.parse(json); - let _receivableInformation = indexData.receivableInformation; - let _receivableAmount = _receivableInformation.receivableAmount; - $that.reportProficientInfo.receivableAmount = _receivableAmount; - let _dom = document.getElementById('receivableAmountCount'); - let _data = [ - { value: _receivableInformation.oweAmount, name: '欠费金额' }, - { value: _receivableInformation.receivedAmount, name: '已收金额' } - ]; - $that._initCharts2(_dom, '应收总额', _data, '#4B7AF0', '#E2EDF6'); - let _floorReceivableInformations = indexData.floorReceivableInformations; - _dom = document.getElementById('roomCount'); - _data = []; - _floorReceivableInformations.forEach(item => { - _data.push({ - value: item.receivableAmount, - name: item.name - }) - }); - $that._initCharts2(_dom, '楼栋费用占比', _data, '#01C36D', '#E2EDF6'); - _data = []; - let _feeConfigReceivableInformations = indexData.feeConfigReceivableInformations; - _feeConfigReceivableInformations.forEach(item => { - _data.push({ - value: item.receivableAmount, - name: item.feeName - }) - }); - _dom = document.getElementById('parkingSpaceCount'); - $that._initCharts2(_dom, '分项费用占比', _data, '#4B7AF0', '#E2EDF6'); - let _remindInfomation = indexData.remindInfomation; - _data = [ - { value: _remindInfomation.deadlineFeeCount, name: '费用到期提醒' }, - { value: _remindInfomation.prePaymentCount, name: '费用提醒' } - ]; - _dom = document.getElementById('shopCount'); - $that._initCharts2(_dom, '费用提醒', _data, '#01C36D', '#E2EDF6'); - }, - function(errInfo, error) { - console.log('请求失败处理'); - } - ); - }, + // _queryIndexContextData: function() { + // if (vc.getCurrentCommunity() == null || vc.getCurrentCommunity() == undefined) { + // return; + // } + // let param = { + // params: { + // communityId: vc.getCurrentCommunity().communityId + // } + // } + // //发送get请求 + // vc.http.apiGet('/reportFeeMonthStatistics/queryReportProficient', + // param, + // function(json, res) { + // let indexData = JSON.parse(json); + // let _receivableInformation = indexData.receivableInformation; + // let _receivableAmount = _receivableInformation.receivableAmount; + // $that.reportProficientInfo.receivableAmount = _receivableAmount; + // let _dom = document.getElementById('receivableAmountCount'); + // let _data = [ + // { value: _receivableInformation.oweAmount, name: '欠费金额' }, + // { value: _receivableInformation.receivedAmount, name: '已收金额' } + // ]; + // $that._initCharts2(_dom, '应收总额', _data, '#4B7AF0', '#E2EDF6'); + // let _floorReceivableInformations = indexData.floorReceivableInformations; + // _dom = document.getElementById('roomCount'); + // _data = []; + // _floorReceivableInformations.forEach(item => { + // _data.push({ + // value: item.receivableAmount, + // name: item.name + // }) + // }); + // $that._initCharts2(_dom, '楼栋费用占比', _data, '#01C36D', '#E2EDF6'); + // _data = []; + // let _feeConfigReceivableInformations = indexData.feeConfigReceivableInformations; + // _feeConfigReceivableInformations.forEach(item => { + // _data.push({ + // value: item.receivableAmount, + // name: item.feeName + // }) + // }); + // _dom = document.getElementById('parkingSpaceCount'); + // $that._initCharts2(_dom, '分项费用占比', _data, '#4B7AF0', '#E2EDF6'); + // let _remindInfomation = indexData.remindInfomation; + // _data = [ + // { value: _remindInfomation.deadlineFeeCount, name: '费用到期提醒' }, + // { value: _remindInfomation.prePaymentCount, name: '费用提醒' } + // ]; + // _dom = document.getElementById('shopCount'); + // $that._initCharts2(_dom, '费用提醒', _data, '#01C36D', '#E2EDF6'); + // }, + // function(errInfo, error) { + // console.log('请求失败处理'); + // } + // ); + // }, //随机生成十六进制颜色 _randomHexColor: function() { var hex = Math.floor(Math.random() * 16777216).toString(16); //生成ffffff以内16进制数