From 9c9a4d5acabecf58b881eafb67bd99e7323d7c66 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 2 Jun 2023 17:36:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E8=8F=A9=E6=8F=90=E5=85=8D=E8=B4=A3?=
 =?UTF-8?q?=20reompte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataReportEarnedDetailStatistics.html     | 10 +++-
 .../dataReportFeeStatistics.html              | 54 +++++++++++++++----
 .../dataReportFeeStatistics.js                | 39 +++++++++-----
 3 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html
index 1a713e4ac..406a05977 100644
--- a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html
+++ b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html
@@ -46,8 +46,16 @@
                         {{fee.receivedFee}}
                     </td>
                     <template v-for="(item,index) in dataReportEarnedDetailStatisticsInfo.feeTypeCds">
-                        <td class="text-center" >
+                        <!-- <td class="text-center" >
                             {{fee['oweFee'+item.statusCd] || 0}} 
+                        </td> -->
+                        <td class="text-center" v-if="fee['receivedFee'+item.statusCd]">
+                            <div v-for="(feeItem,fIndex) in fee['receivedFee'+item.statusCd]" >
+                                {{feeItem.feeName}}({{feeItem.startTime}}~{{feeItem.endTime}})={{feeItem.receivedAmount}}
+                            </div>
+                        </td>
+                        <td class="text-center"  v-else>
+                            <div>0</div> 
                         </td>
                     </template>
                 </tr>
diff --git a/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.html b/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.html
index 0d2d90323..be3ed547b 100644
--- a/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.html
+++ b/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.html
@@ -1,5 +1,5 @@
 <div class="margin-top">
-     <div class="row margin-top-lg">
+    <div class="row margin-top-lg">
         <div class="col-lg-2 padding-right-xs padding-left-xl">
             <select class="form-control-md form-control input-s-sm inline" v-model="dataReportFeeStatisticsInfo.feeTypeCd">
                 <option selected value="">{{vc.i18n('请选择费用大类','dataReportFeeStatistics')}}</option>
@@ -9,9 +9,9 @@
                 </option>
             </select>
         </div>
-        
+
         <div class="col-lg-2 padding-right-xs padding-right-xl">
-            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_qureyDataReportEarnedDetailStatistics()">
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px" v-on:click="_qureyDataReportFeeStatistics()">
                 <i class="fa fa-search"></i>查询
             </button>
         </div>
@@ -19,7 +19,7 @@
         <div class="col-lg-4 text-right">
 
 
-        </div> 
+        </div>
     </div>
     <div class="margin-top">
         <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
@@ -62,10 +62,10 @@
                         <vc:i18n name="已收户占比" namespace="dataReportFeeStatistics"></vc:i18n>
                     </th>
                     <th data-hide="phone" class="text-center">
-                        <vc:i18n name="已收金额" namespace="dataReportFeeStatistics"></vc:i18n>
+                        <vc:i18n name="当月已收金额" namespace="dataReportFeeStatistics"></vc:i18n>
                     </th>
                     <th data-hide="phone" class="text-center">
-                        <vc:i18n name="剩余未收" namespace="dataReportFeeStatistics"></vc:i18n>
+                        <vc:i18n name="当月剩余未收" namespace="dataReportFeeStatistics"></vc:i18n>
                     </th>
                     <th data-hide="phone" class="text-center">
                         <vc:i18n name="收费率" namespace="dataReportFeeStatistics"></vc:i18n>
@@ -75,15 +75,51 @@
             <tbody>
                 <tr v-for="fee in dataReportFeeStatisticsInfo.fees">
                     <td class="text-center">
-                        {{fee.roomName}}
+                        {{fee.floorNum}}
                     </td>
                     <td class="text-center">
-                        {{fee.ownerName}}
+                        {{fee.roomCount}}
+                    </td>
+                    <td class="text-center">
+                        {{fee.freeCount}}
+                    </td>
+                    <td class="text-center">
+                        {{fee.hisMonthOweFee}}
                     </td>
                     <td class="text-center">
                         {{fee.oweFee}}
                     </td>
