前端代码合并提交

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/customer/Customer.vue

@@ -44,7 +44,7 @@
             prop="fee"
             label="etc卡月费"
             show-overflow-tooltip>
-          </el-table-column> 
+          </el-table-column>
            <el-table-column
             prop="bussinessType"
             label="业务类型"
@@ -87,7 +87,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -115,7 +115,7 @@
           <el-form-item label="客戶名称" prop="customerName">
             <el-input v-model="customer.customerName" auto-complete="off" placeholder="请输入用户名"></el-input>
           </el-form-item>
-           <el-form-item label="客户主体" prop="customerCompany"> 
+           <el-form-item label="客户主体" prop="customerCompany">
             <el-input v-model="customer.company" auto-complete="off" placeholder="请输入主体名称"></el-input>
           </el-form-item>
           <el-form-item label="业务类型" prop="bussinessType">
@@ -173,7 +173,7 @@
         style="font-size: 0px;">
         <div class="tou">客户--备案列表  <el-button type="success" size="small" style="margin-left: 1%;" @click="showAddCustomerRec">添加</el-button></div>
         <div class="line"></div>
-      
+
          <!-- 表格部分 -->
        <template>
         <el-table
@@ -270,7 +270,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       </el-dialog>
       <el-dialog
         @close="custRecClose"
@@ -282,7 +282,7 @@
           label-position="right"
           label-width="80px"
           :model="formUserList">
-          
+
             <el-row :span="24">
               <el-col :span="12">
                  <el-form-item  label-width=120px label="协议类型" prop="serviceType">
@@ -329,7 +329,7 @@
                 <el-date-picker v-model="customerRec.serviceEndTime" type="date" value-format="yyyy-MM-dd HH:mm:SS" placeholder="服务结束时间"></el-date-picker>
               </el-form-item>
               </el-col>
-          </el-row> 
+          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="contractDownload" v-show="customerRec.lowerFileName" type="primary">下游文件下载</el-button>
@@ -603,12 +603,12 @@
                  <el-date-picker v-model="customerRec.serviceEndTime" type="date" value-format="yyyy-MM-dd HH:mm:SS" placeholder="服务结束时间"></el-date-picker>
               </el-form-item>
               </el-col>
-          </el-row> 
+          </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="customerRecquerry" type="primary">查询</el-button>
           <el-button @click="customerRecAdd" type="primary">保存</el-button>
-          
+
         </div>
       </el-dialog>
        <el-dialog
@@ -661,8 +661,8 @@ import XLSX from "xlsx";
                                 {id:4,name:"普通货运"},
                                 {id:5,name:"专线运输"},
                                 {id:6,name:"其他"}],
-            serviceTypeList:[{id:1,name:"一级产品"},{id:2,name:"二级产品"},{id:3,name:"三级产品"}],                    
-            custAddrules: { 
+            serviceTypeList:[{id:1,name:"一级产品"},{id:2,name:"二级产品"},{id:3,name:"三级产品"}],
+            custAddrules: {
               customerName: [
                 { required: true, message: '请输入', trigger: 'blur' },
                 { min: 3, max: 100, message: '长度在 3 到 100个字符', trigger: 'blur' }
@@ -674,8 +674,8 @@ import XLSX from "xlsx";
                bussinessType: [
                 { required: true, message: '请输入', trigger: 'blur' },
               ]
-            }, 
-            custRecAddrules: { 
+            },
+            custRecAddrules: {
               customerName: [
                 { required: true, message: '请输入', trigger: 'blur' },
               ],
@@ -903,12 +903,12 @@ import XLSX from "xlsx";
             const response = await this.$http.post(`lowerService/customeRecQuery`, {"customerName":recoder.customerName,"companyName":recoder.companyName});
             if (response.data.code === 0) {
               this.customerRec = response.data.data;
-            
+
               this.disable = !((this.customerRec.interType ==1) && (this.customerRec.recStatus ==2 || this.customerRec.recStatus ==0));
 
             }
           },
-          
+
           async concatInfo(recoder){
               //this.recVis = true;
               this.concatVis = true;
@@ -939,8 +939,8 @@ import XLSX from "xlsx";
                         }
                    }).catch(() => {
                       //几点取消的提示
-                   }); 
-            
+                   });
+
           },
            async recInfoList(recoder){
              this.customer.customerName =recoder.customerName;
@@ -948,7 +948,7 @@ import XLSX from "xlsx";
             if (response.data.code === 0) {
               this.customeRecQueryListTable = response.data.data;
             }
-          
+
             this.recVisList = true;
           },
           async carInfo(recoder){
@@ -956,7 +956,7 @@ import XLSX from "xlsx";
             if (response.data.code === 0) {
               this.coustomerCarTable = response.data.data;
             }
-          
+
             this.carRecclose = true;
           },
           // 清空表单数据
@@ -1000,7 +1000,7 @@ import XLSX from "xlsx";
                if(valid){
                     const response = await this.$http.post(`customer/customerRecAdd`, this.customerRec);
                   if(response.data.code === 0) {
-                     
+
                   const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":this.customer.customerName});
                   if (response.data.code === 0) {
                     this.customeRecQueryListTable = response.data.data;
@@ -1018,7 +1018,7 @@ import XLSX from "xlsx";
                   }
                }
              });
