前端代码合并提交

src/config/globle.js

@@ -1,3 +1,3 @@
-window.hostUrl = "http://itest.jkcredit.com:80/";
-//window.hostUrl = "http://127.0.0.1:18080/"
+window.hostUrl = "http://invoice.jkcredit.com:80/";
+//window.hostUrl = "http://127.0.0.1:18081/"
 window.tableHeight =  (document.body.clientHeight*0.6-20);

src/views/noCar/billway.vue

@@ -7,6 +7,7 @@
                   <el-upload  :action="url" :http-request="importExcel" list-type="text" :show-file-list="false" >
                             <el-button  type="primary">导入参数</el-button>
                              <el-select style="margin-left: 120px;" v-model="noCarWayBill.billwayStatus" placeholder="运单状态">
+                               
                       <el-option
                         v-for="item in tradeStatus"
                         :key="item.value"
@@ -14,22 +15,21 @@
                         :value="item.value">
                       </el-option>
                 </el-select>
-                
                 </el-upload>
-
+ 
               </div>
 
               <div class="demo-input-suffix" style="margin-top: 5px;">
-                 
+                <el-input  placeholder="客户名称" class="input-demo" v-model="noCarWayBill.customerName"></el-input>
                <el-input  placeholder="公司名称" class="input-demo" v-model="noCarWayBill.companyName"></el-input>
                 <el-input  placeholder="税号" class="input-demo" v-model="noCarWayBill.taxplayerCode"></el-input>
-                <el-input  placeholder="车牌号" class="input-demo" v-model="noCarWayBill.plateNum"></el-input>
                 <el-input  placeholder="运单编号" class="input-demo" v-model="noCarWayBill.billNum"></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-input  placeholder="车牌号" class="input-demo" v-model="noCarWayBill.plateNum"></el-input>
                  <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>
                  <el-date-picker v-model="noCarWayBill.endBegin" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="运单上传结束指令始" end-placeholder="运单上传结束指令止"></el-date-picker>
                 <!-- <el-date-picker v-model="noCarWayBill.startEnd" type="date" placeholder="开始指令上传时间止"></el-date-picker>
@@ -58,6 +58,11 @@
               type="selection"
               width="55">
         </el-table-column>
+         <el-table-column
+            label="客户名称"
+            prop="customerName"
+            show-overflow-tooltip>
+          </el-table-column>
           <el-table-column
             label="企业编号"
             prop="companyNum"
@@ -379,7 +384,6 @@ import XLSX from "xlsx";
       formData.append('file', this.formUserList.file);
       const response = await this.$http.post(`noCar/batchImportNocarBillWay`,formData);
       var {data: { code, msg, data }} = response;
-      debugger
       if(code === 0 && msg === '1') {
          this.fullscreenLoading = false;
          this.billWayTable = response.data.data;
@@ -410,16 +414,21 @@ import XLSX from "xlsx";
                                spinner: 'el-icon-loading',
                                background: 'rgba(0, 0, 0, 0.7)'
                              });
-            
-            const formData = new FormData();
-            formData.append('current', 1);
-            formData.append('size', this.total);
-            for(var i in this.noCarWayBill){
-                formData.append(i,this.noCarWayBill[i]);
+             var recodes = [];
+            for(var j=1;j<=this.total/10000+1;j++){
+               const formData = new FormData();
+                formData.append('current', j);
+                formData.append('size', 10000);
+                for(var i in this.noCarWayBill){
+                    formData.append(i,this.noCarWayBill[i]);
+                }
+                const response = await this.$http.post(`noCar/findBillWay`, formData);
+                if (response.data.code === 0) {
+                recodes = recodes.concat(response.data.data.records);
+                }
             }
-
-            const response = await this.$http.post(`noCar/findBillWay`, formData);
-            if (response.data.code === 0) {
+           
+            
                // 设置当前日期
                     let time = new Date();
                     //console.log(time);
@@ -442,9 +451,8 @@ import XLSX from "xlsx";
                           {"title":"失败原因","key":"failReason"},
                           {"title":"运单类型","key":"hisFlag"},
                     ];
-                    debugger;
-                    await this.exportExcelComm(cloums,response.data.data.records,name,loading);
-            }
+                    await this.exportExcelComm(cloums,recodes,name,loading);
+            
           },
           formatJson (filterVal, jsonData) {
             return jsonData.map(v => filterVal.map(j => {
@@ -486,8 +494,11 @@ import XLSX from "xlsx";
                           tHeader.push(item.title)
                           filterVal.push(item.key)
                       })
-                      const data = this.formatJson(filterVal, list);
-                      export_json_to_excel(tHeader, data, excelName);
+                      for(var i =0;i<list.length/100000;i++){
+                        const data = this.formatJson(filterVal, list.slice(i*100000,(i+1)*100000>list.length?list.length:(i+1)*100000));
+                        export_json_to_excel(tHeader, data, excelName+'_'+i);
+                      }
+                      
                       loading.close();
                   })
             }

