前端代码合并提交

src/views/noCar/billway.vue

@@ -443,9 +443,7 @@ import XLSX from "xlsx";
                           {"title":"运单类型","key":"hisFlag"},
                     ];
                     debugger;
-                    await this.exportExcelComm(cloums,response.data.data.records,name)
-              
-                loading.close();
+                    await this.exportExcelComm(cloums,response.data.data.records,name,loading);
             }
           },
           formatJson (filterVal, jsonData) {
@@ -477,7 +475,7 @@ import XLSX from "xlsx";
               }));
           },
           // 导出Excel
-          exportExcelComm(columns,list,excelName){
+          exportExcelComm(columns,list,excelName,loading){
                   require.ensure([], () => {
                       const { export_json_to_excel } = require('@/vendor/Export2Excel');
                       let tHeader = []
@@ -487,8 +485,8 @@ import XLSX from "xlsx";
                           filterVal.push(item.key)
                       })
                       const data = this.formatJson(filterVal, list);
-                      debugger;
                       export_json_to_excel(tHeader, data, excelName);
+                      loading.close();
                   })
             }
         }

src/views/noCar/invoice.vue

@@ -517,9 +517,7 @@ import XLSX from "xlsx";
                          
                     ];
                     debugger;
-                    await this.exportExcelComm(cloums,response.data.data.records,name)
-              
-                loading.close();
+                    await this.exportExcelComm(cloums,response.data.data.records,name,loading)
             }
           },
           formatJson (filterVal, jsonData) {
@@ -545,7 +543,7 @@ import XLSX from "xlsx";
               }));
           },
           // 导出Excel
-          exportExcelComm(columns,list,excelName){
+          exportExcelComm(columns,list,excelName,loading){
                   require.ensure([], () => {
                       const { export_json_to_excel } = require('@/vendor/Export2Excel');
                       let tHeader = []
@@ -557,6 +555,7 @@ import XLSX from "xlsx";
                       const data = this.formatJson(filterVal, list);
                       debugger;
                       export_json_to_excel(tHeader, data, excelName);
+                      loading.close();
                   })
             }
         }

src/views/platform/invoice/list.vue

@@ -487,9 +487,7 @@ export default{
                          
                     ];
                     debugger;
-                    await this.exportExcelComm(cloums,response.data.data.records,name)
-              
-                loading.close();
+                    await this.exportExcelComm(cloums,response.data.data.records,name,loading);
             }
           },
           formatJson (filterVal, jsonData) {
@@ -515,7 +513,7 @@ export default{
               }));
           },
           // 导出Excel
-          exportExcelComm(columns,list,excelName){
+          exportExcelComm(columns,list,excelName,loading){
                   require.ensure([], () => {
                       const { export_json_to_excel } = require('@/vendor/Export2Excel');
                       let tHeader = []
@@ -527,6 +525,7 @@ export default{
                       const data = this.formatJson(filterVal, list);
                       debugger;
                       export_json_to_excel(tHeader, data, excelName);
+                      loading.close();
                   })
             },
     // 分页方法

src/views/platform/waybillmanagement/waybillList.vue

@@ -333,10 +333,9 @@ async  exportExcel() {
                           {"title":"失败原因","key":"failReason"},
                           {"title":"运单类型","key":"hisFlag"},
                     ];
-                    debugger;
-                    await this.exportExcelComm(cloums,response.data.data.records,name)
+                  
+                   this.exportExcelComm(cloums,response.data.data.records,name,loading)
               
-                loading.close();
             }
           },
           formatJson (filterVal, jsonData) {
@@ -368,7 +367,7 @@ async  exportExcel() {
               }));
           },
           // 导出Excel
-          exportExcelComm(columns,list,excelName){
+          exportExcelComm(columns,list,excelName,loading){
                   require.ensure([], () => {
                       const { export_json_to_excel } = require('@/vendor/Export2Excel');
                       let tHeader = []
@@ -378,8 +377,11 @@ async  exportExcel() {
                           filterVal.push(item.key)
                       })
                       const data = this.formatJson(filterVal, list);
-                      debugger;
                       export_json_to_excel(tHeader, data, excelName);
+                      console.log(1111);
+                     console.log(new Date().getMilliseconds)
+                     loading.close();
+                     debugger
                   })
             },
     // 分页方法