-             
+
           },
           generateWord(){
             const token = sessionStorage.getItem('token');
@@ -1100,11 +1100,18 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
      async exportExcel() {
+          const loading = this.$loading({
+                                      lock: true,
+                                      text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                      spinner: 'el-icon-loading',
+                                      background: 'rgba(0, 0, 0, 0.7)'
+                                    });
         let customer = this.formCondition.customerName;
         window.location.href = hostUrl+"customer/findCustomerRecListExport?customerName="+customer+"&&companyName="+this.formCondition.subCompany+"&&companyBelongName="+this.formCondition.company;
+         loading.close();
       //   let curr = this.current;
       // let pagesize1 = this.pagesize;
-      // this.current = 1; 
+      // this.current = 1;
       // this.pagesize = this.total;
       // await this.loadData();
       // // 设置当前日期
@@ -1133,7 +1140,7 @@ 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;
@@ -1195,4 +1202,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/customer/custRecMoney.vue

@@ -55,7 +55,7 @@
           >
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -136,9 +136,15 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
       async   exportExcel() {
+      const loading = this.$loading({
+                            lock: true,
+                            text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                            spinner: 'el-icon-loading',
+                            background: 'rgba(0, 0, 0, 0.7)'
+                          });
         let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -167,9 +173,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }
@@ -229,4 +236,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/customer/custRecTime.vue

@@ -23,7 +23,7 @@
           :height="heightt"
           border
           tooltip-effect="dark">
-        
+
            <el-table-column
             label="主体名称"
             prop="companyBelongName"
@@ -62,7 +62,7 @@
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -131,9 +131,15 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
         async    exportExcel() {
+        const loading = this.$loading({
+                              lock: true,
+                              text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                              spinner: 'el-icon-loading',
+                              background: 'rgba(0, 0, 0, 0.7)'
+                            });
           let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -162,9 +168,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }
@@ -224,4 +231,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/customer/customerRecharge.vue

@@ -63,7 +63,7 @@
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -135,9 +135,15 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
      async exportExcel() {
+     const loading = this.$loading({
+                           lock: true,
+                           text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                           spinner: 'el-icon-loading',
+                           background: 'rgba(0, 0, 0, 0.7)'
+                         });
       let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -166,9 +172,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }
@@ -228,4 +235,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/customerRechargeMoney/customerRechargeMoney.vue

@@ -21,7 +21,7 @@
           :height="heightt"
           border
           tooltip-effect="dark">
-        
+
          <!--  <el-table-column
             prop="aMony"
             label="充值前账户余额"
@@ -52,7 +52,7 @@
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -128,9 +128,15 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
      async exportExcel() {
+     const loading = this.$loading({
+                           lock: true,
+                           text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                           spinner: 'el-icon-loading',
+                           background: 'rgba(0, 0, 0, 0.7)'
+                         });
       let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -159,9 +165,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }
@@ -221,4 +228,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/noCar/billway.vue

@@ -16,16 +16,16 @@
                 </el-select>
 
                 </el-upload>
-               
+
               </div>
-            
+
               <div class="demo-input-suffix" style="margin-top: 5px;">
                <el-input  placeholder="公司名称" class="input-demo" v-model="noCarWayBill.companyName"></el-input>
                 <el-input  placeholder="运单编号" class="input-demo" v-model="noCarWayBill.billNum"></el-input>
                 <el-input  placeholder="税号" class="input-demo" v-model="noCarWayBill.taxplayerCode"></el-input>
                 <el-button style="margin-right: 1%;" @click="DownloadTemplate">查询模板下载</el-button>
                  <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
-              
+
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                  <el-date-picker v-model="noCarWayBill.startBegin" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="运单上传开始指令始" end-placeholder="运单上传开始指令止"></el-date-picker>
@@ -34,10 +34,10 @@
                  <el-date-picker v-model="noCarWayBill.startBegin"  type="date" placeholder="开始指令上传时间始"></el-date-picker> -->
                 <!-- <el-date-picker v-model="noCarWayBill.endBegin" type="date" placeholder="结束指令上传时间始"></el-date-picker>
                 <el-date-picker v-model="noCarWayBill.endEnd" type="date" placeholder="结束指令上传时间止"></el-date-picker> -->
-                
+
                <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
                <el-button type="success" style="margin-left: 1%;" @click="updateStatus">更新状态</el-button>
-               
+
             </div>
           </el-col>
         </el-row>
@@ -125,7 +125,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>
@@ -138,10 +138,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
@@ -244,7 +244,7 @@ import XLSX from "xlsx";
               this.billWayTable = response.data.data.records;
               this.total = response.data.data.total;
             }
-          }, 
+          },
     importExcel (content) {
       debugger
     const file = content.file
@@ -272,13 +272,13 @@ import XLSX from "xlsx";
                billNums+= item['运单编号']+',';
            }
         });
-      
+
       }
       if(billNums!=''){
         this.noCarWayBill.billNum =billNums.substring(0,billNums.length-1);
       }