src/views/noCar/invoice.vue

@@ -9,12 +9,14 @@
                 </el-upload>
 
               <div class="demo-input-suffix" style="margin-top: 5px;">
+                 <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customerName"></el-input>
                 <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.companyName"></el-input>
                 <el-input  placeholder="运单编号" class="input-demo" v-model="formCondition.waybillNum"></el-input>
                 <el-input  placeholder="税号" class="input-demo" v-model="formCondition.buyerTaxpayerCode"></el-input>
-                <el-input  placeholder="车牌号" class="input-demo" v-model="formCondition.plateNum"></el-input>
+               
               </div>
               <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
+                 <el-input  placeholder="车牌号" class="input-demo" v-model="formCondition.plateNum"></el-input>
                 <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>
 
@@ -42,6 +44,11 @@
           border
           tooltip-effect="dark">
           <el-table-column
+            label="客户名称"
+            prop="customerName"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
             label="企业编号"
             prop="companyNum"
             show-overflow-tooltip>
@@ -472,15 +479,21 @@ import XLSX from "xlsx";
                                spinner: 'el-icon-loading',
                                background: 'rgba(0, 0, 0, 0.7)'
                              });
-            
-             const formData = new FormData();
-            formData.append('current', 1);
-            formData.append('size', this.total);
-             for(var i in this.formCondition){
-                formData.append(i,this.formCondition[i]);
+            var recodes = [];                 
+            for(var j=1;j<=this.total/10000+1;j++){ 
+              
+              const formData = new FormData();
+              formData.append('current', j);
+              formData.append('size', 10000);
+              for(var i in this.formCondition){
+                  formData.append(i,this.formCondition[i]);
+              }
+              const response = await this.$http.post('noCar/findNocarInvoices', formData);
+               if (response.data.code === 0) {
+                recodes = recodes.concat(response.data.data.records);
+                }
             }
-            const response = await this.$http.post('noCar/findNocarInvoices', formData);
-            if (response.data.code === 0) {
+           
                // 设置当前日期
                     let time = new Date();
                     //console.log(time);
@@ -516,9 +529,8 @@ import XLSX from "xlsx";
                       {"title":"下载地址","key":"invoiceUrl"}  
                          
                     ];
-                    debugger;
-                    await this.exportExcelComm(cloums,response.data.data.records,name,loading)
-            }
+                    this.exportExcelComm(cloums,recodes,name,loading)
+            
           },
           formatJson (filterVal, jsonData) {
             return jsonData.map(v => filterVal.map(j => {
@@ -560,9 +572,11 @@ import XLSX from "xlsx";
                           tHeader.push(item.title)
                           filterVal.push(item.key)
                       })
-                      const data = this.formatJson(filterVal, list);
-                      debugger;
-                      export_json_to_excel(tHeader, data, excelName);
+                     
+                     for(var i =0;i<list.length/50000;i++){
+                      const data = this.formatJson(filterVal, list.slice(i*50000,(i+1)*50000>list.length?list.length:(i+1)*50000));
+                      export_json_to_excel(tHeader, data, excelName+'_'+i);
+                     }
                       loading.close();
                   })
             }

src/views/noCar/mothaccount.vue

