diff --git a/src/utils/exportData.js b/src/utils/exportData.js
index f9f1fd30..2ef66adb 100644
--- a/src/utils/exportData.js
+++ b/src/utils/exportData.js
@@ -21,7 +21,7 @@ export function exportExcel(columnList = [], listData = [], name = 'excel') {
       if (blackArr.includes(val.label) || val.head) continue;
 
       if (j === 0) headers.push(val.label);
-      arr.push(item[val.prop] || '');
+      arr.push(item[val.prop] || item[val.prop] === 0 ? item[val.prop] : '');
     }
     console.log('arr :>> ', arr);
     data.push(arr);
diff --git a/src/views/basic/coderule/basicTenantCode.vue b/src/views/basic/coderule/basicTenantCode.vue
index 64fd444b..f6b5ff61 100644
--- a/src/views/basic/coderule/basicTenantCode.vue
+++ b/src/views/basic/coderule/basicTenantCode.vue
@@ -48,6 +48,7 @@
         </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="Search" @click="searchHide" circle></el-button>
@@ -192,6 +193,7 @@ import { columnList } from '@/option/finance/MerchantDepositSlip';
 import { useRouter } from 'vue-router';
 import { deepClone } from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -584,6 +586,11 @@ const handleBatchDelete = async () => {
       ElMessage.info('已取消删除');
     });
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '系统编码规则 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/basic/forklift/basicForklift.vue b/src/views/basic/forklift/basicForklift.vue
index 71178b28..a4e77591 100644
--- a/src/views/basic/forklift/basicForklift.vue
+++ b/src/views/basic/forklift/basicForklift.vue
@@ -57,6 +57,7 @@
           </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>
@@ -531,6 +532,7 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import { getToken } from '@/utils/auth';
 import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
 import { setNodeHeight, debounce, handleClearTableQuery } from '@/utils/util';
+import { exportExcel } from '@/utils/exportData';
 
 export default {
   data() {
@@ -1200,6 +1202,10 @@ export default {
         this.form.photo = url.toString();
       }
     },
+    /** 导出表格数据 */
+    handleExportData() {
+      exportExcel(this.columnList, this.data, '叉车 - ' + new Date().getTime());
+    },
   },
 };
 </script>
diff --git a/src/views/basic/material/basicMaterial.vue b/src/views/basic/material/basicMaterial.vue
index 43220bb8..f2ac30c8 100644
--- a/src/views/basic/material/basicMaterial.vue
+++ b/src/views/basic/material/basicMaterial.vue
@@ -76,6 +76,7 @@
         </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="Search" @click="searchHide" circle></el-button>
@@ -242,7 +243,13 @@
           </el-button>
 
           <!-- 提交 -->
-          <el-button type="primary" icon="Position" @click="handleSubmit" :disabled="details.loadingObj.pageLoading">提 交</el-button>
+          <el-button
+            type="primary"
+            icon="Position"
+            @click="handleSubmit"
+            :disabled="details.loadingObj.pageLoading"
+            >提 交</el-button
+          >
         </div>
       </el-dialog>
     </div>
@@ -354,6 +361,7 @@ import { dateNow } from '@/utils/date';
 import { isNumber } from '@antfu/utils';
 import VueQr from 'vue-qr/src/packages/vue-qr.vue';
 import MyPrint from '@/components/MyPrint/MyPrint.vue';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -801,6 +809,11 @@ const rowDelTripartite = ({ row }) => {
     },
   });
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '物料 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/basicdata/TripartiteMaterial/list.vue b/src/views/basicdata/TripartiteMaterial/list.vue
index d318ac1b..cdc84a32 100644
--- a/src/views/basicdata/TripartiteMaterial/list.vue
+++ b/src/views/basicdata/TripartiteMaterial/list.vue
@@ -37,6 +37,7 @@
         </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>