-     
-      
+
+
     })
   },
   file2Xce (file) {
@@ -325,7 +325,7 @@ import XLSX from "xlsx";
            handleSelectionChange(value){
                        this.multipleSelection = value;
                        console.log(this.multipleSelection);
-                      
+
            },
          async updateStatus(){
              const formData = new FormData();
@@ -369,7 +369,7 @@ import XLSX from "xlsx";
          this.total = response.data.data.length;
       }else {
         this.fullscreenLoading = false;
-        
+
         this.$message.error('数据存在错误，请检查文件中数据');
       }
     },
@@ -387,6 +387,12 @@ import XLSX from "xlsx";
             }
           },
          async  exportExcel() {
+         const loading = this.$loading({
+                               lock: true,
+                               text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                               spinner: 'el-icon-loading',
+                               background: 'rgba(0, 0, 0, 0.7)'
+                             });
               let curr = this.current;
               let pagesize1 = this.pagesize;
 
@@ -423,6 +429,7 @@ import XLSX from "xlsx";
             this.current = curr;
             this.pagesize = pagesize1;
             this.loadData();
+            loading.close();
             return wbout;
           },
         }

src/views/noCar/billwayException.vue

@@ -64,7 +64,7 @@
             prop="taxplayerCode"
             label="税号"
             show-overflow-tooltip>
-            
+
           </el-table-column>
           <el-table-column
             prop="interfaceEndTime"
@@ -112,7 +112,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -134,7 +134,7 @@ import XLSX from "xlsx";
         data(){
           return{
             noCarWayBill:{
-              
+
             },
              multipleSelection: [],
              optionone: [{
@@ -167,7 +167,7 @@ import XLSX from "xlsx";
               return value.toFixed(2)
             }
         },
-        
+
         methods:{
            firstLoadData(){
             this.current = 1;
@@ -191,7 +191,7 @@ import XLSX from "xlsx";
           handleSelectionChange(value){
                        this.multipleSelection = value;
                        console.log(this.multipleSelection);
-                      
+
            },
            async updateStatus(){
              const formData = new FormData();
@@ -210,7 +210,7 @@ import XLSX from "xlsx";
                     });
                   }
            },
-            
+
           // 分页方法
           handleSizeChange(val) {
             this.pagesize = val;
@@ -223,9 +223,15 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
        async     exportExcel() {
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
          let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -254,9 +260,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }
@@ -316,4 +323,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/noCar/calculateInfo.vue

@@ -171,9 +171,15 @@ import XLSX from "xlsx";
             }
           },
        async    exportExcel() {
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
          let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -203,9 +209,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }

src/views/noCar/calculateInfostatis.vue

@@ -113,9 +113,15 @@ import XLSX from "xlsx";
             }
           },
        async    exportExcel() {
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
          let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -145,9 +151,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }

src/views/noCar/hcInvoice.vue

@@ -86,7 +86,7 @@
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
     </div>
 </template>
 <script type="text/javascript">
@@ -148,9 +148,15 @@ import XLSX from "xlsx";
             }
           },
        async     exportExcel() {
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
          let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -180,9 +186,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }
@@ -242,4 +249,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/noCar/invoice.vue

@@ -79,12 +79,6 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="enStation"
-            label="入口收费站"
-             width="100"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
             prop="sellerTaxpayerCode"
             label="销方税号"
             show-overflow-tooltip>
@@ -95,6 +89,13 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
+            prop="enStation"
+            label="入口收费站"
+             width="100"
+            show-overflow-tooltip>
+          </el-table-column>
+
+          <el-table-column
             prop="exStation"
             label="出口收费站"
              width="100"
@@ -293,7 +294,7 @@ import XLSX from "xlsx";
                invoiceCodes+= item['发票代码']+',';
            }
         });
-      
+
       }
       if(billNums!=''){
         this.formCondition.waybillNum =billNums.substring(0,billNums.length-1);
@@ -301,7 +302,7 @@ import XLSX from "xlsx";
       if(invoiceNums!=null || invoiceNums!=''){
         this.formCondition.invoiceCode =invoiceCodes.substring(0,invoiceCodes.length-1);
       }
-     
+
       if(invoiceCodes!=''){
          this.formCondition.invoiceNum =invoiceNums.substring(0,invoiceNums.length-1);
       }
@@ -409,6 +410,12 @@ import XLSX from "xlsx";
             }
           },
        async    exportExcel() {
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
          let curr = this.current;
       let pagesize1 = this.pagesize;
       this.current = 1;
@@ -445,6 +452,7 @@ import XLSX from "xlsx";
        this.current = curr;
       this.pagesize = pagesize1;
       this.loadData();
+      loading.close();
       return wbout;
     },
         }

src/views/noCar/nocarRec.vue

@@ -97,7 +97,7 @@
             prop="succTime"
             label="成功时间"
             show-overflow-tooltip>
-            
+
           </el-table-column>
           <el-table-column
             prop="failTime"
@@ -110,7 +110,7 @@
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -178,9 +178,15 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
        async    exportExcel() {
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
          let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -209,9 +215,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }
@@ -271,4 +278,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/platform/apply/already.vue

@@ -32,25 +32,35 @@
          :height="heightt"
           border
           tooltip-effect="dark">