@@ -8,6 +8,7 @@
               <el-input  placeholder="企业名称" class="input-demo" v-model="formCondition.companyName"></el-input>
               <el-date-picker v-model="formCondition.tradeMonth" type="month" value-format="yyyy-MM" placeholder="选择月份"> </el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+               <el-button type="success" style="margin-left: 1%;" @click="updateData">更新(运维)</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
             </div>
           </el-col>
@@ -116,6 +117,22 @@ import XLSX from "xlsx";
                           });
             }
           },
+           async updateData() {
+            this.formCondition['pageNo'] = 1;
+            const response = await this.$http.post('noCarService/monthAccUpdate', this.formCondition);
+            debugger;
+            if (response.data.code === 0) {
+               this.$message({
+                  type: 'success',
+                  message: '更新成功'
+              });
+            }else{
+              this.$message({
+                              type: 'error',
+                              message: ''+response.data.msg
+                          });
+            }
+          },
           // 分页方法
           handleSizeChange(val) {
             this.pagesize = val;

src/views/platform/apply/already.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-select style="width:170px" v-model="formList.companyName" placeholder="请选择公司名称">
+              <el-select style="width:170px" v-model="formList.companyName" filterable  placeholder="请选择公司名称">
                 <el-option
                   v-for="item in companyList"
                   :key="item.companyName"

src/views/platform/apply/apply.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top" style="margin-left:15px">
-              <el-select v-model="companyName" placeholder="请选择公司名称">
+              <el-select v-model="companyName" filterable  placeholder="请选择公司名称">
                 <el-option
                   v-for="item in companyList"
                   :key="item.companyName"

src/views/platform/apply/packaging.vue

@@ -6,7 +6,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-select v-model="formPackList.companyName" placeholder="请选择公司名称">
+              <el-select v-model="formPackList.companyName" filterable  placeholder="请选择公司名称">
                 <el-option
                   v-for="item in companyList"
                   :key="item.companyName"

src/views/platform/apply/selfCarTrade.vue

@@ -5,7 +5,7 @@
           <el-col :span="24">
             <div class="top">
                <div class="demo-input-suffix">
-                <el-select v-model="formCondition.companyName" placeholder="请选择公司名称">
+                <el-select v-model="formCondition.companyName" filterable  placeholder="请选择公司名称">
                 <el-option
                   v-for="item in companyList"
                   :key="item.companyName"
@@ -139,7 +139,6 @@ import XLSX from "xlsx";
           this.formCondition.customId = sessionStorage.getItem('userName');
           this.heightt = tableHeight;
            this.initCompanyList();
-          this.loadData();
         },
         filters: {
             rounding (value) {
@@ -189,6 +188,7 @@ import XLSX from "xlsx";
                                                    this.companyList = [{'companyName':'.'}];
                                                  }
             this.formCondition.companyName = this.companyList[0]['companyName'];
+             this.loadData();
           },
           // 分页方法
           handleSizeChange(val) {

src/views/platform/carbinding/carbinding.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-select v-model="formList.companyName" placeholder="请输入公司名称">
+               <el-select v-model="formList.companyName" filterable  placeholder="请输入公司名称">
                 <el-option
                   v-for="item in companyList"
                   :key="item.companyName"

src/views/platform/carbinding/carbindinglist.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-select v-model="formList.companyName" placeholder="请输入公司名称">
+              <el-select v-model="formList.companyName" filterable  placeholder="请输入公司名称">
                 <el-option
                   v-for="item in companyList"
                   :key="item.companyName"

src/views/platform/waybillmanagement/noinvoice.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-select v-model="companyName" placeholder="请选择公司名称">
+              <el-select v-model="companyName" filterable  placeholder="请选择公司名称">
                 <el-option
                   v-for="item in companyList"
                   :key="item.companyName"

src/views/platform/waybillmanagement/trueinvoice.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-select v-model="companyName" placeholder="请选择公司名称">
+               <el-select v-model="companyName" filterable  placeholder="请选择公司名称">
                 <el-option
                   v-for="item in companyList"
                   :key="item.companyName"

src/views/platform/waybillmanagement/waybillList.vue

@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-select v-model="companyName" placeholder="请选择公司名称">
+              <el-select v-model="companyName" filterable  placeholder="请选择公司名称">
                 <el-option
                   v-for="item in companyList"
                   :key="item.companyName"