前端代码合并提交

src/config/globle.js

@@ -1,3 +1,3 @@
-//window.hostUrl = "http://192.168.50.4:18080/";
-window.hostUrl = "http://127.0.0.1:18080/"
+window.hostUrl = "http://192.168.50.4:18080/";
+//window.hostUrl = "http://127.0.0.1:18080/"
 window.tableHeight =  (document.body.clientHeight*0.6-20);

src/views/noCar/invoice.vue

@@ -258,6 +258,7 @@ import XLSX from "xlsx";
       return
     }
     this.file2Xce(file).then(tabJson => {
+      debugger
       var billNums = '';
       var invoiceCodes = '';
       var invoiceNums = '';
@@ -279,11 +280,14 @@ import XLSX from "xlsx";
       }
       if(billNums!=''){
         this.formCondition.waybillNum =billNums.substring(0,billNums.length-1);
+      }
+      if(invoiceNums!=null || invoiceNums!=''){
         this.formCondition.invoiceCode =invoiceCodes.substring(0,invoiceCodes.length-1);
-        this.formCondition.invoiceNum =invoiceNums.substring(0,invoiceNums.length-1);
       }
      
-      
+      if(invoiceCodes!=''){
+         this.formCondition.invoiceNum =invoiceNums.substring(0,invoiceNums.length-1);
+      }
     })
   },
   file2Xce (file) {

src/views/noCar/nocarRec.vue

@@ -6,6 +6,7 @@
             <div class="top">
               <el-input  placeholder="公司名称" class="input-demo" v-model="companyName"></el-input>
               <el-input  placeholder="车牌号" class="input-demo" v-model="carNum"></el-input>
+              <el-date-picker v-model="startTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="备案时间始" end-placeholder="备案时间止"></el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
             </div>
@@ -133,6 +134,7 @@ import XLSX from "xlsx";
             nocarRecCarTable:[],
             companyName:'',
             carNum:'',
+            startTime:'',
              hightt:'0px',
             current: 1,
             pagesize: 8,
@@ -156,6 +158,7 @@ import XLSX from "xlsx";
             formData.append('size', this.pagesize);
             formData.append('companyName', this.companyName);
             formData.append('carNum', this.carNum);
+            formData.append('startTime',this.startTime);
             formData.append('businessType', 2);
             const response = await this.$http.post(`noCar/findCarRec`, formData);
             if (response.data.code === 0) {

src/views/platform/apply/already.vue

@@ -188,7 +188,7 @@ export default{
     async queryLook() {
       debugger;
        if(this.formList.invoiceMakeTime !=null && this.formList.invoiceMakeTime !=''){
-        
+
          this.formList.startTime = this.formList.invoiceMakeTime[0];
          this.formList.endTime = this.formList.invoiceMakeTime[1];
        }
@@ -208,6 +208,9 @@ export default{
             if (response.data.code === 0) {
               this.companyList = response.data.data;
             }
+            if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                                  this.companyList = [{'companyName':'.'}];
+                                                }
             this.formList.companyName = this.companyList[0]['companyName'];
             this.loadData();
     },
@@ -229,7 +232,7 @@ export default{
        async     exportExcel() {
          let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -258,7 +261,7 @@ export default{
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
-       this.current = curr; 
+       this.current = curr;
       this.pagesize = pagesize1;
       this.loadData();
       return wbout;

src/views/platform/apply/apply.vue

@@ -14,7 +14,7 @@
                 </el-option>
               </el-select>
               <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="carNum"></el-input>
-            
+
               <el-button type="success" style="margin-left: 1%;" @click="queryLook">查询</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="applyForTicket">全部开票</el-button>
             </div>
@@ -126,6 +126,9 @@ export default{
             if (response.data.code === 0) {
               this.companyList = response.data.data;
             }
+            if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                                  this.companyList = [{'companyName':'.'}];
+                                                }
             this.companyName = this.companyList[0]['companyName'];
     },
      handleSelectionChange(value){

src/views/platform/apply/packaging.vue

@@ -117,7 +117,9 @@ export default{
             const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
             if (response.data.code === 0) {
               this.companyList = response.data.data;
-            }
+            }if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                                   this.companyList = [{'companyName':'.'}];
+                                                 }
             this.formPackList.companyName = this.companyList[0]['companyName'];
     },
     //下载打包

src/views/platform/apply/selfCarTrade.vue

@@ -16,7 +16,7 @@
                 <el-input  placeholder="etc卡号" class="input-demo" v-model="formCondition.cardId"></el-input>
                 <el-input  placeholder="税号" class="input-demo" v-model="formCondition.companyReferencenum"></el-input>
                  <el-select v-model="formCondition.status" placeholder="交易状态">
-                    
+
                 <el-option
                   v-for="item in statusList"
                   :key="item.status"
@@ -185,7 +185,9 @@ import XLSX from "xlsx";
             const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
             if (response.data.code === 0) {
               this.companyList = response.data.data;
-            }
+            } if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                                   this.companyList = [{'companyName':'.'}];
+                                                 }
             this.formCondition.companyName = this.companyList[0]['companyName'];
           },
           // 分页方法
@@ -202,7 +204,7 @@ import XLSX from "xlsx";
        async     exportExcel() {
          let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -231,8 +233,8 @@ import XLSX from "xlsx";
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
-      
-      this.current = curr; 
+
+      this.current = curr;
       this.pagesize = pagesize1;
       this.loadData();
       return wbout;

src/views/platform/car/carsuccess.vue

@@ -153,6 +153,9 @@ export default{
             if (response.data.code === 0) {
               this.companyList = response.data.data;
             }
+            if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                      this.companyList = [{'companyName':'.'}];
+                                    }
             this.formUserList.companyName = this.companyList[0]['companyName'];
     },
     //导出功能
@@ -160,7 +163,7 @@ export default{
       let curr = this.current;
               let pagesize1 = this.pagesize;
 
-              this.current = 1; 
+              this.current = 1;
               this.pagesize = this.total;
              await this.loadData();
             // 设置当前日期
@@ -189,7 +192,7 @@ export default{
             } catch (e) {
               if (typeof console !== "undefined") console.log(e, wbout);
             }
-            this.current = curr; 
+            this.current = curr;
             this.pagesize = pagesize1;
             this.loadData();
             return wbout;

src/views/platform/carbinding/carbinding.vue

@@ -223,10 +223,13 @@ export default{
         // console.log(this.multipleSelection)
     },
     async initCompanyList(){
-            const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
+            const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName'),"bussinessType":"0"});
             if (response.data.code === 0) {
               this.companyList = response.data.data;
             }
+            if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                                  this.companyList = [{'companyName':'.'}];
+                                                }
             this.formList.companyName = this.companyList[0]['companyName'];
     },
     // 获取验证码数据

src/views/platform/carbinding/carbindinglist.vue

@@ -5,6 +5,14 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
+              <el-select v-model="formList.companyName" placeholder="请输入公司名称">
+                <el-option
+                  v-for="item in companyList"
+                  :key="item.companyName"
+                  :label="item.companyName"
+                  :value="item.companyName">
+                </el-option>
+              </el-select>
               <el-input  placeholder="请输入车牌号码" class="input-demo" v-model="carNum"></el-input>
               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
             </div>
@@ -79,6 +87,7 @@ export default{
       carNum: '',
       hightt:'0px',
       roleId: '',
+      companyList:[],
       formList: {
         "companyName": "",
         "customerName": ""
@@ -87,13 +96,14 @@ export default{
   },
   created() {
     this.heightt = tableHeight;
+    this.initCompanyList();
     this.loadData();
   },
   methods: {
      firstLoadData(){
             this.current = 1;
             this.pagesize = 8;
-            this.queryLook();
+            this.loadData();
           },
     //数据加载
     async loadData() {
@@ -102,7 +112,8 @@ export default{
         formData.append('current', this.current);
         formData.append('size', this.pagesize);
         formData.append('customerName', this.formList.customerName);
-         formData.append('recStatus', 2);
+        formData.append('companyName', this.formList.companyName);
+        formData.append('carNum', this.carNum);
          formData.append('businessType',0);
         const response = await this.$http.post(`noCar/findCarRec`, formData);
         if (response.data.code === 0) {
@@ -118,7 +129,6 @@ export default{
         formData.append('size', this.pagesize);
         formData.append('customerName', this.formList.customerName);
         formData.append('carNum', this.carNum);
-        formData.append('recStatus', 2);
          formData.append('businessType',0);
         const response = await this.$http.post(`noCar/findCarRec`, formData);
         if (response.data.code === 0) {
@@ -127,23 +137,24 @@ export default{
           this.total = response.data.data.total;
         };
     },
+    async initCompanyList(){
+            const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName'),"bussinessType":"0"});
+            if (response.data.code === 0) {
+              this.companyList = response.data.data;
+            } if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                                    this.companyList = [{'companyName':'.'}];
+                                                  }
+            this.formList.companyName = this.companyList[0]['companyName'];
+    },
     // 分页方法
     handleSizeChange(val) {
       this.pagesize = val;
-      if(this.carNum !== '') {
-        this.queryLook();
-      }else{
-        this.loadData();
-      };
+     this.loadData();
       console.log(`每页 ${val} 条`);
     },
     handleCurrentChange(val) {
       this.current = val;
-      if(this.carNum !== '') {
-        this.queryLook();
-      }else{
-        this.loadData();
-      };
+     this.loadData();
       console.log(`当前页: ${val}`);
     },
   }

src/views/platform/invoice/list.vue

@@ -19,7 +19,7 @@
               <el-date-picker style="margin-left:1%;" v-model="invoiceMakeTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="开票时间始" end-placeholder="开票时间止"></el-date-picker>
                <el-date-picker v-model="calculateTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="扣费时间始" end-placeholder="扣费时间止"></el-date-picker>
 
-       
+
             </div>
           </el-col>
         </el-row>
@@ -178,7 +178,7 @@
             label="扣费时间"
             show-overflow-tooltip>
           </el-table-column>
-          
+
           <el-table-column
             label="操作"
             width="80">
@@ -285,7 +285,9 @@ export default{
             const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
             if (response.data.code === 0) {
               this.companyList = response.data.data;
-            }
+            } if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                                    this.companyList = [{'companyName':'.'}];
+                                                  }
             this.taxPlayerCode = this.companyList[0]['companyName'];
             this.loadData();
     },
@@ -318,7 +320,7 @@ export default{
        let curr = this.current;
               let pagesize1 = this.pagesize;
 
-              this.current = 1; 
+              this.current = 1;
               this.pagesize = this.total;
              await this.loadData();
             // 设置当前日期
@@ -347,7 +349,7 @@ export default{
             } catch (e) {
               if (typeof console !== "undefined") console.log(e, wbout);
             }
-            this.current = curr; 
+            this.current = curr;
             this.pagesize = pagesize1;
             this.loadData();
             return wbout;

src/views/platform/waybill/history.vue

@@ -24,7 +24,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="用户所在公司" class="input-demo" v-model="companyName"></el-input>
+              <el-input  placeholder="主体账号名称" class="input-demo" v-model="companyName"></el-input>
               <el-input  placeholder="批次号" class="input-demo" v-model="batchNum"></el-input>
               <el-button style="margin-left: 1%;" @click="DownloadTemplate">下载模板</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
@@ -49,14 +49,14 @@
             prop="customerName"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             label="用户手机号"
             prop="customerPhone"
             show-overflow-tooltip>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="company"
-            label="用户所在公司"
+            label="主账号名称"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -325,7 +325,7 @@ export default{
         this.$message.success('上传成功');
       }else if(code === 1 && msg == null && data == null) {
         loading.close();
-        this.$message.error('数据存在错误，请检查文件中数据');
+        this.$message.error('数据存在错误，请检查文件中数据，金额是否有空的，时间是否全是时间格式');
       }else {
         loading.close();
         this.$message.error(msg);

src/views/platform/waybill/over.vue

@@ -26,7 +26,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="用户所在公司" class="input-demo" v-model="companyName"></el-input>
+              <el-input  placeholder="主体账号名称" class="input-demo" v-model="companyName"></el-input>
               <el-input  placeholder="批次号" class="input-demo" v-model="batchNumer"></el-input>
               <el-button style="margin-left: 1%;" @click="DownloadTemplate">下载模板</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
@@ -52,14 +52,14 @@
             prop="customerName"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             label="用户手机号"
             prop="customerPhone"
             show-overflow-tooltip>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="company"
-            label="用户所在公司"
+            label="主账号名称"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column

src/views/platform/waybill/waybill.vue

@@ -26,7 +26,7 @@
           <el-col :span="24">
             <div class="top">
 
-              <el-input  placeholder="用户所在公司" class="input-demo" v-model="companyName"></el-input>
+              <el-input  placeholder="主体账号名称" class="input-demo" v-model="companyName"></el-input>
               <el-input  placeholder="批次号" class="input-demo" v-model="batchNum"></el-input>
               <el-button style="margin-left: 1%;" @click="DownloadTemplate">下载模板</el-button>
               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
@@ -52,14 +52,14 @@
             prop="customerName"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             label="用户手机号"
             prop="customerPhone"
             show-overflow-tooltip>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="company"
-            label="用户所在公司"
+            label="主账号名称"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column

src/views/platform/waybillmanagement/noinvoice.vue

@@ -154,6 +154,8 @@
 </template>
 
 <script>
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
 export default{
   data() {
     return {
@@ -192,12 +194,12 @@ export default{
     this.heightt = tableHeight;
      this.customerName = sessionStorage.getItem('userName');
      this.initCompanyList();
-   
+
   },
   methods: {
     firstLoadData(){
-            this.current = 1;
-            this.pagesize = 8;
+            this.currenttwo = 1;
+            this.pagesizetwo = 8;
             this.loadDataCar();
           },
     // 列表展示
@@ -229,12 +231,50 @@ export default{
             const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
             if (response.data.code === 0) {
               this.companyList = response.data.data;
-            }
+            }   if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                                      this.companyList = [{'companyName':'.'}];
+                                                    }
             this.companyName = this.companyList[0]['companyName'];
             this.loadDataCar();
     },
     //查看
-   
+   async    exportExcel() {
+          let curr = this.currenttwo;
+      let pagesize1 = this.pagesizetwo;
+      this.currenttwo = 1;
+      this.pagesizetwo = this.totaltwo;
+      await this.loadDataCar();
+      // 设置当前日期
+      let time = new Date();
+      //console.log(time);
+      let year = time.getFullYear();
+      let month = time.getMonth() + 1;
+      let day = time.getDate();
+      let name = "历史运单上传列表_"+year + "" + month + "" + day;
+      // console.log(name)
+      /* generate workbook object from table */
+      //  .table要导出的是哪一个表格
+      var wb = XLSX.utils.table_to_book(document.querySelector(".ttt"),{ raw: true });
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array"
+      });
+      try {
+        //  name+'.xlsx'表示导出的excel表格名字
+        FileSaver.saveAs(
+          new Blob([wbout], { type: "application/octet-stream" }),
+          name + ".xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, wbout);
+      }
+       this.currenttwo = curr;
+      this.pagesizetwo = pagesize1;
+      this.loadDataCar();
+      return wbout;
+    },
      //导出功能
     exportOut() {
       var url = `http://invoice.back.jkcredit.com/carFreeCarrierBill/billExport?&userId=${this.formUserList.userId}`;

src/views/platform/waybillmanagement/trueinvoice.vue

@@ -167,6 +167,8 @@
 </template>
 
 <script>
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
 export default{
   data() {
     return {
@@ -220,7 +222,7 @@ export default{
     this.heightt = tableHeight;
      this.customerName = sessionStorage.getItem('userName');
      this.initCompanyList();
-   
+
   },
   methods: {
         firstLoadData(){
@@ -256,18 +258,57 @@ export default{
             const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
             if (response.data.code === 0) {
               this.companyList = response.data.data;
-            }
+            }  if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                                     this.companyList = [{'companyName':'.'}];
+                                                   }
             this.companyName = this.companyList[0]['companyName'];
             this.loadDataCar();
     },
     //查看
-   
+
      //导出功能
     exportOut() {
       var url = `http://invoice.back.jkcredit.com/carFreeCarrierBill/billExport?&userId=${this.formUserList.userId}`;
 
       window.location.href= url;
     },
+    async    exportExcel() {
+          let curr = this.currenttwo;
+      let pagesize1 = this.pagesizetwo;
+      this.currenttwo = 1;
+      this.pagesizetwo = this.totaltwo;
+      await this.loadDataCar();
+      // 设置当前日期
+      let time = new Date();
+      //console.log(time);
+      let year = time.getFullYear();
+      let month = time.getMonth() + 1;
+      let day = time.getDate();
+      let name = "历史运单上传列表_"+year + "" + month + "" + day;
+      // console.log(name)
+      /* generate workbook object from table */
+      //  .table要导出的是哪一个表格
+      var wb = XLSX.utils.table_to_book(document.querySelector(".ttt"),{ raw: true });
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array"
+      });
+      try {
+        //  name+'.xlsx'表示导出的excel表格名字
+        FileSaver.saveAs(
+          new Blob([wbout], { type: "application/octet-stream" }),
+          name + ".xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, wbout);
+      }
+       this.currenttwo = curr;
+      this.pagesizetwo = pagesize1;
+      this.loadDataCar();
+      return wbout;
+    },
 
     // 分页方法
     handleSize(val) {

src/views/platform/waybillmanagement/waybillList.vue

@@ -24,7 +24,7 @@
                 </el-option>
               </el-select>
               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
-              <el-button type="success" style="margin-left: 1%;" @click="exportOut">导出</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="exportExcel">导出</el-button>
             <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
           </el-col>
@@ -140,7 +140,7 @@
             label="运单状态"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              
+
                <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
                 <span v-else-if="scope.row.billwayStatus == -2" style="color: red">失败</span>
                  <span v-else-if="scope.row.billwayStatus == -3" style="color: red">指令上传失败</span>
@@ -153,10 +153,10 @@
             label="是否成功"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              
+
                <span v-if="scope.row.billwayStatus == -2 || scope.row.billwayStatus == -3" style="color: red">失败</span>
                 <span v-else-if="scope.row.billwayStatus != -2 && scope.row.billwayStatus != -3" style="color: green">成功</span>
-               
+
               </template>
           </el-table-column>
            <el-table-column
@@ -184,6 +184,8 @@
 </template>
 
 <script>
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
 export default{
   data() {
     return {
@@ -221,12 +223,12 @@ export default{
     this.heightt = tableHeight;
      this.customerName = sessionStorage.getItem('userName');
      this.initCompanyList();
-   
+
   },
   methods: {
         firstLoadData(){
-            this.current = 1;
-            this.pagesize = 8;
+            this.currenttwo = 1;
+            this.pagesizetwo = 8;
             this.loadDataCar();
           },
     // 列表展示
@@ -256,19 +258,57 @@ export default{
             const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
             if (response.data.code === 0) {
               this.companyList = response.data.data;
-            }
+            }  if(this.companyList == null || typeof this.companyList == 'undefined' || this.companyList =='' || this.companyList.length==0){
+                                                     this.companyList = [{'companyName':'.'}];
+                                                   }
             this.companyName = this.companyList[0]['companyName'];
             this.loadDataCar();
     },
     //查看
-   
+
      //导出功能
     exportOut() {
       var url = `http://invoice.back.jkcredit.com/carFreeCarrierBill/billExport?&userId=${this.formUserList.userId}`;
 
       window.location.href= url;
     },
-
+async    exportExcel() {
+          let curr = this.currenttwo;
+      let pagesize1 = this.pagesizetwo;
+      this.currenttwo = 1;
+      this.pagesizetwo = this.totaltwo;
+      await this.loadDataCar();
+      // 设置当前日期
+      let time = new Date();
+      //console.log(time);
+      let year = time.getFullYear();
+      let month = time.getMonth() + 1;
+      let day = time.getDate();
+      let name = "无车运单导出列表_"+year + "" + month + "" + day;
+      // console.log(name)
+      /* generate workbook object from table */
+      //  .table要导出的是哪一个表格
+      var wb = XLSX.utils.table_to_book(document.querySelector(".table"),{ raw: true });
+      /* get binary string as output */
+      var wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array"
+      });
+      try {
+        //  name+'.xlsx'表示导出的excel表格名字
+        FileSaver.saveAs(
+          new Blob([wbout], { type: "application/octet-stream" }),
+          name + ".xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, wbout);
+      }
+       this.currenttwo = curr;
+      this.pagesizetwo = pagesize1;
+      this.loadDataCar();
+      return wbout;
+    },
     // 分页方法
     handleSize(val) {
       this.pagesizetwo = val;