-          <el-table-column
-            prop="cardId"
-            label="ETC卡号"
+           <el-table-column
+            label="企业编号"
+            prop="companyNum"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            label="税额(元)"
+           <el-table-column
+            prop="companyName"
+            label="公司名称"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="buyerTaxpayerCode"
+            label="购方税号"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="plateNum"
+            label="车牌号"
             show-overflow-tooltip>
-            <template slot-scope="scope" show-overflow-tooltip>
-                <span>{{scope.row.totalTaxAmount / 100}}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            label="价税合计(元)"
-             width="120"
+            prop="cardId"
+            label="ETC卡号"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="tradeId"
+            label="交易ID"
             show-overflow-tooltip>
-            <template slot-scope="scope" show-overflow-tooltip>
-                <span>{{scope.row.totalAmount / 100}}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="sellerTaxpayerCode"
@@ -63,11 +73,18 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="plateNum"
-            label="车牌号"
+            prop="enStation"
+            label="入口收费站"
+             width="120"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
+            prop="exStation"
+            label="出口收费站"
+             width="120"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
             prop="invoiceNum"
             label="发票号码"
             show-overflow-tooltip>
@@ -77,34 +94,78 @@
             label="发票代码"
             show-overflow-tooltip>
           </el-table-column>
+
+
+
           <el-table-column
             prop="invoiceMakeTime"
             label="开票时间"
             show-overflow-tooltip>
           </el-table-column>
+
           <el-table-column
-            prop="enStation"
-            label="入口收费站"
-             width="120"
+            label="交易金额(元)"
+            width="120"
             show-overflow-tooltip>
+            <template slot-scope="scope" show-overflow-tooltip>
+                <span>{{scope.row.fee / 100}}</span>
+            </template>
           </el-table-column>
-          <el-table-column
-            prop="exStation"
-            label="出口收费站"
+           <el-table-column
+            label="价税合计(元)"
              width="120"
             show-overflow-tooltip>
+            <template slot-scope="scope" show-overflow-tooltip>
+                <span>{{scope.row.totalAmount / 100}}</span>
+            </template>
           </el-table-column>
-          <el-table-column
-            label="交易金额(元)"
-            width="120"
+           <el-table-column
+            label="税额(元)"
             show-overflow-tooltip>
             <template slot-scope="scope" show-overflow-tooltip>
-                <span>{{scope.row.fee / 100}}</span>
+                <span>{{scope.row.totalTaxAmount / 100}}</span>
+            </template>
+          </el-table-column>
+         <el-table-column
+            prop="amount"
+            label="金额"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+               <span>{{scope.row.fee/100| rounding}}</span>
             </template>
           </el-table-column>
+           <el-table-column
+            prop="taxRate"
+            label="税率"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+               <span>{{scope.row.taxRate| rounding}}</span>
+            </template>
+          </el-table-column>
+
           <el-table-column
-            prop="tradeId"
-            label="交易ID"
+            prop="invoiceHtmlUrl"
+            label="预览地址"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="invoiceUrl"
+            label="下载地址"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="tradeStatus"
+            label="状态"
+            show-overflow-tooltip>
+             <template slot-scope="scope">
+              <span v-if="scope.row.tradeStatus == 1" style="color: green">待开票</span>
+              <span v-else-if="scope.row.tradeStatus == 2" style="color: red">开票中</span>
+              <span v-else-if="scope.row.tradeStatus == 3" style="color: red">已开票</span>
+            </template>
+          </el-table-column>
+           <el-table-column
+            prop="calculateTime"
+            label="计费时间"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -243,6 +304,12 @@ export default{
             }
           },
        async     exportExcel() {
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
          let curr = this.current;
       let pagesize1 = this.pagesize;
       this.current = 1;
@@ -278,6 +345,7 @@ export default{
        this.current = curr;
       this.pagesize = pagesize1;
       this.loadData();
+      loading.close();
       return wbout;
     },
   }

src/views/platform/apply/selfCarTrade.vue

@@ -216,6 +216,12 @@ import XLSX from "xlsx";
             }
           },
        async     exportExcel() {
+       const loading = this.$loading({
+                                   lock: true,
+                                   text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                   spinner: 'el-icon-loading',
+                                   background: 'rgba(0, 0, 0, 0.7)'
+                                 });
          let curr = this.current;
       let pagesize1 = this.pagesize;
       this.current = 1;
@@ -252,6 +258,7 @@ import XLSX from "xlsx";
       this.current = curr;
       this.pagesize = pagesize1;
       this.loadData();
+      loading.close();
       return wbout;
     },
         }

src/views/platform/car/carsuccess.vue

