前端代码合并提交

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/Home.vue

@@ -543,6 +543,7 @@ export default {
   margin-left: 2%;
   width: 80%;
   float: left;
+  height:100%;
 }
 .el-message  {
   font-size: 35px !important;

src/views/customer/custRecMoney.vue

@@ -6,6 +6,8 @@
             <div class="top">
                <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customerName"></el-input>
                <el-input  placeholder="主体名称" class="input-demo" v-model="formCondition.company"></el-input>
+                <el-input placeholder="最小金额" v-model="formCondition.moneyLower" @input="changeAmt"  class="input-demo" ></el-input>
+                 <el-input placeholder="最大金额" v-model="formCondition.moneyUpper" @input="changeAmt"  class="input-demo" ></el-input>
                <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>
@@ -100,6 +102,10 @@ import XLSX from "xlsx";
             this.pagesize = 8;
             this.loadData();
           },
+           changeAmt(value){
+           value=value.replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '');
+           this.customerRecharge.rechargeMony = value;
+         },
           // 列表展示
           async loadData() {
             const formData = new FormData();
@@ -107,6 +113,8 @@ import XLSX from "xlsx";
             formData.append('size', this.pagesize);
             formData.append('customerName', this.formCondition.customerName);
             formData.append('company', this.formCondition.company);
+            formData.append('moneyLower', this.formCondition.moneyLower||0);
+            formData.append('moneyUpper', this.formCondition.moneyUpper||0);
             const response = await this.$http.post(`customer/findCustomerMoney`, formData);
             if (response.data.code === 0) {
               this.customeRecMoneyListTable = response.data.data.records;
@@ -188,7 +196,7 @@ import XLSX from "xlsx";
 }
 .custRecMoney_container .input-demo {
   display: inline-block;
-  width: 20%;
+  width: 15%;
   margin-left: 1%;
 }
 .custRecMoney_container .block {

src/views/noCar/invoice.vue

@@ -17,7 +17,7 @@
                 <el-button slot="trigger"  size="small" type="primary">选取文件</el-button>
                 <el-button style="margin-left: 10px;" size="small" type="success" @click="batchUpload" v-loading.fullscreen.lock="fullscreenLoading">批量查询</el-button>
               </el-upload>
-              
+
               <div class="demo-input-suffix">
                 <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.companyName"></el-input>
                 <el-input  placeholder="运单编号" class="input-demo" v-model="formCondition.waybillNum"></el-input>
@@ -27,14 +27,14 @@
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
                 <el-date-picker v-model="formCondition.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="formCondition.calculateTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="扣费时间始" end-placeholder="扣费时间止"></el-date-picker>
-                
+
               </div>
                <div class="demo-input-suffix" style="margin-top: 5px;margin-right: 10px;">
                   <el-input  placeholder="发票代码" class="input-demo" v-model="formCondition.invoiceCode"></el-input>
                 <el-input  placeholder="发票号码" class="input-demo" v-model="formCondition.invoiceNum"></el-input>
                   <el-button type="success" style="margin-right: 1%;" @click="firstLoadData">查询</el-button>
                 <el-button style="margin-left: 1%;" @click="DownloadTemplate">查询模板下载</el-button>
-                
+
                 <el-button type="primary" style="margin-right: 1%;" @click="exportExcel">导出报表</el-button>
               </div>
             </div>
@@ -165,7 +165,7 @@
                <span>{{scope.row.taxRate| rounding}}</span>
             </template>
           </el-table-column>
-         
+
          <el-table-column
             prop="invoiceHtmlUrl"
             label="预览地址"
@@ -193,7 +193,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -273,7 +273,7 @@ import XLSX from "xlsx";
           },
              // 批量上传模板信息
     async batchUpload() {
-      
+
          const isLt50M = this.formUserList.file.size / 1024 / 1024 < 50;
       let extName = this.formUserList.file.name.substring(this.formUserList.file.name.lastIndexOf(".")).toLowerCase();
        let AllUpExt = ".xlsx";
@@ -286,19 +286,23 @@ import XLSX from "xlsx";
                 this.$message.error('上传文件大小不能超过50MB!');
                 return false;
        }
-       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
 
-      this.fullscreenLoading = true;
+       const loading = this.$loading({
+                lock: true,
+                text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+              });
       const formData = new FormData();
       formData.append('file', this.formUserList.file);
       const response = await this.$http.post(`noCar/batchImportNocarInvoices`,formData);
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === '1') {
-         this.fullscreenLoading = false;
+          loading.close();
          this.invoiceTable = response.data.data;
          this.total = response.data.data.length;
       }else {
-        this.fullscreenLoading = false;
+        loading.close();
         this.$message.error('数据存在错误，请检查文件中数据');
       }
     },
