From c267cba2a202b1d901111f09de80a7064bd2279d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 28 Apr 2025 03:35:23 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: java110 <928255095@qq.com>
---
 .../reportOweFeeDetail/reportOweFeeDetail.js  | 27 ++++++++++++++-----
 .../property/reportRepair/reportRepair.js     | 18 ++++++++++++-
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js b/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js
index 16e60b6c5..447e99353 100644
--- a/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js
+++ b/public/pages/property/reportOweFeeDetail/reportOweFeeDetail.js
@@ -14,7 +14,7 @@
                 moreCondition: false,
                 title: '',
                 feeTypeCds: [],
-                communitys:[],
+                communitys: [],
                 totalPreferentialAmount: 0.0,
                 allOweAmount: 0.0,
                 conditions: {
@@ -26,15 +26,15 @@
                     startTime: '',
                     endTime: '',
                     communityId: '',
-                    ownerNameLike:'',
+                    ownerNameLike: '',
                 }
             }
         },
         _initMethod: function () {
-            vc.initDate('startTime',function(_value){
+            vc.initDate('startTime', function (_value) {
                 $that.reportOweFeeDetailInfo.conditions.startTime = _value;
             });
-            vc.initDate('endTime',function(_value){
+            vc.initDate('endTime', function (_value) {
                 $that.reportOweFeeDetailInfo.conditions.endTime = _value;
             });
             vc.getDict('pay_fee_config', "fee_type_cd", function (_data) {
@@ -147,7 +147,22 @@
                 }
             },
             _exportExcel: function () {
-                vc.jumpToPage('/callComponent/exportReportFee/exportData?pagePath=reportOweFeeDetail&' + vc.objToGetParam($that.reportOweFeeDetailInfo.conditions));
+                $that.reportOweFeeDetailInfo.conditions.pagePath = 'reportOweFeeDetail';
+                let _param = {
+                    params: $that.reportOweFeeDetailInfo.conditions
+                }
+                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('请求失败处理');
+                    });
             },
             _loadStaffCommunitys: function () {
                 let param = {
@@ -169,7 +184,7 @@
                     }
                 );
             },
-            _changCommunity:function(){
+            _changCommunity: function () {
                 $that.reportOweFeeDetailInfo.conditions.floorId = "";
                 $that._listFloors();
                 $that._listFees(DEFAULT_PAGE, DEFAULT_ROWS);
diff --git a/public/pages/property/reportRepair/reportRepair.js b/public/pages/property/reportRepair/reportRepair.js
index 8ec126fd9..4ef9e27ef 100644
--- a/public/pages/property/reportRepair/reportRepair.js
+++ b/public/pages/property/reportRepair/reportRepair.js
@@ -226,7 +226,23 @@
                 }
             },
             _exportFee: function () {
-                vc.jumpToPage('/callComponent/exportReportFee/exportData?pagePath=reportRepairDetail&' + vc.objToGetParam($that.reportRepairInfo.conditions));
+               // vc.jumpToPage('/callComponent/exportReportFee/exportData?pagePath=reportRepairDetail&' + vc.objToGetParam($that.reportRepairInfo.conditions));
+                $that.reportRepairInfo.conditions.pagePath = 'reportRepairDetail';
+                let _param = {
+                    params: $that.reportRepairInfo.conditions
+                }
+                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('请求失败处理');
+                });
             },
             _loadStaffCommunitys: function () {
                 let param = {