From df761e3b13481a874f3cd802723b49773c0fdf8c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 16 May 2023 18:51:58 +0800
Subject: [PATCH] optimzie report function

---
 .../reportFeeSummary/reportFeeSummary.html    | 10 +++++-----
 .../reportFeeSummary/reportFeeSummary.js      | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.html b/public/pages/property/reportFeeSummary/reportFeeSummary.html
index e77dc4f07..43c1f3eca 100755
--- a/public/pages/property/reportFeeSummary/reportFeeSummary.html
+++ b/public/pages/property/reportFeeSummary/reportFeeSummary.html
@@ -98,9 +98,9 @@
                                         <vc:i18n name="导出" namespace="reportFeeSummary"></vc:i18n>
                                     </span>
                                 </button>
-                                <button type="button" class="btn btn-white btn-sm" v-on:click="_printFeeSummary()">
+                                <!-- <button type="button" class="btn btn-white btn-sm" v-on:click="_printFeeSummary()">
                                     <vc:i18n name="打印" namespace="reportFeeSummary"></vc:i18n>
-                                </button>
+                                </button> -->
                             </div>
                         </div>
                         <div class="ibox-content">
@@ -134,7 +134,7 @@
                                     <tr v-for="fee in reportFeeSummaryInfo.fees">
                                         <td class="text-center">{{fee.roomCount}}</td>
                                         <td class="text-center">{{fee.feeRoomCount}}</td>
-                                        <td class="text-center">{{fee.feeRoomCount}}</td>
+                                        <td class="text-center">{{fee.oweRoomCount}}</td>
                                         <td class="text-center">{{fee.hisOweFee}}</td>
                                         <td class="text-center">{{fee.curOweFee}}</td>
                                         <td class="text-center">{{(fee.curOweFee+fee.hisOweFee).toFixed(2)}}</td>
@@ -160,10 +160,10 @@
                 </div>
             </div>
 
-            <div class="margin-top bg-white">
+            <div class="margin-top bg-white padding-top padding-left">
                 <vc:create path="report/floorFeeSummary"></vc:create>
             </div>
-            <div class="margin-top bg-white">
+            <div class="margin-top bg-white padding-top padding-left">
                 <vc:create path="report/configFeeSummary"></vc:create>
             </div>
         </div>
diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.js b/public/pages/property/reportFeeSummary/reportFeeSummary.js
index a8a22f7d8..30117cb3f 100755
--- a/public/pages/property/reportFeeSummary/reportFeeSummary.js
+++ b/public/pages/property/reportFeeSummary/reportFeeSummary.js
@@ -152,7 +152,24 @@
                     });
             },
             _exportExcel: function() {
-                vc.jumpToPage('/callComponent/exportReportFee/exportData?pagePath=reportFeeSummary&' + vc.objToGetParam($that.reportFeeSummaryInfo.conditions));
+                //vc.jumpToPage('/callComponent/exportReportFee/exportData?pagePath=reportFeeSummary&' + vc.objToGetParam($that.reportFeeSummaryInfo.conditions));
+                $that.reportFeeSummaryInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
+                $that.reportFeeSummaryInfo.conditions.pagePath = 'reportFeeSummary';
+                let param = {
+                    params: $that.reportFeeSummaryInfo.conditions
+                };
+                //发送get请求
+                vc.http.apiGet('/export.exportData', param,
+                    function(json, res) {
+                        let _json = JSON.parse(json);
+                        vc.toast(_json.msg);
+                        if (_json.code == 0) {
+                            vc.jumpToPage('/#/pages/property/downloadTempFile?tab=下载中心')
+                        }
+                    },
+                    function(errInfo, error) {
+                        console.log('请求失败处理');
+                    });
             },
             _toDetail: function(_fee) {
                 let _configIds = "";