From e7ade0eb3482376680bf9fe9c91cb9f5b5e93fe0 Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Tue, 27 Aug 2024 14:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A1=A5=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rescue/Locations.vue         |  2 +-
 src/views/rescue/api/rescueCarSpend.js |  9 +++++++++
 src/views/rescue/index.vue             | 11 +++++++++--
 src/views/rescue/rescueCarSpend.vue    | 19 +++++++++++++------
 src/views/rescue/rescueCw.vue          | 18 +++++++++++++++---
 5 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/src/views/rescue/Locations.vue b/src/views/rescue/Locations.vue
index 8c2e75c..b19437b 100644
--- a/src/views/rescue/Locations.vue
+++ b/src/views/rescue/Locations.vue
@@ -34,7 +34,7 @@
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="排序" align="center" prop="sort" />
+<!--      <el-table-column label="排序" align="center" prop="sort" />-->
 
       <el-table-column label="扣车地址" align="center" prop="dictLabel">
         <template slot-scope="scope">
diff --git a/src/views/rescue/api/rescueCarSpend.js b/src/views/rescue/api/rescueCarSpend.js
index 586e534..0f4283c 100644
--- a/src/views/rescue/api/rescueCarSpend.js
+++ b/src/views/rescue/api/rescueCarSpend.js
@@ -53,3 +53,12 @@ export function listCar() {
     }
   })
 }
+
+export function exportCarSpend(params) {
+  return request({
+    url: 'rescue/rescueCarSpend/export',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
diff --git a/src/views/rescue/index.vue b/src/views/rescue/index.vue
index 56249cc..bc5e7ca 100644
--- a/src/views/rescue/index.vue
+++ b/src/views/rescue/index.vue
@@ -94,7 +94,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+        <el-button type="primary" icon="el-icon-download" :loading="exportLoading" size="mini" @click="handleExport">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -392,6 +392,8 @@ export default {
   dicts: ['dljy_type', 'fee_type', 'rescue_car_type', 'yes_no','jy_status','jy_order_status'],
   data() {
     return {
+      // 导出遮罩层
+      exportLoading: false,
       chooseDriverId:'',
       rescueInfoId:'',
       // 遮罩层
@@ -686,10 +688,15 @@ export default {
     /** 导出按钮操作 */
     async handleExport() {
      try {
+       this.exportLoading = true
+       this.queryParams.pageNo = 1
+       this.queryParams.pageSize = 500
        const data = await downloadOrder(this.queryParams)
        this.$download.excel(data, `救援订单_${new Date().getTime()}.xls`)
      }catch {}
-     finally {}
+     finally {
+       this.exportLoading = false
+     }
     }
   }
 };
diff --git a/src/views/rescue/rescueCarSpend.vue b/src/views/rescue/rescueCarSpend.vue
index 44617a7..8e81314 100644
--- a/src/views/rescue/rescueCarSpend.vue
+++ b/src/views/rescue/rescueCarSpend.vue
@@ -83,7 +83,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-
+          :loading="exportLoading"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -215,7 +215,7 @@
 </template>
 
 <script>
-import { listRescueCarSpend, getRescueCarSpend, delRescueCarSpend, addRescueCarSpend, updateRescueCarSpend,listCar } from "./api/rescueCarSpend";
+import { listRescueCarSpend, getRescueCarSpend, delRescueCarSpend, addRescueCarSpend, updateRescueCarSpend,listCar,exportCarSpend } from "./api/rescueCarSpend";
 
 export default {
   name: "RescueCarSpend",
@@ -258,6 +258,8 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 导出遮罩层
+      exportLoading: false,
       // 总条数
       total: 0,
       time1:[],
@@ -419,10 +421,15 @@ export default {
       }).catch(() => {});
     },
     /** 导出按钮操作 */
-    handleExport() {
-      this.download('rescue/rescueCarSpend/export', {
-        ...this.queryParams
-      }, `rescueCarSpend_${new Date().getTime()}.xlsx`)
+    async handleExport() {
+      try {
+        this.exportLoading = true
+        const data = await exportCarSpend(this.queryParams)
+        this.$download.excel(data, `rescueCarSpend_${new Date().getTime()}.xlsx`)
+      }catch{}
+      finally {
+        this.exportLoading = false
+      }
     }
   }
 };
diff --git a/src/views/rescue/rescueCw.vue b/src/views/rescue/rescueCw.vue
index 40d2ca6..e8c3086 100644
--- a/src/views/rescue/rescueCw.vue
+++ b/src/views/rescue/rescueCw.vue
@@ -72,6 +72,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
+          :loading="exportLoading"
         >导出
         </el-button>
       </el-col>
@@ -137,7 +138,7 @@
 </template>
 
 <script>
-import { moneyManagement, moneyManagementData,exportManagement } from '@/api/rescue/info'
+import { moneyManagement, moneyManagementData, exportManagement } from '@/api/rescue/info'
 import { getmap } from '@/api/Map/map'
 import Map from '../../components/Map/index'
 
@@ -146,6 +147,8 @@ export default {
   dicts: ['dljy_type', 'fee_type', 'car_type', 'yes_no', 'jy_status', 'jy_order_status'],
   data() {
     return {
+      // 导出遮罩层
+      exportLoading: false,
       pickerOptions: null,
       chooseDriverId: '',
       rescueInfoId: '',
@@ -428,8 +431,17 @@ export default {
     },
     /** 导出按钮操作 */
     async handleExport() {
-      const data = await exportManagement(this.queryParams)
-      this.$download.excel(data, `救援财务报表_${new Date().getTime()}.xlsx`)
+      try {
+        this.exportLoading = true
+        this.queryParams.pageNo = 1
+        this.queryParams.pageSize = 500
+        this.$modal.msgError("系统故障，联系管理员")
+        // const data = await exportManagement(this.queryParams)
+        // this.$download.excel(data, `救援财务报表_${new Date().getTime()}.xlsx`)
+      } catch {
+      } finally {
+        this.exportLoading = false
+      }
     }
   }
 }