diff --git a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html index 3729749ca..3921de28e 100755 --- a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html +++ b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.html @@ -141,7 +141,29 @@ - +
+ +
小计
+
大计
+ + +
应收: {{reportFeeBreakdownInfo.totalReceivableAmount}}元
+
应收: {{reportFeeBreakdownInfo.allReceivableAmount}}元
+ + +
实收: {{reportFeeBreakdownInfo.totalReceivedAmount}}元
+
实收: {{reportFeeBreakdownInfo.allReceivedAmount}}元
+ + +
欠费: {{reportFeeBreakdownInfo.totalPreferentialAmount}}元
+
欠费: {{reportFeeBreakdownInfo.allOweAmount}}元
+ +
+
+
+ +
+
diff --git a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js index 8e4129335..1b31f224b 100755 --- a/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js +++ b/public/pages/property/reportFeeBreakdown/reportFeeBreakdown.js @@ -15,6 +15,12 @@ roomUnits: [], feeTypeCds: [], feeConfigDtos: [], + totalReceivableAmount:0.0, + allReceivableAmount:0.0, + totalReceivedAmount:0.0, + allReceivedAmount:0.0, + totalPreferentialAmount:0.0, + allOweAmount:0.0, conditions: { floorId: '', floorName: '', @@ -121,6 +127,28 @@ if (_reportFeeBreakdownInfo.data.length > 0) { vc.component.reportFeeBreakdownInfo.feeConfigDtos = _reportFeeBreakdownInfo.data[0].feeConfigDtos; } + + //计算小计 + let _totalReceivableAmount=0.0; + let _totalReceivedAmount=0.0; + let _totalPreferentialAmount=0.0; + + _reportFeeBreakdownInfo.data.forEach(item => { + _totalReceivableAmount += parseFloat(item.receivableAmount); + _totalReceivedAmount += parseFloat(item.receivedAmount); + _totalPreferentialAmount += parseFloat(item.oweAmount); + }); + + $that.reportFeeBreakdownInfo.totalReceivableAmount = _totalReceivableAmount.toFixed(2); + $that.reportFeeBreakdownInfo.totalReceivedAmount = _totalReceivedAmount.toFixed(2); + $that.reportFeeBreakdownInfo.totalPreferentialAmount = _totalPreferentialAmount.toFixed(2); + + if(_reportFeeBreakdownInfo.data.length>0){ + $that.reportFeeBreakdownInfo.allReceivableAmount = _reportFeeBreakdownInfo.data[0].allReceivableAmount; + $that.reportFeeBreakdownInfo.allReceivedAmount = _reportFeeBreakdownInfo.data[0].allReceivedAmount; + $that.reportFeeBreakdownInfo.allOweAmount = _reportFeeBreakdownInfo.data[0].allOweAmount; + } + vc.emit('pagination', 'init', { total: vc.component.reportFeeBreakdownInfo.records, dataCount: vc.component.reportFeeBreakdownInfo.total, diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.html b/public/pages/property/reportFeeSummary/reportFeeSummary.html index e72a58bd7..a12d1d158 100755 --- a/public/pages/property/reportFeeSummary/reportFeeSummary.html +++ b/public/pages/property/reportFeeSummary/reportFeeSummary.html @@ -6,7 +6,7 @@
查询条件
@@ -14,11 +14,11 @@
- +
@@ -27,10 +27,10 @@
@@ -39,7 +39,7 @@
+ v-model="reportFeeSummaryInfo.conditions.roomNum">
@@ -47,7 +47,7 @@ 查询
@@ -56,14 +56,13 @@
+ v-model="reportFeeSummaryInfo.conditions.startTime" class=" form-control startTime">
+ v-model="reportFeeSummaryInfo.conditions.endTime" class=" form-control endTime">
@@ -85,33 +84,56 @@
- - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + +
日期应收金额(单位:元)实收金额(单位:元)欠费金额(单位:元)收费率
日期应收金额(单位:元)实收金额(单位:元)欠费金额(单位:元)收费率
{{fee.feeYear+'年'+fee.feeMonth+'月'}}{{fee.receivableAmount}}{{fee.receivedAmount}}{{fee.oweAmount}}{{fee.chargeRate}}
{{fee.feeYear+'年'+fee.feeMonth+'月'}}{{fee.receivableAmount}}{{fee.receivedAmount}}{{fee.oweAmount}}{{fee.chargeRate}}
-
    -
    +
      +
      - + +
      + +
      小计
      +
      大计
      +       + +
      应收: {{reportFeeSummaryInfo.totalReceivableAmount}}元
      +
      应收: {{reportFeeSummaryInfo.allReceivableAmount}}元
      +       + +
      实收: {{reportFeeSummaryInfo.totalReceivedAmount}}元
      +
      实收: {{reportFeeSummaryInfo.allReceivedAmount}}元
      +       + +
      欠费: {{reportFeeSummaryInfo.totalPreferentialAmount}}元
      +
      欠费: {{reportFeeSummaryInfo.allOweAmount}}元
      +       +
      +
      +
      + +
      +
      diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.js b/public/pages/property/reportFeeSummary/reportFeeSummary.js index d05f22fb0..83d568c57 100755 --- a/public/pages/property/reportFeeSummary/reportFeeSummary.js +++ b/public/pages/property/reportFeeSummary/reportFeeSummary.js @@ -13,6 +13,12 @@ moreCondition: false, title: '', roomUnits: [], + totalReceivableAmount:0.0, + allReceivableAmount:0.0, + totalReceivedAmount:0.0, + allReceivedAmount:0.0, + totalPreferentialAmount:0.0, + allOweAmount:0.0, conditions: { floorId: '', floorName: '', @@ -110,6 +116,27 @@ vc.component.reportFeeSummaryInfo.total = _reportFeeSummaryInfo.total; vc.component.reportFeeSummaryInfo.records = _reportFeeSummaryInfo.records; vc.component.reportFeeSummaryInfo.fees = _reportFeeSummaryInfo.data; + //计算小计 + let _totalReceivableAmount=0.0; + let _totalReceivedAmount=0.0; + let _totalPreferentialAmount=0.0; + + _reportFeeSummaryInfo.data.forEach(item => { + _totalReceivableAmount += parseFloat(item.receivableAmount); + _totalReceivedAmount += parseFloat(item.receivedAmount); + _totalPreferentialAmount += parseFloat(item.oweAmount); + }); + + $that.reportFeeSummaryInfo.totalReceivableAmount = _totalReceivableAmount.toFixed(2); + $that.reportFeeSummaryInfo.totalReceivedAmount = _totalReceivedAmount.toFixed(2); + $that.reportFeeSummaryInfo.totalPreferentialAmount = _totalPreferentialAmount.toFixed(2); + + if(_reportFeeSummaryInfo.data.length>0){ + $that.reportFeeSummaryInfo.allReceivableAmount = _reportFeeSummaryInfo.data[0].allReceivableAmount; + $that.reportFeeSummaryInfo.allReceivedAmount = _reportFeeSummaryInfo.data[0].allReceivedAmount; + $that.reportFeeSummaryInfo.allOweAmount = _reportFeeSummaryInfo.data[0].allOweAmount; + } + vc.emit('pagination', 'init', { total: vc.component.reportFeeSummaryInfo.records, dataCount: vc.component.reportFeeSummaryInfo.total, diff --git a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html index 4c07fc529..aecc632f8 100755 --- a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html +++ b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.html @@ -118,7 +118,29 @@ - +
      + +
      小计
      +
      大计
      +       + +
      应收: {{reportFloorUnitFeeSummaryInfo.totalReceivableAmount}}元
      +
      应收: {{reportFloorUnitFeeSummaryInfo.allReceivableAmount}}元
      +       + +
      实收: {{reportFloorUnitFeeSummaryInfo.totalReceivedAmount}}元
      +
      实收: {{reportFloorUnitFeeSummaryInfo.allReceivedAmount}}元
      +       + +
      欠费: {{reportFloorUnitFeeSummaryInfo.totalPreferentialAmount}}元
      +
      欠费: {{reportFloorUnitFeeSummaryInfo.allOweAmount}}元
      +       +
      +
      +
      + +
      +
      diff --git a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.js b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.js index f6f401638..64ae7204e 100755 --- a/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.js +++ b/public/pages/property/reportFloorUnitFeeSummary/reportFloorUnitFeeSummary.js @@ -13,6 +13,12 @@ moreCondition: false, title: '', roomUnits: [], + totalReceivableAmount:0.0, + allReceivableAmount:0.0, + totalReceivedAmount:0.0, + allReceivedAmount:0.0, + totalPreferentialAmount:0.0, + allOweAmount:0.0, conditions: { floorId: '', floorName: '', @@ -125,6 +131,26 @@ vc.component.reportFloorUnitFeeSummaryInfo.total = _reportFloorUnitFeeSummaryInfo.total; vc.component.reportFloorUnitFeeSummaryInfo.records = _reportFloorUnitFeeSummaryInfo.records; vc.component.reportFloorUnitFeeSummaryInfo.fees = _reportFloorUnitFeeSummaryInfo.data; + //计算小计 + let _totalReceivableAmount=0.0; + let _totalReceivedAmount=0.0; + let _totalPreferentialAmount=0.0; + + _reportFloorUnitFeeSummaryInfo.data.forEach(item => { + _totalReceivableAmount += parseFloat(item.receivableAmount); + _totalReceivedAmount += parseFloat(item.receivedAmount); + _totalPreferentialAmount += parseFloat(item.oweAmount); + }); + + $that.reportFloorUnitFeeSummaryInfo.totalReceivableAmount = _totalReceivableAmount.toFixed(2); + $that.reportFloorUnitFeeSummaryInfo.totalReceivedAmount = _totalReceivedAmount.toFixed(2); + $that.reportFloorUnitFeeSummaryInfo.totalPreferentialAmount = _totalPreferentialAmount.toFixed(2); + + if(_reportFloorUnitFeeSummaryInfo.data.length>0){ + $that.reportFloorUnitFeeSummaryInfo.allReceivableAmount = _reportFloorUnitFeeSummaryInfo.data[0].allReceivableAmount; + $that.reportFloorUnitFeeSummaryInfo.allReceivedAmount = _reportFloorUnitFeeSummaryInfo.data[0].allReceivedAmount; + $that.reportFloorUnitFeeSummaryInfo.allOweAmount = _reportFloorUnitFeeSummaryInfo.data[0].allOweAmount; + } vc.emit('pagination', 'init', { total: vc.component.reportFloorUnitFeeSummaryInfo.records, dataCount: vc.component.reportFloorUnitFeeSummaryInfo.total, diff --git a/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.html b/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.html index edb2c89bb..3527292c1 100755 --- a/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.html +++ b/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.html @@ -115,8 +115,22 @@ - - + +
      + +
      小计
      +
      大计
      +       + +
      欠费: {{reportOweFeeDetailInfo.totalPreferentialAmount}}元
      +
      欠费: {{reportOweFeeDetailInfo.allOweAmount}}元
      +       +
      +
      +
      + +
      +
      diff --git a/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js b/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js index e32e3df04..e0cfcc2fd 100755 --- a/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js +++ b/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js @@ -13,6 +13,8 @@ moreCondition: false, title: '', roomUnits: [], + totalPreferentialAmount:0.0, + allOweAmount:0.0, conditions: { floorId: '', floorName: '', @@ -130,6 +132,18 @@ vc.component.reportOweFeeDetailInfo.total = _reportOweFeeDetailInfo.total; vc.component.reportOweFeeDetailInfo.records = _reportOweFeeDetailInfo.records; vc.component.reportOweFeeDetailInfo.fees = _reportOweFeeDetailInfo.data; + + //计算小计 + let _totalPreferentialAmount=0.0; + + _reportOweFeeDetailInfo.data.forEach(item => { + _totalPreferentialAmount += parseFloat(item.oweAmount); + }); + + $that.reportOweFeeDetailInfo.totalPreferentialAmount = _totalPreferentialAmount.toFixed(2); + if(_reportOweFeeDetailInfo.data.length>0){ + $that.reportOweFeeDetailInfo.allOweAmount = _reportOweFeeDetailInfo.data[0].allOweAmount; + } vc.emit('pagination', 'init', { total: vc.component.reportOweFeeDetailInfo.records, dataCount: vc.component.reportOweFeeDetailInfo.total,