@@ -160,6 +160,12 @@ export default{
     },
     //导出功能
     async  exportOut() {
+    const loading = this.$loading({
+                                      lock: true,
+                                      text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                      spinner: 'el-icon-loading',
+                                      background: 'rgba(0, 0, 0, 0.7)'
+                                    });
       let curr = this.current;
               let pagesize1 = this.pagesize;
 
@@ -195,6 +201,7 @@ export default{
             this.current = curr;
             this.pagesize = pagesize1;
             this.loadData();
+            loading.close();
             return wbout;
     },
     handleRemove(file, fileList) {
@@ -213,7 +220,7 @@ export default{
       console.log(`每页 ${val} 条`);
     },
     handleCurrentChange(val) {
-      this.pagesize = val;
+      this.current = val;
       this.loadData();
       console.log(`当前页: ${val}`);
     },

src/views/platform/invoice/list.vue

@@ -88,31 +88,32 @@
           :height="heightt"
           border
           tooltip-effect="dark">
-          <el-table-column
-            prop="waybillNum"
-            label="运单编号"
+           <el-table-column
+            label="企业编号"
+            prop="companyNum"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            label="税额(元)"
+           <el-table-column
+            prop="companyName"
+            label="公司名称"
             show-overflow-tooltip>
-            <template slot-scope="scope" show-overflow-tooltip>
-                <span>{{scope.row.totalTaxAmount / 100}}</span>
-            </template>
           </el-table-column>
-          <el-table-column
-            label="价税合计(元)"
-            width="120"
+           <el-table-column
+            prop="buyerTaxpayerCode"
+            label="购方税号"
             show-overflow-tooltip>
-            <template slot-scope="scope" show-overflow-tooltip>
-                <span>{{scope.row.totalAmount / 100}}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="taxRate"
-            label="税率"
+            prop="waybillNum"
+            label="运单编号"
             show-overflow-tooltip>
           </el-table-column>
+           <el-table-column
+            prop="plateNum"
+            label="车牌号"
+            show-overflow-tooltip>
+          </el-table-column>
+
           <el-table-column
             prop="exTime"
             label="交易时间"
@@ -128,11 +129,7 @@
             label="销方名称"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="plateNum"
-            label="车牌号"
-            show-overflow-tooltip>
-          </el-table-column>
+
           <el-table-column
             prop="invoiceNum"
             label="发票号码"
@@ -160,6 +157,21 @@
             width="120"
             show-overflow-tooltip>
           </el-table-column>
+           <el-table-column
+            prop="invoiceCode"
+            label="发票代码"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="invoiceNum"
+            label="发票号码"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="transactionId"
+            label="交易ID"
+            show-overflow-tooltip>
+          </el-table-column>
           <el-table-column
             label="交易金额(元)"
             width="120"
@@ -168,17 +180,61 @@
                 <span>{{scope.row.fee / 100}}</span>
             </template>
           </el-table-column>
+           <el-table-column
+            label="价税合计(元)"
+            width="120"
+            show-overflow-tooltip>
+            <template slot-scope="scope" show-overflow-tooltip>
+                <span>{{scope.row.totalAmount / 100}}</span>
+            </template>
+          </el-table-column>
+           <el-table-column
+            label="税额(元)"
+            show-overflow-tooltip>
+            <template slot-scope="scope" show-overflow-tooltip>
+                <span>{{scope.row.totalTaxAmount / 100}}</span>
+            </template>
+          </el-table-column>
+           <el-table-column
+            prop="amount"
+            label="金额"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+               <span>{{scope.row.amount/100| rounding}}</span>
+            </template>
+          </el-table-column>
           <el-table-column
-            prop="transactionId"
-            label="交易ID"
+            prop="taxRate"
+            label="税率"
             show-overflow-tooltip>
           </el-table-column>
+
+          <el-table-column
+            prop="invoiceHtmlUrl"
+            label="预览地址"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="invoiceUrl"
+            label="下载地址"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="billStatus"
+            label="运单状态"
+            show-overflow-tooltip>
+             <template slot-scope="scope">
+              <span v-if="scope.row.billStatus == 1" style="color: green">未结束</span>
+              <span v-else-if="scope.row.billStatus == 2" style="color: green">开票中</span>
+              <span v-else-if="scope.row.billStatus == 3" style="color: green">开票完成</span>
+              <span v-else-if="scope.row.billStatus == 4" style="color: red">超时运单</span>
+            </template>
+          </el-table-column>
            <el-table-column
             prop="calculateTime"
             label="扣费时间"
             show-overflow-tooltip>
           </el-table-column>
-
           <el-table-column
             label="操作"
             width="80">
@@ -288,7 +344,7 @@ export default{
             } 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();
     },
@@ -332,7 +388,13 @@ export default{
           },
      //导出功能
    async exportOut() {
-       let curr = this.current;
+   const loading = this.$loading({
+                                     lock: true,
+                                     text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                     spinner: 'el-icon-loading',
+                                     background: 'rgba(0, 0, 0, 0.7)'
+                                   });
+              let curr = this.current;
               let pagesize1 = this.pagesize;
 
               this.current = 1;
@@ -368,6 +430,7 @@ export default{
             this.current = curr;
             this.pagesize = pagesize1;
             this.loadData();
+            loading.close();
             return wbout;
     },
     // 分页方法

src/views/platform/waybill/history.vue

@@ -328,7 +328,7 @@ export default{
         this.$message.error('数据存在错误，请检查文件中数据，金额是否有空的，时间是否全是时间格式');
       }else {
         loading.close();
-        this.$message.error("数据存在错误，请检查文件中数据，金额是否有空的，时间是否全是时间格式");
+        this.$message.error(msg);
       }
     },
     // 查看批次数据
@@ -376,7 +376,13 @@ export default{
             }
           },
     async    exportExcel() {
-          let curr = this.currenttwo;
+      const loading = this.$loading({
+                                  lock: true,
+                                  text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                  spinner: 'el-icon-loading',
+                                  background: 'rgba(0, 0, 0, 0.7)'
+                                });
+      let curr = this.currenttwo;
       let pagesize1 = this.pagesizetwo;
       this.currenttwo = 1;
       this.pagesizetwo = this.totaltwo;
@@ -411,6 +417,7 @@ export default{
        this.currenttwo = curr;
       this.pagesizetwo = pagesize1;
       this.loadDataCar();
+      loading.close();
       return wbout;
     },
     // 清空表单数据

src/views/platform/waybill/over.vue

@@ -259,10 +259,10 @@ 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("数据存在错误，请检查文件中数据");
+        this.$message.error(msg);
       }
     },
     // 查看批次数据