@@ -258,6 +259,7 @@ import {
 import { useStore } from 'vuex';
 import { useRouter, useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -635,6 +637,11 @@ const handleDownloadTemplate = async () => {
     myUpload.value.details.loadingObj.UploadLoadong = false;
   }
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '三方物料 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/basicdata/carrier/basicdataCarrier.vue b/src/views/basicdata/carrier/basicdataCarrier.vue
index 53708c70..3bd76fac 100644
--- a/src/views/basicdata/carrier/basicdataCarrier.vue
+++ b/src/views/basicdata/carrier/basicdataCarrier.vue
@@ -65,6 +65,7 @@
 
         <!-- 头部右侧按钮模块 -->
         <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="Search" @click="searchHide" circle></el-button>
@@ -347,6 +348,7 @@ import {
   remove,
   postCarrierSubmit,
 } from '@/api/basicdata/basicdataCarrier';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -822,6 +824,11 @@ const handleSubmit = async () => {
     details.loadingObj.pageLoading = false;
   }
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '承运商 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
index cfab5eab..07a94880 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
@@ -49,6 +49,7 @@
         </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
+          <el-button icon="Download" @click="handleExportData" circle></el-button>
           <el-button icon="el-icon-refresh" @click="onLoad()" circle></el-button>
           <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
           <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
@@ -160,6 +161,7 @@ import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import { getDetail as getDetailDelineNode } from '@/api/basic/basicDelineNode';
 import { ElMessageBox } from 'element-plus';
+import { exportExcel } from '@/utils/exportData';
 export default {
   data() {
     return {
@@ -662,6 +664,9 @@ export default {
       handleClearTableQuery(this.columnList);
       this.onLoad();
     },
+    handleExportData() {
+      exportExcel(this.columnList, this.data, '司机信息 - ' + new Date().getTime());
+    },
   },
 };
 </script>
diff --git a/src/views/basicdata/platform/PaymentPlatform.vue b/src/views/basicdata/platform/PaymentPlatform.vue
index 2d1a37d1..3f2e411a 100644
--- a/src/views/basicdata/platform/PaymentPlatform.vue
+++ b/src/views/basicdata/platform/PaymentPlatform.vue
@@ -23,6 +23,7 @@
         </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="Search" @click="searchHide" circle></el-button>
@@ -145,6 +146,7 @@ import {
 import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { columnList } from '@/option/basicdata/PaymentPlatform';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -452,6 +454,11 @@ const handleRemove = row => {
     }
   });
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '支付平台 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/basicdata/team/basicdataTeamGroup.vue b/src/views/basicdata/team/basicdataTeamGroup.vue
index 0b5cc8af..b7447c0e 100644
--- a/src/views/basicdata/team/basicdataTeamGroup.vue
+++ b/src/views/basicdata/team/basicdataTeamGroup.vue
@@ -25,6 +25,7 @@
           </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="el-icon-search" @click="searchHide" circle></el-button>
           </div>
@@ -170,6 +171,7 @@ import { getDept, getLazyList } from '@/api/system/dept';
 import { getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse';
 import { getUserDetail } from '@/api/system/user';
 import { handleClearTableQuery, setNodeHeight } from '@/utils/util';
+import { exportExcel } from '@/utils/exportData';
 
 export default {
   data() {
@@ -587,6 +589,9 @@ export default {
         this.selectionClear();
       });
     },
+    handleExportData() {
+      exportExcel(details.columnList, details.data, '基础班组 - ' + new Date().getTime());
+    },
   },
 };
 </script>
diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue
index 28415902..0da37db9 100644
--- a/src/views/basicdata/vehicle/basicdataVehicle.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicle.vue
@@ -76,6 +76,7 @@
         </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="Search" @click="searchHide" circle></el-button>
@@ -177,7 +178,7 @@ import { useStore } from 'vuex';
 import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { exportBlob } from '@/api/common';
-import { getToken } from '@/utils/auth';   
+import { getToken } from '@/utils/auth';
 import { dateNow } from '@/utils/date';
 import {
   getList,
@@ -192,12 +193,13 @@ import {
   getVehicleExport,
 } from '@/api/basicdata/basicdataVehicle';
 import { getOwn } from '@/api/basicdata/basicdataDriverArtery';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
 
 const $store = useStore();
-const tabName=ref(0)
+const tabName = ref(0);
 const details = reactive<any>({
   /** 是否开启搜索 */
   search: true,
@@ -294,11 +296,11 @@ const onLoad = debounce(async () => {
     let _page = details.page;
     // 获取暂存单列表
     let submit = {
-       ..._page,
-        ...details.query,
-        pageType:tabName.value,
-      }
-    
+      ..._page,
+      ...details.query,
+      pageType: tabName.value,
+    };
+
     const res = await getPage(submit);
     console.log('res :>> ', res);
     const { code, data } = res.data;
@@ -396,12 +398,12 @@ initData();
 const searchChange = () => {
   onLoad();
 };
-const tabchange=()=>{
+const tabchange = () => {
   details.query = {};
   details.page.current = 1;
   handleClearTableQuery(details.columnList);
   onLoad();
-}
+};
 /** 清空表单 */
 const searchReset = () => {
   details.query = {};
@@ -572,6 +574,11 @@ const handleExport = () => {
     }
   });
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '车辆 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/basicdata/vehicle/basicdataVehicleInfo.vue b/src/views/basicdata/vehicle/basicdataVehicleInfo.vue
index 1d2db13e..8a064ab5 100644
--- a/src/views/basicdata/vehicle/basicdataVehicleInfo.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicleInfo.vue
@@ -22,6 +22,7 @@
 
         <!-- 头部右侧按钮模块 -->
         <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="Search" @click="searchHide" circle></el-button>
@@ -127,6 +128,7 @@ import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { getToken } from '@/utils/auth';
 import { getList, postSave } from '@/api/basicdata/basicdataVehicleInfo';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -438,6 +440,11 @@ const handleSubmit = async () => {
     details.loadingObj.pageLoading = false;
   }
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '车型 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index 0fd3dd95..2f2e07a4 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -72,6 +72,7 @@
 
         <!-- 头部右侧按钮模块 -->
         <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="Search" @click="searchHide" circle></el-button>
@@ -194,6 +195,7 @@ import {
   $_updateDefault,
   downAllocation,
 } from '@/api/basicdata/basicdataGoodsAllocation';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -570,36 +572,40 @@ const handleView = ({ row }) => {
   });
 };
 const handleMakeCargo = async row => {
-  return
-  row.isDefault = !row.isDefault ? 1 : 0;
-  ElMessageBox.confirm(`是否确认${row.isDefault ? '关闭' : '开启'}{操作?`, '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  })
-    .then(async () => {
-      try {
-        details.loadingObj.list = true;
-        let data = {
-          id: row.id,
-          isDefault: !row.isDefault ? 1 : 0,
-        };
-        await $_updateDefault(data).then(res => {
-          if (res.data.code == 200) {
-            ElMessage.success(res.data.msg);
-          }
-        });
-      } catch (e) {
-        console.log(e);
-      } finally {
-        details.loadingObj.list = false;
-        onLoad();
-      }
-    })
-    .catch(() => {
-      console.log(row,'row');
-      
-    });
+  // return
+  // row.isDefault = !row.isDefault ? 1 : 0;
+  // ElMessageBox.confirm(`是否确认${row.isDefault ? '关闭' : '开启'}{操作?`, '提示', {
+  //   confirmButtonText: '确定',
+  //   cancelButtonText: '取消',
+  //   type: 'warning',
+  // })
+  //   .then(async () => {
+  //     try {
+  //       details.loadingObj.list = true;
+  //       let data = {
+  //         id: row.id,
+  //         isDefault: !row.isDefault ? 1 : 0,
+  //       };
+  //       await $_updateDefault(data).then(res => {
+  //         if (res.data.code == 200) {
+  //           ElMessage.success(res.data.msg);
+  //         }
+  //       });
+  //     } catch (e) {
+  //       console.log(e);
+  //     } finally {
+  //       details.loadingObj.list = false;
+  //       onLoad();
+  //     }
+  //   })
+  //   .catch(() => {
+  //     console.log(row,'row');
+  //   });
+};
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '货位 - ' + new Date().getTime());
 };
 </script>
 
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index 8a3a58d6..3f802dc8 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -74,6 +74,7 @@
           </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="el-icon-search" @click="searchHide" circle></el-button>
           </div>
@@ -286,6 +287,7 @@ import {
 } from '@/utils/util';
 import { dateNow } from '@/utils/date';
 import { Value } from 'sass';
+import { exportExcel } from '@/utils/exportData';
 
 export default {
   data() {
@@ -893,6 +895,9 @@ export default {
         this.selectionClear();
       });
     },
+    handleExportData() {
+      exportExcel(this.columnList, this.data, '货区 - ' + new Date().getTime());
+    },
   },
 };
 </script>
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index aadc6794..7e87318c 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -49,6 +49,7 @@
           </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="el-icon-search" @click="searchHide" circle></el-button>
           </div>