-                    
+                    <td class="text-center">
+                        {{fee.todayReceivedRoomCount}}
+                    </td>
+                    <td class="text-center">
+                        {{fee.todayReceivedRoomAmount}}
+                    </td>
+                    <td class="text-center">
+                        {{fee.hisOweReceivedRoomCount}}
+                    </td>
+                    <td class="text-center">
+                        {{fee.hisOweReceivedRoomAmount}}
+                    </td>
+                    <td class="text-center">
+                        {{fee.monthReceivedRoomCount}}
+                    </td>
+                    <td class="text-center">
+                        {{(fee.roomCount-fee.freeCount-fee.monthReceivedRoomCount).toFixed(0)}}
+                    </td>
+                    <td class="text-center">
+                        {{(fee.monthReceivedRoomCount/(fee.roomCount-fee.freeCount)*100).toFixed(2)}}%
+                    </td>
+
+                    <td class="text-center">
+                        {{fee.monthReceivedRoomAmount}}
+                    </td>
+                    <td class="text-center">
+                        {{fee.curMonthOweFee}}
+                    </td>
+                    <td class="text-center">
+                        {{(fee.monthReceivedRoomAmount/(fee.monthReceivedRoomAmount+fee.curMonthOweFee)*100).toFixed(2)}}%
+                    </td>
                 </tr>
             </tbody>
         </table>
diff --git a/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js b/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js
index 81d238cbf..bfec3f875 100644
--- a/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js
+++ b/public/components/report/dataReportFeeStatistics/dataReportFeeStatistics.js
@@ -9,7 +9,7 @@
             dataReportFeeStatisticsInfo: {
                 fees: [],
                 feeTypeCds: [],
-                floors:[],
+                floors: [],
                 ownerId: '',
                 roomNum: '',
                 startDate: '',
@@ -27,7 +27,8 @@
             vc.on('dataReportFeeStatistics', 'switch', function(_data) {
                 $that.dataReportFeeStatisticsInfo.startDate = _data.startDate;
                 $that.dataReportFeeStatisticsInfo.endDate = _data.endDate;
-                $that._loadDataReportFeeStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
+                // $that._loadDataReportFeeStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
+                $that._loadFloors();
             });
             vc.on('dataReportFeeStatistics', 'paginationPlus', 'page_event',
                 function(_currentPage) {
@@ -38,15 +39,14 @@
             })
         },
         methods: {
-            _loadDataReportFeeStatisticsData: function(_page, _row,_floorIds) {
+            _loadDataReportFeeStatisticsData: function(_floorIds) {
                 let param = {
                     params: {
                         communityId: vc.getCurrentCommunity().communityId,
                         startDate: $that.dataReportFeeStatisticsInfo.startDate,
                         endDate: $that.dataReportFeeStatisticsInfo.endDate,
+                        feeTypeCd: $that.dataReportFeeStatisticsInfo.feeTypeCd,
                         floorIds: _floorIds,
-                        page: _page,
-                        row: _row
                     }
                 };
 
@@ -55,8 +55,11 @@
                     param,
                     function(json) {
                         let _json = JSON.parse(json);
-                        $that.dataReportFeeStatisticsInfo.fees = _json.data;
-                      
+                        _json.data.forEach(item => {
+                            $that.dataReportFeeStatisticsInfo.fees.push(item);
+                        });
+
+
                         // let _feeAmount = 0.0;
                         // if (_json.data && _json.data.length > 0) {
                         //     _json.data.forEach(item => {
@@ -71,15 +74,15 @@
                     }
                 );
             },
-            _loadFloors:function(){
+            _loadFloors: function() {
                 let param = {
                     params: {
-                        page:1,
-                        row:100,
-                        communityId:vc.getCurrentCommunity().communityId
+                        page: 1,
+                        row: 100,
+                        communityId: vc.getCurrentCommunity().communityId
                     }
                 };
-
+                $that.dataReportFeeStatisticsInfo.fees = [];
                 //发送get请求
                 vc.http.apiGet('/floor.queryFloors',
                     param,
@@ -88,8 +91,16 @@
 
                         let _floors = listFloorData.apiFloorDataVoList;
                         let _floorIds = [];
-                        for(let _floorIndex = 0; _floorIndex < _floors.length;_floorIndex ++){
+                        for (let _floorIndex = 0; _floorIndex < _floors.length; _floorIndex++) {
                             _floorIds.push(_floors[_floorIndex].floorId);
+                            if (_floorIds.length >= 5) {
+                                $that._loadDataReportFeeStatisticsData(_floorIds.join(','));
+                                _floorIds = [];
+                            }
+                        }
+
+                        if (_floorIds.length > 0) {
+                            $that._loadDataReportFeeStatisticsData(_floorIds.join(','));
                         }
 
                     },
@@ -100,7 +111,7 @@
             },
             //查询
             _qureyDataReportFeeStatistics: function() {
-                $that._loadDataReportFeeStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
+                $that._loadFloors();
             },
         }
     });