src/views/platform/waybill/waybill.vue

@@ -329,7 +329,7 @@ export default{
         this.$message.error('数据存在错误，请检查文件中数据，金额是否有空的，时间是否全是时间格式');
       }else {
        loading.close();
-        this.$message.error("数据存在错误，请检查文件中数据");
+        this.$message.error(msg);
       }
     },
     // 查看批次数据
@@ -366,8 +366,14 @@ export default{
           this.totaltwo = response.data.data.total;
         }
     },
-   async    exportExcel() {
-          let curr = this.currenttwo;
+   async exportExcel() {
+      const loading = this.$loading({
+                                  lock: true,
+                                  text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                  spinner: 'el-icon-loading',
+                                  background: 'rgba(0, 0, 0, 0.7)'
+                                });
+      let curr = this.currenttwo;
       let pagesize1 = this.pagesizetwo;
       this.currenttwo = 1;
       this.pagesizetwo = this.totaltwo;
@@ -401,6 +407,7 @@ export default{
        this.currenttwo = curr;
       this.pagesizetwo = pagesize1;
       this.loadDataCar();
+      loading.close();
       return wbout;
     },
      handleRemove(file, fileList) {

src/views/platform/waybillmanagement/noinvoice.vue

@@ -253,7 +253,13 @@ export default{
           },
     //查看
    async    exportExcel() {
-          let curr = this.currenttwo;
+      const loading = this.$loading({
+                                  lock: true,
+                                  text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                  spinner: 'el-icon-loading',
+                                  background: 'rgba(0, 0, 0, 0.7)'
+                                });
+      let curr = this.currenttwo;
       let pagesize1 = this.pagesizetwo;
       this.currenttwo = 1;
       this.pagesizetwo = this.totaltwo;
@@ -288,6 +294,7 @@ export default{
        this.currenttwo = curr;
       this.pagesizetwo = pagesize1;
       this.loadDataCar();
+      loading.close();
       return wbout;
     },
      //导出功能

src/views/platform/waybillmanagement/trueinvoice.vue

@@ -32,36 +32,36 @@
           <el-col :span="24">
             <div class="top">
               <!-- <label style="margin-left: 1%;">运单导出状态:</label> -->
-              <el-select v-model="isExport"  class="input-demo" placeholder="运单导出状态">
-                <el-option
-                  v-for="item in option"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+ <el-date-picker
+                v-model="startBegin"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:SS"
+                placeholder="运单上传开始指令始">
+              </el-date-picker>
 
               <el-date-picker
                 class="input-demo"
-                v-model="startTime"
+                v-model="startEnd"
                 type="datetime"
-                placeholder="选择开始时间">
+                value-format="yyyy-MM-dd HH:mm:SS"
+                placeholder="运单上传开始指令止">
               </el-date-picker>
 
               <el-date-picker
                 class="input-demo"
-                v-model="endTime"
+                v-model="endBegin"
                 type="datetime"
-                placeholder="选择结束时间">
+                value-format="yyyy-MM-dd HH:mm:SS"
+                placeholder="运单上传结束指令始">
+              </el-date-picker>
+
+              <el-date-picker
+                class="input-demo"
+                v-model="endEnd"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:SS"
+                placeholder="运单上传结束指令止">
               </el-date-picker>
-            <el-select v-model="isLegacyData" placeholder="是否历史开票记录">
-                <el-option
-                  v-for="item in optiontwo"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
               <el-button type="success" style="margin-left: 1%;" @click="firstLoadData">查询</el-button>
               <!-- <el-button type="info" style="margin-left: 1%;">重置</el-button> -->
             </div>
@@ -178,7 +178,10 @@ export default{
       billNum: '',
       plateNumber: '',
       batchNumber: '',
-      startTime: '',
+       startBegin: '',
+      startEnd: '',
+      endBegin: '',
+      endEnd: '',
       hightt:'0px',
       endTime: '',
       createStartTime: '',
@@ -238,6 +241,10 @@ export default{
       formData.append('customerName', this.customerName);
       formData.append('companyName', this.companyName);
       formData.append('billNum', this.billNum);
+       formData.append('startBegin', this.startBegin);
+      formData.append('startEnd', this.startEnd);
+      formData.append('endBegin', this.endBegin);
+      formData.append('endEnd', this.endEnd);
       formData.append('plateNumber', this.plateNumber);
       formData.append('billwayStatus', 3);
       formData.append('hisFlag', this.hisFlag);
@@ -247,7 +254,7 @@ export default{
       //formData.append('createStartTime', this.createStartTime);
       //formData.append('createEndTime', this.createEndTime);
         // formData.append('isSuccess', 1);
-      const response = await this.$http.post(`noCar/findBillWay`, formData);
+      const response = await this.$http.post(`noCar/findBillWayCust`, formData);
       if (response.data.code === 0) {
          this.loading = false;
         this.usertabletwo = response.data.data.records;
@@ -287,6 +294,12 @@ export default{
             }
           },
     async    exportExcel() {
+    const loading = this.$loading({
+                                lock: true,
+                                text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                spinner: 'el-icon-loading',
+                                background: 'rgba(0, 0, 0, 0.7)'
+                              });
           let curr = this.currenttwo;
       let pagesize1 = this.pagesizetwo;
       this.currenttwo = 1;
@@ -322,6 +335,7 @@ export default{
        this.currenttwo = curr;
       this.pagesizetwo = pagesize1;
       this.loadDataCar();
+      loading.close();
       return wbout;
     },
 

src/views/platform/waybillmanagement/waybillList.vue

@@ -37,7 +37,7 @@
                 v-model="startBegin"
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:SS"
-                placeholder="选择运单开始时间">
+                placeholder="运单上传开始指令始">
               </el-date-picker>
 
               <el-date-picker
@@ -45,7 +45,7 @@
                 v-model="startEnd"
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:SS"
-                placeholder="选择运单结束时间">
+                placeholder="运单上传开始指令止">
               </el-date-picker>
 
               <el-date-picker
@@ -53,7 +53,7 @@
                 v-model="endBegin"
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:SS"
-                placeholder="选择创建开始时间">
+                placeholder="运单上传结束指令始">
               </el-date-picker>
 
               <el-date-picker
@@ -61,7 +61,7 @@
                 v-model="endEnd"
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:SS"
-                placeholder="选择创建结束时间">
+                placeholder="运单上传结束指令止">
               </el-date-picker>
 
             </div>
@@ -287,6 +287,12 @@ export default{
             }
           },
 async    exportExcel() {
+const loading = this.$loading({
+                            lock: true,
+                            text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                            spinner: 'el-icon-loading',
+                            background: 'rgba(0, 0, 0, 0.7)'
+                          });
           let curr = this.currenttwo;
       let pagesize1 = this.pagesizetwo;
       this.currenttwo = 1;
@@ -322,6 +328,7 @@ async    exportExcel() {
        this.currenttwo = curr;
       this.pagesizetwo = pagesize1;
       this.loadDataCar();
+      loading.close();
       return wbout;
     },
     // 分页方法

src/views/selfCar/calculateInfo.vue

@@ -60,9 +60,9 @@
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
-      <!-- <div class="block">
+      <div class="block">
         <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -72,7 +72,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
         </el-pagination>
-      </div> -->
+      </div>
     </div>
 </template>
 <script type="text/javascript">
@@ -120,10 +120,11 @@ import XLSX from "xlsx";
             formData.append('etcNum', this.formCondition.etcNum);
             formData.append('calTime', this.formCondition.calTime);
             formData.append('companyLongName', this.formCondition.companyLongName);
-           
+
             const response = await this.$http.post(`selfCar/findSelfcarCalculateInfo`, formData);
             if (response.data.code === 0) {
               this.calculateInfo = response.data.data.records;
+               this.total = response.data.data.total;
             }
           },
           // 分页方法
@@ -152,9 +153,15 @@ import XLSX from "xlsx";
             }
           },
         async    exportExcel() {
+        const loading = this.$loading({
+                              lock: true,
+                              text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                              spinner: 'el-icon-loading',
+                              background: 'rgba(0, 0, 0, 0.7)'
+                            });
           let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -184,9 +191,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }
@@ -246,4 +254,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/selfCar/invoice.vue

@@ -290,9 +290,9 @@ importExcel (content) {
            }
            if(item['交易id']!=null && item['交易id']!='' && typeof item['交易id']!='undefined'){
                tradeIds+= item['交易id']+',';
-           } 
+           }
         });
-      
+
       }
       if(etcIds!=''){
         this.formCondition.cardId =etcIds.substring(0,etcIds.length-1);
@@ -300,7 +300,7 @@ importExcel (content) {
       if(tradeIds!=null){
         this.formCondition.tradeId = tradeIds.substring(0,tradeIds.length-1) ;
       }
-      
+
     })
   },
   file2Xce (file) {
@@ -407,6 +407,12 @@ importExcel (content) {
             }
           },
        async     exportExcel() {
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
          let curr = this.current;
       let pagesize1 = this.pagesize;
       this.current = 1;
@@ -442,6 +448,7 @@ importExcel (content) {
        this.current = curr;
       this.pagesize = pagesize1;
       this.loadData();
+      loading.close();
       return wbout;
     },
         }