@@ -438,6 +439,7 @@ import { exportBlob } from '@/api/common';
 import { getToken } from '@/utils/auth';
 import { downloadXls, handleClearTableQuery, setNodeHeight, handleSelectQuery } from '@/utils/util';
 import print from '@/utils/print';
+import { exportExcel } from '@/utils/exportData';
 export default {
   data() {
     return {
@@ -1499,6 +1501,10 @@ export default {
 
       this.onLoad(this.page);
     },
+
+    handleExportData() {
+      exportExcel(this.columnList, this.data, '货架信息 - ' + new Date().getTime());
+    },
   },
 };
 </script>
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index ea3fae95..21abda17 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -109,6 +109,7 @@
 
         <!-- 头部右侧按钮模块 -->
         <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="Search" @click="searchHide" circle></el-button>
@@ -309,6 +310,7 @@ import {
   getWarehouseListqx,
 } from '@/api/basicdata/basicdataTray';
 import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -825,6 +827,11 @@ const handleHistory = ({ row }) => {
     },
   });
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '托盘信息 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index fde6b760..5d64d6fe 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -1,35 +1,33 @@
 <template>
   <basic-container v-loading="loadingObj.list" element-loading-text="正在加载中...">
     <div v-h5uShow="details.search">
-        <!-- 查询模块 -->
-        <el-form :inline="true" :model="Topquery" class="header_search">
-          <el-form-item label="仓库:">
-            <el-select
-              v-model="details.query.warehouseId"
-              multiple
-              collapse-tags
-              class="w100"
-              clearable
-              placeholder="请选择仓库"
-              filterable
-            >
-              <el-option
-                v-for="value in warehouseList"
-                :key="value.value"
-                :label="value.label"
-                :value="value.label"
-              />
-            </el-select>
-          </el-form-item>
-          <!-- 查询按钮 -->
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-
-
+      <!-- 查询模块 -->
+      <el-form :inline="true" :model="Topquery" class="header_search">
+        <el-form-item label="仓库:">
+          <el-select
+            v-model="details.query.warehouseId"
+            multiple
+            collapse-tags
+            class="w100"
+            clearable
+            placeholder="请选择仓库"
+            filterable
+          >
+            <el-option
+              v-for="value in warehouseList"
+              :key="value.value"
+              :label="value.label"
+              :value="value.label"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 查询按钮 -->
+        <el-form-item class="el-btn">
+          <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+          <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
 
     <!-- 头部右侧按钮模块 -->
     <div>