@@ -316,7 +320,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();
       // 设置当前日期
@@ -345,7 +349,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;
@@ -407,4 +411,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/platform/apply/selfCarTrade.vue

@@ -16,6 +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"
@@ -23,6 +24,7 @@
                   :value="item.status">
                 </el-option>
                  </el-select>
+                 <el-button type="success" style="margin-left: 1%;" @click="update">更新</el-button>
               </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>
@@ -43,7 +45,11 @@
           :data="selfcarTrade"
            :height="heightt"
           border
-          tooltip-effect="dark">
+          tooltip-effect="dark"  @selection-change="handleSelectionChange">
+           <el-table-column
+              type="selection"
+              width="55">
+               </el-table-column>
            <el-table-column
             prop="companyName"
             label="公司名称"
@@ -119,6 +125,7 @@ import XLSX from "xlsx";
               customId:'',
               status:2
             },
+             multipleSelection:[],
             statusList:[{status:1,statusName:"待开票"},{status:2,statusName:"开票中"},{status:3,statusName:"已开票"}],
             companyList:[],
             selfcarTrade:[],
@@ -159,6 +166,21 @@ import XLSX from "xlsx";
               this.total = response.data.data.total;
             }
           },
+           handleSelectionChange(value){
+                       this.multipleSelection = value;
+                       console.log(this.multipleSelection);
+           },
+            async update(){
+            if(this.multipleSelection.length == 0){return};
+             const formData = new FormData();
+            formData.append('selfCarTradesStr', JSON.stringify(this.multipleSelection));
+               const response = await this.$http.post(`selfCar/updateTrades`, formData);
+               this.loadData();
+                this.$message({
+                      type: 'success',
+                      message: '更新成功'
+                    });
+          },
            async initCompanyList(){
             const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":sessionStorage.getItem('userName')});
             if (response.data.code === 0) {
@@ -239,7 +261,7 @@ import XLSX from "xlsx";
 }
 .billWay_container .input-demo {
   display: inline-block;
-  width: 20%;
+  width: 15%;
   margin-left: 1%;
 }
 .billWay_container .block {

src/views/platform/car/carupload.vue

@@ -350,9 +350,14 @@ export default{
                 this.$message.error('上传文件大小不能超过50MB!');
                 return false;
        }
-       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
-       
-      this.fullscreenLoading = true;
+
+const loading = this.$loading({
+                          lock: true,
+                          text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                          spinner: 'el-icon-loading',
+                          background: 'rgba(0, 0, 0, 0.7)'
+                        });
+
       const formData = new FormData();
       formData.append('userId', this.formUserList.userId);
       formData.append('file', this.formUserList.file);
@@ -360,13 +365,13 @@ export default{
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         this.loadData();
-        this.fullscreenLoading = false;
+       loading.close();
         this.$message.success('上传成功');
       }else if(code === 1 && msg == null && data == null) {
-        this.fullscreenLoading = false;
+        loading.close();
         this.$message.error('数据存在错误，请检查文件中数据');
       }else {
-        this.fullscreenLoading = false;
+       loading.close();
         this.$message.error(msg);
       }
     },

src/views/platform/invoice/invoice.vue

@@ -311,9 +311,12 @@ export default{
                 this.$message.error('上传文件大小不能超过50MB!');
                 return false;
        }
-       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
-       
-      this.fullscreenLoading = false;
+       const loading = this.$loading({
+                                 lock: true,
+                                 text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                 spinner: 'el-icon-loading',
+                                 background: 'rgba(0, 0, 0, 0.7)'
+                               });
       this.formUserList.userId = sessionStorage.getItem('userId');
       const formData = new FormData();
       formData.append('userId', this.formUserList.userId);
@@ -322,14 +325,14 @@ export default{
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         this.loadData();
-        this.fullscreenLoading = false;
+        loading.close();
         this.$message.success('上传成功');
         this.$refs.upload.clearFiles();
       }else if(code === 1 && msg == null && data == null) {
-        this.fullscreenLoading = false;
+        loading.close();
         this.$message.error('数据存在错误，请检查文件中数据');
       }else {
-        this.fullscreenLoading = false;
+       loading.close();
         this.$message.error(msg);
       }
     },