src/views/selfCar/selfCarTrade.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="billWay_container"> 
+    <div class="billWay_container">
       <div class="title">
         <el-row>
           <el-col :span="24">
@@ -18,14 +18,14 @@
                 <el-button style="margin-left: 10px;" @click="DownloadTemplate">查询模板下载</el-button>
                   <el-button type="primary"  @click="exportExcel">导出报表</el-button>
                 </el-upload>
-               
+
               </div>
                <div class="demo-input-suffix" style="margin-top: 5px;">
                <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.companyName"></el-input>
                 <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-input  placeholder="交易id" class="input-demo" v-model="formCondition.tradeId"></el-input>
-                
+
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                  <el-date-picker v-model="formCondition.exTimeBegin" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="交易时间始" end-placeholder="交易时间止"></el-date-picker>
@@ -45,7 +45,7 @@
           ref="multipleTable"
           :data="selfcarTrade"
            :height="heightt"
-            
+
           border
           tooltip-effect="dark" @selection-change="handleSelectionChange">
            <el-table-column
@@ -214,9 +214,9 @@ import XLSX from "xlsx";
            }
            if(item['交易id']!=null && item['交易id']!='' && typeof item['交易id']!='undefined'){
                tradeIds+= item['交易id']+',';
-           } 
+           }
         });