@@ -41,12 +39,23 @@
       <div>
         <div class="el_top_btn">
           <div>
-            <el-button type="primary" v-if="accessControl.warehouseWarehouse_add" @click="newlyadd" icon="el-icon-plus">新 增</el-button>
-            <el-button type="primary" v-if="accessControl.warehouseWarehouse_delete" icon="el-icon-delete" @click="DeleteInformationAll"
+            <el-button
+              type="primary"
+              v-if="accessControl.warehouseWarehouse_add"
+              @click="newlyadd"
+              icon="el-icon-plus"
+              >新 增</el-button
+            >
+            <el-button
+              type="primary"
+              v-if="accessControl.warehouseWarehouse_delete"
+              icon="el-icon-delete"
+              @click="DeleteInformationAll"
               >批量删除</el-button
             >
           </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>
@@ -70,13 +79,25 @@
               <template v-if="slotProps.scope.column.label === '操作'">
                 <div class="ElBtnClass">
                   <el-text
-                    v-if="accessControl.Expand_configuration" 
+                    v-if="accessControl.Expand_configuration"
                     @click="Expandconfiguration(slotProps.scope.row)"
                     >扩展配置</el-text
                   >
-                  <el-text v-if="accessControl.warehouseWarehouse_view"click="view(slotProps.scope)">查看</el-text>
-                  <el-text v-if="accessControl.warehouseWarehouse_edit" @click="edit(slotProps.scope)">编辑</el-text>
-                  <el-text v-if="accessControl.warehouseWarehouse_delete" @click="DeleteInformation(slotProps.scope)">删除</el-text>
+                  <el-text
+                    v-if="accessControl.warehouseWarehouse_view"
+                    click="view(slotProps.scope)"
+                    >查看</el-text
+                  >
+                  <el-text
+                    v-if="accessControl.warehouseWarehouse_edit"
+                    @click="edit(slotProps.scope)"
+                    >编辑</el-text
+                  >
+                  <el-text
+                    v-if="accessControl.warehouseWarehouse_delete"
+                    @click="DeleteInformation(slotProps.scope)"
+                    >删除</el-text
+                  >
                 </div>
               </template>
             </template>
