前端代码合并提交

src/views/noCar/hcInvoice.vue

@@ -107,7 +107,7 @@ import XLSX from "xlsx";
         },
         created() {
           this.heightt = tableHeight+100;
-          
+
         },
         filters: {
             rounding (value) {
@@ -180,7 +180,7 @@ import XLSX from "xlsx";
           formartNum(wb){
             var sheet = wb['Sheets']['Sheet1'];
             var replaceTemp = [];
-           
+
             for(var i in sheet){
               if(sheet[i]['v'] == '金额'){
                 replaceTemp.push(i.replace(/[0-9]/g,''));
@@ -258,7 +258,7 @@ import XLSX from "xlsx";
 }
 .invoice_container .input-demo {
   display: inline-block;
-  width: 20%;
+  width: 15%;
   margin-left: 1%;
 }
 .invoice_container .block {

src/views/noCar/invoice.vue

@@ -14,7 +14,7 @@
                 <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-select class="input-demo" v-model="formCondition.invoiceStatus" placeholder="发票状态">
-                               
+
                       <el-option
                         v-for="item in invoiceStatusA"
                         :key="item.value"
@@ -22,7 +22,7 @@
                         :value="item.value">
                       </el-option>
                 </el-select>
-               
+
               </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>
@@ -269,8 +269,8 @@ import XLSX from "xlsx";
               invoiceCode:'',
               invoiceNum:'',
               waybillNum:''
-            },            
-            invoiceStatusA:[ 
+            },
+            invoiceStatusA:[
             {"label":"待开票","value":"1"},
             {"label":"开票中","value":"2"},
             {"label":"开票完成","value":"3"}
@@ -315,7 +315,7 @@ import XLSX from "xlsx";
             }
           },
           importExcel (content) {
-            
+
     const file = content.file
     // let file = file.files[0] // 使用传统的input方法需要加上这一步
     const filename = file.name
@@ -452,7 +452,7 @@ import XLSX from "xlsx";
           formartNum(wb){
             var sheet = wb['Sheets']['Sheet1'];
             var replaceTemp = [];
-        
+
             for(var i in sheet){
               if(sheet[i]['v'] == '交易金额'||sheet[i]['v'] == "价税合计"||sheet[i]['v'] == "税额"||sheet[i]['v'] == "金额"||sheet[i]['v'] == "税率"){
                 replaceTemp.push(i.replace(/[0-9]/g,''));
@@ -513,9 +513,9 @@ import XLSX from "xlsx";
                                spinner: 'el-icon-loading',
                                background: 'rgba(0, 0, 0, 0.7)'
                              });
-            var recodes = [];                 
-            for(var j=1;j<=this.total/10000+1;j++){ 
-              
+            var recodes = [];
+            for(var j=1;j<=this.total/10000+1;j++){
+
               const formData = new FormData();
               formData.append('current', j);
               formData.append('size', 10000);
@@ -527,7 +527,7 @@ import XLSX from "xlsx";
                 recodes = recodes.concat(response.data.data.records);
                 }
             }
-           
+
                // 设置当前日期
                     let time = new Date();
                     let year = time.getFullYear();
@@ -549,7 +549,7 @@ import XLSX from "xlsx";
                       {"title":"发票代码","key":"invoiceCode"},
                       {"title":"发票号码","key":"invoiceNum"},
                       {"title":"交易Id","key":"transactionId"},
-                      {"title":"开票时间","key":"invoiceMakeTime"},      
+                      {"title":"开票时间","key":"invoiceMakeTime"},
                       {"title":"交易时间","key":"exTime"},
                       {"title":"交易金额(元)","key":"fee"},
                       {"title":"价税合计(元)","key":"totalAmount"},
@@ -562,11 +562,11 @@ import XLSX from "xlsx";
                       {"title":"发票状态信息","key":"msg"},
                       {"title":"预览地址","key":"invoiceHtmlUrl"},
                       {"title":"下载地址","key":"invoiceUrl"}
-                  
-                         
+
+
                     ];
                     this.exportExcelComm(cloums,recodes,name,loading)
-            
+
           },
           formatJson (filterVal, jsonData) {
             return jsonData.map(v => filterVal.map(j => {
@@ -600,12 +600,12 @@ import XLSX from "xlsx";
                   return v[j]/100;
               }else if(j =='amount'){
                   return v[j]/100;
-              }else if(j=='waybillNum'){
+              }else if(j=='waybillNum' || j=='invoiceCode' || j=='invoiceNum'){
                  return v[j]+'\t';
               }else{
                   return v[j];
               }
-              
+
               }));
           },
           // 导出Excel
@@ -616,7 +616,7 @@ import XLSX from "xlsx";
                           tHeader.push(item.title)
                           filterVal.push(item.key)
                       })
-                     
+
                      const data = this.formatJson(filterVal,list);
                       data.unshift(tHeader);
                      CsvExportor.downloadCsv(data, { tHeader }, excelName+".csv");

src/views/noCar/mothaccount.vue