-      
+
       }
       if(etcIds!=''){
         this.formCondition.cardId =etcIds.substring(0,etcIds.length-1);
@@ -224,7 +224,7 @@ import XLSX from "xlsx";
       if(tradeIds!=null){
         this.formCondition.tradeId = tradeIds.substring(0,tradeIds.length-1)  ;
       }
-      
+
     })
   },
   file2Xce (file) {
@@ -300,9 +300,15 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
        async     exportExcel() {
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
          let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -331,10 +337,11 @@ 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();
+      loading.close();
       return wbout;
     },
         }

src/views/selfCar/selfCarTradeException.vue

@@ -181,9 +181,15 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
        async  exportExcel() {
+       const loading = this.$loading({
+                             lock: true,
+                             text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                             spinner: 'el-icon-loading',
+                             background: 'rgba(0, 0, 0, 0.7)'
+                           });
          let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -212,9 +218,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }

src/views/selfCar/selfcarRec.vue

@@ -11,7 +11,7 @@
                    <el-input  placeholder="车牌号" class="input-demo" v-model="formCondition.carNum"></el-input>
               </div>
                 <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
-                 
+
                   <el-select v-model="formCondition.recStatus" placeholder="备案状态">
                       <el-option
                         v-for="item in recLists"
@@ -111,7 +111,7 @@
             prop="succTime"
             label="成功时间"
             show-overflow-tooltip>
-            
+
           </el-table-column>
           <el-table-column
             prop="failTime"
@@ -131,7 +131,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -229,9 +229,15 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
         async    exportExcel() {
+        const loading = this.$loading({
+                              lock: true,
+                              text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                              spinner: 'el-icon-loading',
+                              background: 'rgba(0, 0, 0, 0.7)'
+                            });
           let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -260,9 +266,10 @@ 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();
+      loading.close();
       return wbout;
     },
         }
@@ -322,4 +329,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/sys/user.vue

@@ -51,7 +51,7 @@
             prop="name"
             show-overflow-tooltip>
           </el-table-column>
-          
+
           <el-table-column
             label="手机号"
             prop="phone"
@@ -109,7 +109,7 @@
             label="税号"
             show-overflow-tooltip>
           </el-table-column> -->
-         
+
           <!-- <el-table-column
             prop="companyNum"
             label="企业编号"
@@ -186,13 +186,13 @@
             </el-select>
           </el-form-item>
 
-         
+
 
           <el-form-item label="手机号" prop="phone">
             <el-input v-model="formUserList.phone" auto-complete="off" placeholder="请输入手机号"></el-input>
           </el-form-item>
 
-  
+
 
           <el-form-item label="企业名称" prop="company">
             <el-input v-model="formUserList.company" auto-complete="off" placeholder="请输入企业名称"></el-input>
@@ -370,7 +370,7 @@ export default{
             { required: true, message: '请输入手机号', trigger: 'blur' },
             { min: 11, max: 11, message: '长度在 11 个字符', trigger: 'blur' }
           ],
-          
+
           company: [
             { required: true, message: '请输入企业名称', trigger: 'blur' },
             { min: 2, max: 25, message: '长度在 2 到 25 个字符', trigger: 'blur' }
@@ -439,8 +439,8 @@ export default{
     //     for(var i in roleids){
     //       this.tempRole.push(parseInt(roleids[i]));
     //     }
-        
-      
+
+
     // },
     changeRow(id){
      if(id == 0){
@@ -468,12 +468,12 @@ export default{
                 row.roleName +=","+ this.roleList[j]['roleName'];
               }
             }
-           
+
           }
         }
          const response = await this.$http.post(`user/updateUser`, row);
           if(response.data.code === 0) {
-            
+
           }else {
             this.$message({
               type: 'error',
@@ -693,9 +693,15 @@ export default{
     },
         // 导出表格所用
    async exportExcel() {
+      const loading = this.$loading({
+                      lock: true,
+                      text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                      spinner: 'el-icon-loading',
+                      background: 'rgba(0, 0, 0, 0.7)'
+                    });
       let curr = this.current;
       let pagesize1 = this.pagesize;
-      this.current = 1; 
+      this.current = 1;
       this.pagesize = this.total;
       await this.loadData();
       // 设置当前日期
@@ -724,9 +730,10 @@ export default{
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
-      this.current = curr; 
+      this.current = curr;
       this.pagesize = pagesize1;
       this.loadData();
+      loading.close();
       return wbout;
     },