From 742f9a561cd277a692ec98425f5c7930aa79dd7d Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 22 Jan 2025 16:46:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eloading=E5=92=8C=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkInventoryTask/createTask.vue         |  7 ++++
 .../signfor/distributionSignfortreat.vue      | 38 ++++++++++++-------
 src/views/warehouse/warehouseWaybill.vue      |  5 +++
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index f7bfa5fe..332053d0 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -29,6 +29,7 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button icon="Download" @click="handleExportData" circle></el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -419,6 +420,7 @@ import {
 import DeleteWarningDialog from '@/components/popupnotification/popupnotification.vue';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
+import { exportExcel } from '@/utils/exportData';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
@@ -1344,6 +1346,11 @@ const Inventorysynchronization = row => {
     })
     .catch(() => {});
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '预入库车次 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 7865e187..f2ccf13a 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -1,6 +1,6 @@
 <template>
   <basic-container>
-    <div class="avue-crud">
+    <div class="avue-crud" v-loading="loadingObj.pageLoading">
       <div v-h5uShow="!search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search">
@@ -1772,6 +1772,9 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      loadingObj: {
+        pageLoading: false,
+      },
     };
   },
   mounted() {
@@ -1801,21 +1804,28 @@ export default {
     /**
      * 导出
      * */
-    handleExportInfo() {
-      let row = {};
-      // if (!!this.ids) {
-      //   row.ids = this.ids;
-      // }
-      const ids = this.selectionList.join(',');
-      row.ids = ids;
-      row.signingStatus = '1';
-      // console.log("<><><>>",ids);
-      row = { ...row, ...this.query };
-      delete row.deliveryTypeName;
-      getSignforExport(row).then(res => {
+    async handleExportInfo() {
+      try {
+        this.loadingObj.pageLoading = true;
+
+        let row = {};
+        // if (!!this.ids) {
+        //   row.ids = this.ids;
+        // }
+        const ids = this.selectionList.join(',');
+        row.ids = ids;
+        row.signingStatus = '1';
+        // console.log("<><><>>",ids);
+        row = { ...row, ...this.query };
+        delete row.deliveryTypeName;
+        const res = await getSignforExport(row);
         // console.log(res.data);
         downloadXls(res.data, '待签收数据.xlsx');
-      });
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
     },
     showdrawer(value) {
       this.drawerShow = value;
diff --git a/src/views/warehouse/warehouseWaybill.vue b/src/views/warehouse/warehouseWaybill.vue
index 40126af9..92f06e98 100644
--- a/src/views/warehouse/warehouseWaybill.vue
+++ b/src/views/warehouse/warehouseWaybill.vue
@@ -34,6 +34,7 @@
           <div></div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button icon="Download" @click="handleExportData" circle></el-button>
             <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
@@ -414,6 +415,7 @@ import {
 import option from '@/option/warehouse/warehouseWaybill';
 import { mapGetters } from 'vuex';
 import { downloadXls, getObjType, handleClearTableQuery, isNumber } from '@/utils/util';
+import { exportExcel } from '@/utils/exportData';
 
 export default {
   data() {
@@ -1214,6 +1216,9 @@ export default {
       }
       this.orderlist.splice(index, 1);
     },
+    handleExportData() {
+      exportExcel(this.columnList, this.data, '预入库车次 - ' + new Date().getTime());
+    },
   },
 };
 </script>