前端代码合并提交

package.json

@@ -14,10 +14,12 @@
   "dependencies": {
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
+    "csv-exportor": "^1.0.2",
     "element-ui": "^2.8.2",
     "file-saver": "^2.0.5",
     "jquery": "^3.6.0",
     "moment": "^2.24.0",
+    "papaparse": "^5.3.1",
     "px2rem-loader": "^0.1.9",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",

src/vendor/Export2Excel.js

@@ -54,9 +54,12 @@ function datenum(v, date1904) {
 }
 
 function sheet_from_array_of_arrays(data, opts) {
+    
     var ws = {};
+    var ws2 ={};
     var range = { s: { c: 10000000, r: 10000000 }, e: { c: 0, r: 0 } };
     for (var R = 0; R != data.length; ++R) {
+        console.log(R);
         for (var C = 0; C != data[R].length; ++C) {
             if (range.s.r > R) range.s.r = R;
             if (range.s.c > C) range.s.c = C;
@@ -74,7 +77,9 @@ function sheet_from_array_of_arrays(data, opts) {
                 cell.v = datenum(cell.v);
             }
             else cell.t = 's';
-
+            if(R>500000){
+                ws2[cell_ref] = cell;
+            }
             ws[cell_ref] = cell;
         }
     }
@@ -122,7 +127,7 @@ export function export_table_to_excel(id) {
 export function export_json_to_excel(th, jsonData, defaultTitle) {
 
     /* original data */
-
+debugger;
     var data = jsonData;
     data.unshift(th);
     var ws_name = "SheetJS";

src/views/noCar/billway.vue

@@ -204,6 +204,7 @@
 </template>
 <script type="text/javascript">
 import FileSaver from "file-saver";
+import CsvExportor from "csv-exportor";
 import XLSX from "xlsx";
       export default {
         data(){
@@ -470,7 +471,10 @@ import XLSX from "xlsx";
                 }else{
                   return "历史运单";
                 }
-              }else{
+              }else if(j=='billNum'){
+                 return v[j]+'\t';
+              }
+              else{
                   return v[j];
               }
               
@@ -486,11 +490,13 @@ import XLSX from "xlsx";
                           tHeader.push(item.title)
                           filterVal.push(item.key)
                       })
-                      for(var i =0;i<list.length/100000;i++){
-                        const data = this.formatJson(filterVal, list.slice(i*100000,(i+1)*100000>list.length?list.length:(i+1)*100000));
-                        export_json_to_excel(tHeader, data, excelName+'_'+i);
-                      }
-                      
+                      // for(var i =0;i<list.length/100000;i++){
+                      //   const data = this.formatJson(filterVal, list.slice(i*100000,(i+1)*100000>list.length?list.length:(i+1)*100000));
+                      //   export_json_to_excel(tHeader, data, excelName+'_'+i);
+                      // }
+                      const data = this.formatJson(filterVal,list);
+                      data.unshift(tHeader);
+                       CsvExportor.downloadCsv(data, { tHeader }, excelName+".csv");
                       loading.close();
                   })
             }

src/views/noCar/invoice.vue

@@ -227,7 +227,7 @@
     </div>
 </template>
 <script type="text/javascript">
-import FileSaver from "file-saver";
+import CsvExportor from "csv-exportor";
 import XLSX from "xlsx";
       export default {
         data(){
@@ -550,6 +550,8 @@ import XLSX from "xlsx";
                   return v[j]/100;
               }else if(j =='amount'){
                   return v[j]/100;
+              }else if(j=='waybillNum'){
+                 return v[j]+'\t';
               }else{
                   return v[j];
               }
@@ -558,21 +560,17 @@ import XLSX from "xlsx";
           },
           // 导出Excel
           exportExcelComm(columns,list,excelName,loading){
-                  require.ensure([], () => {
-                      const { export_json_to_excel } = require('@/vendor/Export2Excel');
-                      let tHeader = []
+                  let tHeader = []
                       let filterVal = []
                       columns.forEach(item =>{
                           tHeader.push(item.title)
                           filterVal.push(item.key)
                       })
                      
-                     for(var i =0;i<list.length/50000;i++){
-                      const data = this.formatJson(filterVal, list.slice(i*50000,(i+1)*50000>list.length?list.length:(i+1)*50000));
-                      export_json_to_excel(tHeader, data, excelName+'_'+i);
-                     }
+                     const data = this.formatJson(filterVal,list);
+                      data.unshift(tHeader);
+                     CsvExportor.downloadCsv(data, { tHeader }, excelName+".csv");
                       loading.close();
-                  })
             }
         }
       };