@@ -511,7 +532,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="默认库位" v-if="Expandconfigurationform.isAutoWarehouse">
-          <el-input v-model="Expandconfigurationform.defaultAllocation" style="width: 240px" placeholder="请输入默认库位" />
+          <el-input
+            v-model="Expandconfigurationform.defaultAllocation"
+            style="width: 240px"
+            placeholder="请输入默认库位"
+          />
         </el-form-item>
         <el-form-item label="是否干线上传装车图片">
           <el-select
@@ -611,9 +636,10 @@ import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
 import { useStore } from 'vuex';
+import { exportExcel } from '@/utils/exportData';
 const $useStore = useStore();
 const accessControl = $useStore.getters.permission;
-console.log(accessControl.Expand_configuration,'accessControl');
+console.log(accessControl.Expand_configuration, 'accessControl');
 
 const dataRwo = ref({}); //当前行数据
 const props = { multiple: true };
@@ -794,20 +820,19 @@ const searchChangeS = () => {
   Topquery.value = {};
   onLoad();
 };
-const searchChange=()=>{
-  console.log(details.query,'details.query');
-let data=  {
-  warehouseNames:details.query.warehouseId.map(item=>item).join(',')
-}
-onLoad(data);
-console.log(data,'data');
-
-}
+const searchChange = () => {
+  console.log(details.query, 'details.query');
+  let data = {
+    warehouseNames: details.query.warehouseId.map(item => item).join(','),
+  };
+  onLoad(data);
+  console.log(data, 'data');
+};
 // 清空
-const searchReset=()=>{
-  details.query.warehouseId=[]
+const searchReset = () => {
+  details.query.warehouseId = [];
   onLoad();
-}
+};
 const areaoptions = ref([]); //地区
 // 地区获取
 const initialization = () => {
@@ -864,8 +889,8 @@ const details = reactive({
     /** 包明细 */
     packageOrderListlVisited: false,
   },
-  warehouseOption:[],
-  search:false,
+  warehouseOption: [],
+  search: false,
 });
 
 const {
@@ -940,7 +965,6 @@ const MyWareh = () => {
   });
 };
 
