From d69fb1dd5b8437dd74cc6f7a3dcafaecc4001c8d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sun, 4 Jun 2023 22:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataReportEarnedDetailStatistics.html     | 10 +++++--
 .../dataReportEarnedDetailStatistics.js       | 25 ++++++++++++++++
 .../dataReportEarnedStatistics.html           | 29 ++++++++-----------
 .../dataReportEarnedStatistics.js             | 22 ++++++++++++++
 4 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html
index 406a05977..48b20da8e 100644
--- a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html
+++ b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.html
@@ -16,8 +16,14 @@
         </div>
 
         <div class="col-lg-4 text-right">
-
-
+            <div class="text-right">
+                <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportReportEarnedDetailExcel()">
+                    <i class="fa fa-plus"></i>
+                    <span>
+                        <vc:i18n name="导出" namespace="dataReportEarnedDetailStatistics"></vc:i18n>
+                    </span>
+                </button>
+            </div>
         </div>
     </div>
     <div class="margin-top">
diff --git a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js
index 6aeaaf484..fcf11141d 100644
--- a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js
+++ b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js
@@ -82,6 +82,31 @@
             _qureyDataReportEarnedDetailStatistics: function() {
                 $that._loadDataReportEarnedDetailStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
             },
+            _exportReportEarnedDetailExcel: function() {
+                let param = {
+                    params: {
+                        communityId: vc.getCurrentCommunity().communityId,
+                        startDate: $that.dataReportEarnedDetailStatisticsInfo.startDate,
+                        endDate: $that.dataReportEarnedDetailStatisticsInfo.endDate,
+                        objName: $that.dataReportEarnedDetailStatisticsInfo.objName,
+                        ownerName: $that.dataReportEarnedDetailStatisticsInfo.ownerName,
+                        link: $that.dataReportEarnedDetailStatisticsInfo.link,
+                        pagePath:'dataReportEarnedDetailStatistics'
+                    }
+                };
+                //发送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('请求失败处理');
+                    });
+            },
         }
     });
 })(window.vc);
\ No newline at end of file
diff --git a/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.html b/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.html
index 24c820bd5..676b86524 100644
--- a/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.html
+++ b/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.html
@@ -1,18 +1,11 @@
 <div class="margin-top">
-    <div class="row margin-top-lg">
-        <!-- <div class="col-lg-2 padding-right-xs padding-left-xl">
-            <input v-model="dataReportEarnedStatisticsInfo.roomNum" type="text" :placeholder="vc.i18n('请填写房屋编号','dataReportEarnedStatistics')" class="form-control">
-        </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="_qureyDataReportEarnedStatistics()">
-                <i class="fa fa-search"></i>查询
-            </button>
-        </div>
-
-        <div class="col-lg-8 text-right">
-
-
-        </div> -->
+    <div class="text-right">
+        <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportReportEarnedExcel()">
+            <i class="fa fa-plus"></i>
+            <span>
+                <vc:i18n name="导出" namespace="dataReportEarnedStatistics"></vc:i18n>
+            </span>
+        </button>
     </div>
     <div class="margin-top">
         <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
@@ -50,8 +43,8 @@
                         {{fee.receivedFee}}
                     </td>
                     <template v-for="(item,index) in dataReportEarnedStatisticsInfo.feeTypeCds">
-                        <td class="text-center" >
-                            {{fee['oweFee'+item.statusCd] || 0}} 
+                        <td class="text-center">
+                            {{fee['receivedFee'+item.statusCd] || 0}}
                         </td>
                     </template>
                 </tr>
@@ -60,7 +53,9 @@
         <!-- 分页 -->
         <div class="row">
             <div class="col-sm-4">
-                <span><vc:i18n name="总实收：" namespace="dataReportEarnedStatistics"></vc:i18n> </span><span>{{dataReportEarnedStatisticsInfo.feeAmount}}</span>
+                <span>
+                    <vc:i18n name="总实收：" namespace="dataReportEarnedStatistics"></vc:i18n>
+                </span><span>{{dataReportEarnedStatisticsInfo.feeAmount}}</span>
             </div>
             <div class="col-sm-8">
                 <vc:create namespace="dataReportEarnedStatistics" path="frame/paginationPlus"></vc:create>
diff --git a/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.js b/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.js
index 85c638077..362ed62ef 100644
--- a/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.js
+++ b/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.js
@@ -76,6 +76,28 @@
             _qureyDataReportEarnedStatistics: function() {
                 $that._loadDataReportEarnedStatisticsData(DEFAULT_PAGE, DEFAULT_ROWS);
             },
+            _exportReportEarnedExcel: function() {
+                let param = {
+                    params: {
+                        communityId: vc.getCurrentCommunity().communityId,
+                        startDate: $that.dataReportEarnedStatisticsInfo.startDate,
+                        endDate: $that.dataReportEarnedStatisticsInfo.endDate,
+                        pagePath:'dataReportEarnedStatistics'
+                    }
+                };
+                //发送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('请求失败处理');
+                    });
+            },
         }
     });
 })(window.vc);
\ No newline at end of file