前端代码合并提交

src/views/noCar/calculateInfo.vue

@@ -93,6 +93,7 @@
 </template>
 <script type="text/javascript">
 import FileSaver from "file-saver";
+import CsvExportor from "csv-exportor";
 import XLSX from "xlsx";
       export default {
         data(){
@@ -216,16 +217,21 @@ import XLSX from "xlsx";
                           tHeader.push(item.title)
                           filterVal.push(item.key)
                       })
-                      for(var i =0;i<list.length/200000;i++){
-                        const data = this.formatJson(filterVal, list.slice(i*200000,(i+1)*200000>list.length?list.length:(i+1)*200000));
-                        export_json_to_excel(tHeader, data, excelName+'_'+i);
-                      }
-                      
+                      // for(var i =0;i<list.length/200000;i++){
+                      //   const data = this.formatJson(filterVal, list.slice(i*200000,(i+1)*200000>list.length?list.length:(i+1)*200000));
+                      //   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();
                   })
             },
             formatJson (filterVal, jsonData) {
             return jsonData.map(v => filterVal.map(j => {
+              if(j=='buyerTaxpayerCode'){
+                 return v[j]+'\t';
+              }
               return v[j];
               
               }));

src/views/platform/apply/already.vue

@@ -253,6 +253,12 @@ export default{
          this.formList.startTime = this.formList.invoiceMakeTime[0];
          this.formList.endTime = this.formList.invoiceMakeTime[1];
        }
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
       const response = await this.$http.post(`/selfCar/findSelfcarInvoiceByTime`, this.formList);
       var {data: { code, msg, data }} = response;
       if(code === 0) {
@@ -263,6 +269,7 @@ export default{
       }else{
         this.$message.error(msg);
       }
+      loading.close();
     },
     async initCompanyList(){
             const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});

src/views/platform/apply/selfCarTrade.vue

@@ -166,7 +166,14 @@ import XLSX from "xlsx";
             for(var i in this.formCondition){
                 formData.append(i,this.formCondition[i]);
             }
+            const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
             const response = await this.$http.post(`selfCar/findTradesUpper`, formData);
+
             if (response.data.code === 0) {
               this.selfcarTrade = response.data.data.records;
               this.total = response.data.data.total;
@@ -175,6 +182,7 @@ import XLSX from "xlsx";
                this.$message(response.data.msg);
    
             }
+            loading.close();
           },
           // 列表展示
           async loadData() {