src/views/platform/invoice/list.vue

@@ -102,6 +102,7 @@
           </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>
@@ -150,15 +151,18 @@
           <el-table-column
             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
             label="交易金额(元)"
+            width="120"
             show-overflow-tooltip>
             <template slot-scope="scope" show-overflow-tooltip>
                 <span>{{scope.row.fee / 100}}</span>
@@ -235,7 +239,7 @@ export default{
     }
   },
   created() {
-    this.heightt = tableHeight*0.5-50;
+    this.heightt = tableHeight*0.5+150;
     console.log(this.heightt)
     this.initCompanyList();
   },
@@ -368,11 +372,14 @@ export default{
 .list {
   border: 1px solid #d9d9d9;
   border-radius: 10px;
+  overflow-y: scroll;
+  height:100%;
 }
 .list .title {
   font-size: 5px;
   margin-bottom: 20px;
 }
+
 .list .top {
   padding-top: 20px;
   padding-left: 20px;

src/views/platform/waybill/history.vue

@@ -186,13 +186,13 @@
             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
             prop="failReason"
             label="失败原因"
@@ -308,9 +308,12 @@ export default{
                 this.$message.error('上传文件大小不能超过50MB!');
                 return false;
        }
-       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
-       
-      this.fullscreenLoading = true;
+      const loading = this.$loading({
+                                lock: true,
+                                text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                spinner: 'el-icon-loading',
+                                background: 'rgba(0, 0, 0, 0.7)'
+                              });
       const formData = new FormData();
       formData.append('customerName', this.formUserList.customerName);
       formData.append('file', this.formUserList.file);
@@ -318,13 +321,13 @@ export default{
        var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         this.loadData();
-        this.fullscreenLoading = false;
+        loading.close();
         this.$message.success('上传成功');
       }else if(code === 1 && msg == null && data == null) {
-        this.fullscreenLoading = false;
+        loading.close();
         this.$message.error('数据存在错误，请检查文件中数据');
       }else {
-        this.fullscreenLoading = false;
+        loading.close();
         this.$message.error(msg);
       }
     },
@@ -361,7 +364,7 @@ export default{
     async    exportExcel() {
           let curr = this.currenttwo;
       let pagesize1 = this.pagesizetwo;
-      this.currenttwo = 1; 
+      this.currenttwo = 1;
       this.pagesizetwo = this.totaltwo;
       await this.loadDataCar();
       // 设置当前日期
@@ -390,7 +393,7 @@ export default{
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
-       this.currenttwo = curr; 
+       this.currenttwo = curr;
       this.pagesizetwo = pagesize1;
       this.loadDataCar();
       return wbout;

src/views/platform/waybill/over.vue

@@ -16,7 +16,7 @@
                 :auto-upload="false">
                 <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
                 <el-button style="margin-left: 10px;" size="small" type="success" @click="batchUpload" v-loading.fullscreen.lock="fullscreenLoading">开票</el-button>
-              
+
               </el-upload>
 
             </div>
@@ -135,10 +135,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
@@ -242,9 +242,12 @@ export default{
                 this.$message.error('上传文件大小不能超过50MB!');
                 return false;
        }
-       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
-       
-      this.fullscreenLoading = true;
+       const loading = this.$loading({
+                                      lock: true,
+                                      text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                      spinner: 'el-icon-loading',
+                                      background: 'rgba(0, 0, 0, 0.7)'
+                                    });
       const formData = new FormData();
       formData.append('customerName', this.formUserList.customerName);
       formData.append('file', this.formUserList.file);
@@ -252,13 +255,13 @@ export default{
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         this.loadData();
-        this.fullscreenLoading = false;
+        loading.close();
         this.$message.success('上传成功');
       }else if(code === 1 && msg == null && data == null) {
-        this.fullscreenLoading = false;
+        loading.close();
         this.$message.error('数据存在错误，请检查文件中数据');
       }else {
-        this.fullscreenLoading = false;
+         loading.close();
         this.$message.error(msg);
       }
     },

src/views/platform/waybill/waybill.vue

@@ -25,7 +25,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="batchNum"></el-input>
               <el-button style="margin-left: 1%;" @click="DownloadTemplate">下载模板</el-button>
@@ -188,10 +188,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
@@ -273,7 +273,7 @@ export default{
           },
     // 列表展示
     async loadData() {
-    
+
        const formData = new FormData();
         formData.append('current', this.current);
         formData.append('size', this.pagesize);
@@ -309,8 +309,12 @@ export default{
                 this.$message.error('上传文件大小不能超过50MB!');
                 return false;
        }
-       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
-      this.fullscreenLoading = true;
+      const loading = this.$loading({
+                                           lock: true,
+                                           text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                                           spinner: 'el-icon-loading',
+                                           background: 'rgba(0, 0, 0, 0.7)'
+                                         });
       const formData = new FormData();
       formData.append('customerName', this.formUserList.customerName);
       formData.append('file', this.formUserList.file);
@@ -318,13 +322,13 @@ export default{
       var {data: { code, msg, data }} = response;
       if(code === 0 && msg === 'success') {
         this.loadData();
-        this.fullscreenLoading = false;
+        loading.close();
         this.$message.success('上传成功');
       }else if(code === 1 && msg == null && data == null) {
-        this.fullscreenLoading = false;
+       loading.close();
         this.$message.error('数据存在错误，请检查文件中数据');
       }else {
-        this.fullscreenLoading = false;
+       loading.close();
         this.$message.error(msg);
       }
     },
@@ -344,7 +348,7 @@ export default{
           },
     // 查看实时数据
     async loadDataCar() {
-    
+
         const formData = new FormData();
         formData.append('current', this.currenttwo);
         formData.append('size', this.pagesizetwo);
@@ -365,7 +369,7 @@ export default{
    async    exportExcel() {
           let curr = this.currenttwo;
       let pagesize1 = this.pagesizetwo;
-      this.currenttwo = 1; 
+      this.currenttwo = 1;
       this.pagesizetwo = this.totaltwo;
       await this.loadDataCar();
       // 设置当前日期
@@ -394,7 +398,7 @@ export default{
       } catch (e) {
         if (typeof console !== "undefined") console.log(e, wbout);
       }
-       this.currenttwo = curr; 
+       this.currenttwo = curr;
       this.pagesizetwo = pagesize1;
       this.loadDataCar();
       return wbout;

src/views/selfCar/invoice.vue

@@ -274,19 +274,24 @@ import XLSX from "xlsx";
                 this.$message.error('上传文件大小不能超过50MB!');
                 return false;
        }
-       this.$message.success('系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...');
-       
-          this.fullscreenLoading = true;
+
+
+           const loading = this.$loading({
+                          lock: true,
+                          text: '系统正在努力接收中，过程大概需要几分钟的时间，请您耐心等待...',
+                          spinner: 'el-icon-loading',
+                          background: 'rgba(0, 0, 0, 0.7)'
+                        });
           const formData = new FormData();
           formData.append('file', this.formUserList.file);
           const response = await this.$http.post(`selfCar/batchImportSelfcarInvoices`,formData);
           var {data: { code, msg, data }} = response;
           if(code === 0 && msg === '1') {
-              this.fullscreenLoading = false;
+               loading.close();
               this.invoiceTable = response.data.data;
               this.total = response.data.data.length;
           }else {
-            this.fullscreenLoading = false;
+            loading.close();
             this.$message.error('数据存在错误，请检查文件中数据');
           }
         },
@@ -305,7 +310,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();
       // 设置当前日期
@@ -334,7 +339,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;