@@ -107,7 +107,7 @@ import XLSX from "xlsx";
           async loadData() {
             this.formCondition['pageNo'] = this.current;
             const response = await this.$http.post('noCarService/monthAccQuery', this.formCondition);
-          
+
             if (response.data.code === 0) {
               this.invoiceTable = response.data.data.result;
               this.total = response.data.data.totalCount;
@@ -121,7 +121,7 @@ import XLSX from "xlsx";
            async updateData() {
             this.formCondition['pageNo'] = 1;
             const response = await this.$http.post('noCarService/monthAccUpdate', this.formCondition);
-          
+
             if (response.data.code === 0) {
                this.$message({
                   type: 'success',
@@ -146,7 +146,7 @@ import XLSX from "xlsx";
           formartNum(wb){
             var sheet = wb['Sheets']['Sheet1'];
             var replaceTemp = [];
-           
+
             for(var i in sheet){
               if(sheet[i]['v'] == '金额'){
                 replaceTemp.push(i.replace(/[0-9]/g,''));
@@ -165,7 +165,7 @@ import XLSX from "xlsx";
                               background: 'rgba(0, 0, 0, 0.7)'
                             });
         const response = await this.$http.post('noCarService/monthAccQueryAll');
-        
+
         if (response.data.code === 0) {
             let recodes = response.data.data;
             let time = new Date();
@@ -197,7 +197,7 @@ import XLSX from "xlsx";
               }else{
                   return v[j];
               }
-              
+
               }));
           },
           // 导出Excel
@@ -208,7 +208,7 @@ import XLSX from "xlsx";
                           tHeader.push(item.title)
                           filterVal.push(item.key)
                       })
-                     
+
                      const data = this.formatJson(filterVal,list);
                       data.unshift(tHeader);
                      CsvExportor.downloadCsv(data, { tHeader }, excelName+".csv");
@@ -238,7 +238,7 @@ import XLSX from "xlsx";
 }
 .invoice_container .input-demo {
   display: inline-block;
-  width: 20%;
+  width: 15%;
   margin-left: 1%;
 }
 .invoice_container .block {

src/views/selfCar/invoice.vue

@@ -405,7 +405,7 @@ importExcel (content) {
           formartNum(wb){
             var sheet = wb['Sheets']['Sheet1'];
             var replaceTemp = [];
-           
+
             for(var i in sheet){
               if(sheet[i]['v'] == "价税合计"||sheet[i]['v'] == "税额"||sheet[i]['v'] == "金额"||sheet[i]['v'] == "税率"||sheet[i]['v'] == "交易金额"){
                 replaceTemp.push(i.replace(/[0-9]/g,''));
@@ -423,10 +423,10 @@ importExcel (content) {
                                spinner: 'el-icon-loading',
                                background: 'rgba(0, 0, 0, 0.7)'
                              });
-            var recodes = [];  
-            debugger;               
-            for(var j=1;j<=this.total/10000+1;j++){ 
-              
+            var recodes = [];
+            debugger;
+            for(var j=1;j<=this.total/10000+1;j++){
+
               const formData = new FormData();
               formData.append('current', j);
               formData.append('size', 10000);
@@ -438,7 +438,7 @@ importExcel (content) {
                 recodes = recodes.concat(response.data.data.records);
                 }
             }
-           
+
                // 设置当前日期
                     let time = new Date();
                     let year = time.getFullYear();
@@ -458,7 +458,7 @@ importExcel (content) {
                       {"title":"出口收费站","key":"exStation"},
                       {"title":"发票代码","key":"invoiceCode"},
                       {"title":"发票号码","key":"invoiceNum"},
-                      {"title":"开票时间","key":"invoiceMakeTime"},      
+                      {"title":"开票时间","key":"invoiceMakeTime"},
                       {"title":"交易时间","key":"exTime"},
                       {"title":"交易金额(元)","key":"fee"},
                       {"title":"价税合计(元)","key":"totalAmount"},
@@ -468,11 +468,11 @@ importExcel (content) {
                       {"title":"扣费时间","key":"calculateTime"},
                       {"title":"交易状态","key":"tradeStatus"},
                       {"title":"预览地址","key":"invoiceHtmlUrl"},
-                      {"title":"下载地址","key":"invoiceUrl"}  
-                         
+                      {"title":"下载地址","key":"invoiceUrl"}
+
                     ];
                     this.exportExcelComm(cloums,recodes,name,loading)
-            
+
           },
           formatJson (filterVal, jsonData) {
             return jsonData.map(v => filterVal.map(j => {
@@ -492,12 +492,12 @@ importExcel (content) {
                   return v[j]/100;
               }else if(j =='amount'){
                   return v[j]/100;
-              }else if(j=='sellerTaxpayerCode' || j=='cardId' ){
+              }else if(j=='sellerTaxpayerCode' || j=='cardId' || j=='invoiceCode' || j=='invoiceNum' ){
                  return v[j]+'\t';
               }else{
                   return v[j];
               }
-              
+
               }));
           },
           // 导出Excel
@@ -508,7 +508,7 @@ importExcel (content) {
                           tHeader.push(item.title)
                           filterVal.push(item.key)
                       })
-                     
+
                      const data = this.formatJson(filterVal,list);
                       data.unshift(tHeader);
                      CsvExportor.downloadCsv(data, { tHeader }, excelName+".csv");
@@ -538,7 +538,7 @@ importExcel (content) {
 }
 .invoice_container .input-demo {
   display: inline-block;
-  width: 20%;
+  width: 15%;
   margin-left: 1%;
 }
 .invoice_container .block {