-
 MyWareh(); //获取仓库列表
 const Setheight = () => {
   const _node = document.querySelector('.tableNode');
@@ -1040,7 +1064,7 @@ const onLoad = val => {
 };
 onLoad();
 const searchHide = () => {
-  details.search=!details.search
+  details.search = !details.search;
 };
 
 // 每页多少条
@@ -1213,12 +1237,21 @@ const Expandconfiguration = async row => {
     let data = {
       warehouseId: row.id,
     };
-    Expandconfigurationform.value.defaultAllocation = ''
+    Expandconfigurationform.value.defaultAllocation = '';
     details.loadingObj.list = true; //加载中
     let _res = await $_warehouseConfig(data);
-  
+
     if (_res.data.code == 200) {
-      const { id, isStrictLoading, isAutoRelease,isAutoWarehouse,defaultAllocation,isTrunklineLoadingPhoto,isTrunklineStartPhoto,isTrunklineUnloadPhoto} = _res.data.data;
+      const {
+        id,
+        isStrictLoading,
+        isAutoRelease,
+        isAutoWarehouse,
+        defaultAllocation,
+        isTrunklineLoadingPhoto,
+        isTrunklineStartPhoto,
+        isTrunklineUnloadPhoto,
+      } = _res.data.data;
       dialogExpandconfiguration.value = true;
       let form = Expandconfigurationform.value;
       form.id = id; //id
@@ -1226,11 +1259,9 @@ const Expandconfiguration = async row => {
       form.isAutoRelease = isAutoRelease; //是否自动释放
       form.isAutoWarehouse = isAutoWarehouse; //是否自动释放
       form.defaultAllocation = defaultAllocation; //库位名字
-      form.isTrunklineLoadingPhoto = isTrunklineLoadingPhoto;//是否干线上传装车图片
-      form.isTrunklineStartPhoto = isTrunklineStartPhoto;//是否干线上传发车图片
-      form.isTrunklineUnloadPhoto = isTrunklineUnloadPhoto;//是否干线上传卸车图片
-
-      
+      form.isTrunklineLoadingPhoto = isTrunklineLoadingPhoto; //是否干线上传装车图片
+      form.isTrunklineStartPhoto = isTrunklineStartPhoto; //是否干线上传发车图片
+      form.isTrunklineUnloadPhoto = isTrunklineUnloadPhoto; //是否干线上传卸车图片
     }
     console.log(_res, '_res');
   } catch (err) {
@@ -1244,7 +1275,7 @@ const Expandconfigurationsubmit = async () => {
   try {
     let data = {
       ...Expandconfigurationform.value,
-      warehouseId:dataRwo.value.id,
+      warehouseId: dataRwo.value.id,
       id: Expandconfigurationform.value.id,
     };
     Expandconfigurationloading.value = true;
@@ -1343,13 +1374,13 @@ const newlyaddSubmit = () => {
         data.startDate = Addform.value['daterange'][0];
         data.endDate = Addform.value['daterange'][1];
       }
-      
+
       data.provinceCode = Addform.value['addressInfo'][0]; //仓库地区-省
       data.cityCode = Addform.value['addressInfo'][1]; //仓库地区-市
       data.code = Addform.value['addressInfo'][2]; //仓库地区-区
       data.departmentName = department.value.label; //部门
-      data.longitude  = data.address[0]
-      data.latitude=data.address[1]
+      data.longitude = data.address[0];
+      data.latitude = data.address[1];
       if (dialogTitle.value == '编辑') {
         data.id = dataRwo.value.id;
         $_Postupdate(data)
@@ -1367,9 +1398,7 @@ const newlyaddSubmit = () => {
           .catch(error => {
             console.log(error);
           })
-          .finally(() => {
-
-          });
+          .finally(() => {});
       } else {
         // 新增
         $_basicdataWarehousesave(data)
@@ -1387,16 +1416,17 @@ const newlyaddSubmit = () => {
           .catch(error => {
             console.log(error);
           })
-          .finally(() => {
-
-          });
+          .finally(() => {});
       }
     }
   });
   return;
 };
 
-// 编辑信息
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '仓库信息 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/warehouse/prewarehousing/PreStorageTrainNumber.vue b/src/views/warehouse/prewarehousing/PreStorageTrainNumber.vue
index 4153ac9b..8c410003 100644
--- a/src/views/warehouse/prewarehousing/PreStorageTrainNumber.vue
+++ b/src/views/warehouse/prewarehousing/PreStorageTrainNumber.vue
@@ -27,6 +27,7 @@
         <div class="avue-crud__left"></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="Search" @click="searchHide" circle></el-button>
@@ -118,6 +119,7 @@ import { deepClone } from '@/utils/util';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { getPageByCarNum } from '@/api/warehouse/PreStoragePackage';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -321,6 +323,11 @@ const viewDetails = ({ row }) => {
     },
   });
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '预入库车次 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/warehouse/prewarehousing/Prewarehouseorder.vue b/src/views/warehouse/prewarehousing/Prewarehouseorder.vue
index 4b816f0b..b2c898ff 100644
--- a/src/views/warehouse/prewarehousing/Prewarehouseorder.vue
+++ b/src/views/warehouse/prewarehousing/Prewarehouseorder.vue
@@ -77,6 +77,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>
@@ -453,6 +454,7 @@ import {
 import { useStore } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
+import { exportExcel } from '@/utils/exportData';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
@@ -1169,6 +1171,11 @@ const handleDownLoadFile = () => {
 
   downloadFileBase64(url, name);
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '预入库订单 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/waybill/ChangeOrder.vue b/src/views/waybill/ChangeOrder.vue
index 421237bc..5d7b1ae4 100644
--- a/src/views/waybill/ChangeOrder.vue
+++ b/src/views/waybill/ChangeOrder.vue
@@ -513,7 +513,7 @@ const handleExport = () => {
     //   const { status, data } = res;
     //   if (status !== 200) return;
 
-    //   downloadXls(data, '改单 - ' + new Date().getTime() + '.xlsx');
+    //   downloadXls(data, '改单 - ' + new Date().getTime());
     // } catch (error) {
     //   console.log('error :>> ', error);
     // } finally {
diff --git a/src/views/waybill/FreezeOrder.vue b/src/views/waybill/FreezeOrder.vue
index 7349e860..8dc9b36f 100644
--- a/src/views/waybill/FreezeOrder.vue
+++ b/src/views/waybill/FreezeOrder.vue
@@ -38,6 +38,7 @@
               </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="Search" @click="searchHide" circle></el-button>
@@ -120,6 +121,7 @@ import { useRouter } from 'vue-router';
 import print from '@/utils/print';
 import { deepClone } from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -436,6 +438,17 @@ const handleClickAll = e => {
   details.orderStatus = _name;
   initOnLoad();
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(
+    details.columnList,
+    details.orderStatus === 'haveData' ? details.haveDataData : details.notHaveDataData,
+    (details.orderStatus === 'haveData' ? '冻结订单 - 有数据 - ' : '冻结订单 - 无数据 - ') +
+      new Date().getTime() +
+      '.xlsx'
+  );
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue
index fd9fab0f..dbd2e800 100644
--- a/src/views/waybill/TemporaryStorageList.vue
+++ b/src/views/waybill/TemporaryStorageList.vue
@@ -39,97 +39,96 @@
         </el-tabs>
 
         <div class="overflow">
-          <el-row>
-            <div class="avue-crud__header">
-              <!-- 头部左侧按钮模块 -->
-              <div class="avue-crud__left">
-                <!-- 订单转运单 -->
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus"
-                  v-if="permissionObj.TemporaryStorageList_orderTransitionWaybill"
-                  @click="handleCreateOrder"
-                  >订单转运单
-                </el-button>
-
-                <!-- 修改客户信息 -->
-                <el-button
-                  type="primary"
-                  icon="Edit"
-                  v-if="permissionObj.TemporaryStorageList_editClientInfo"
-                  @click="editClientInfo"
-                >
-                  修改客户信息
-                </el-button>
-
-                <!-- 删除 -->
-                <el-button
-                  type="primary"
-                  icon="Delete"
-                  v-if="permissionObj.TemporaryStorageList_delete"
-                  @click="handleDelete"
-                >
-                  删除
-                </el-button>
-
-                <!-- 开标签 -->
-                <el-button
-                  type="primary"
-                  icon="Plus"
-                  v-if="permissionObj.TemporaryStorageList_openLabel"
-                  @click="handleOpenAddTagDlog"
-                  >开标签</el-button
-                >
+          <div class="avue-crud__header">
+            <!-- 头部左侧按钮模块 -->
+            <div class="avue-crud__left">
+              <!-- 订单转运单 -->
+              <el-button
+                type="primary"
+                icon="el-icon-plus"
+                v-if="permissionObj.TemporaryStorageList_orderTransitionWaybill"
+                @click="handleCreateOrder"
+                >订单转运单
+              </el-button>
 
-                <!-- 批量开标签导入 -->
-                <el-button
-                  type="primary"
-                  icon="Upload"
-                  v-if="permissionObj.TemporaryStorageList_batchOpenLableUpload"
-                  @click="
-                    () => {
-                      if (!ChecksWhetherTheWarehouseIsSelected())
-                        return ElMessage.warning('多仓权限无法操作，请选择仓库');
-                      details.popUpShow.UploadBatch = true;
-                      details.ouPaiChooseType = 0;
-                    }
-                  "
-                >
-                  批量开标签导入
-                </el-button>
-
-                <!-- 欧派数据导入 -->
-                <el-button
-                  type="primary"
-                  icon="Upload"
-                  v-if="permissionObj.TemporaryStorageList_opInfoUpload"
-                  @click="
-                    () => {
-                      details.popUpShow.UploadPackageDelivery = true;
-                      details.ouPaiChooseType = 0;
-                    }
-                  "
-                >
-                  欧派数据导入
-                </el-button>
-
-                <!-- 冻结 -->
-                <el-button
-                  type="primary"
-                  icon="Rank"
-                  v-if="permissionObj.TemporaryStorageList_freeze"
-                  @click="handleFreeze"
-                  >冻结</el-button
-                >
-              </div>
-              <!-- 头部右侧按钮模块 -->
-              <div class="avue-crud__right">
-                <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-                <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-                <el-button icon="Search" @click="searchHide" circle></el-button>
-              </div>
+              <!-- 修改客户信息 -->
+              <el-button
+                type="primary"
+                icon="Edit"
+                v-if="permissionObj.TemporaryStorageList_editClientInfo"
+                @click="editClientInfo"
+              >
+                修改客户信息
+              </el-button>
+
+              <!-- 删除 -->
+              <el-button
+                type="primary"
+                icon="Delete"
+                v-if="permissionObj.TemporaryStorageList_delete"
+                @click="handleDelete"
+              >
+                删除
+              </el-button>
+
+              <!-- 开标签 -->
+              <el-button
+                type="primary"
+                icon="Plus"
+                v-if="permissionObj.TemporaryStorageList_openLabel"
+                @click="handleOpenAddTagDlog"
+                >开标签
+              </el-button>
+
+              <!-- 批量开标签导入 -->
+              <el-button
+                type="primary"
+                icon="Upload"
+                v-if="permissionObj.TemporaryStorageList_batchOpenLableUpload"
+                @click="
+                  () => {
+                    if (!ChecksWhetherTheWarehouseIsSelected())
+                      return ElMessage.warning('多仓权限无法操作，请选择仓库');
+                    details.popUpShow.UploadBatch = true;
+                    details.ouPaiChooseType = 0;
+                  }
+                "
+              >
+                批量开标签导入
+              </el-button>
+
+              <!-- 欧派数据导入 -->
+              <el-button
+                type="primary"
+                icon="Upload"
+                v-if="permissionObj.TemporaryStorageList_opInfoUpload"
+                @click="
+                  () => {
+                    details.popUpShow.UploadPackageDelivery = true;
+                    details.ouPaiChooseType = 0;
+                  }
+                "
+              >
+                欧派数据导入
+              </el-button>
+
+              <!-- 冻结 -->
+              <el-button
+                type="primary"
+                icon="Rank"
+                v-if="permissionObj.TemporaryStorageList_freeze"
+                @click="handleFreeze"
+                >冻结
+              </el-button>
             </div>
-          </el-row>
+            <!-- 头部右侧按钮模块 -->
+            <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="Search" @click="searchHide" circle></el-button>
+            </div>
+          </div>
           <!-- 表格 -->
           <!-- 列表模块 -->
           <tablecmt
@@ -579,7 +578,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { getToken } from '@/utils/auth';
 import { useStore } from 'vuex';
-import { isLength } from 'html2canvas/dist/types/css/types/length';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -1550,6 +1549,17 @@ onActivated(() => {
     $store.commit('EDIT_REFRESHITEM', { title: 'TemporaryStorageList', status: false });
   }
 });
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(
+    details.columnList,
+    details.orderStatus === 'haveData' ? details.haveDataData : details.notHaveDataData,
+    (details.orderStatus === 'haveData' ? '暂存单 - 有数据 - ' : '暂存单 - 无数据 - ') +
+      new Date().getTime() +
+      '.xlsx'
+  );
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/waybill/orderPackageListDetailsByMarket.vue b/src/views/waybill/orderPackageListDetailsByMarket.vue
index ecee07cd..70dca818 100644
--- a/src/views/waybill/orderPackageListDetailsByMarket.vue
+++ b/src/views/waybill/orderPackageListDetailsByMarket.vue
@@ -105,6 +105,7 @@
           </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="Search" @click="searchHide" circle></el-button>
@@ -337,6 +338,7 @@ import {
 import print from '@/utils/print';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { useRoute, useRouter } from 'vue-router';
+import { exportExcel } from '@/utils/exportData';
 
 // 获取路由实例
 const $router = useRouter();
@@ -906,6 +908,15 @@ const handleBatchBarcode = async () => {
   }
 };
 
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(
+    details.packageListColumnList,
+    details.packageListRenderData,
+    $route.query.name + ' - ' + new Date().getTime()
+  );
+};
+
 watch(
   () => $route,
   () => {