前端代码合并提交

src/views/noCar/billway.vue

@@ -430,13 +430,16 @@ import XLSX from "xlsx";
                     let day = time.getDate();
                     let name = "无车运单查询列表_"+year + "" + month + "" + day;
                     let cloums = [
+                          {"title":"客户名称","key":"customerName"},
                           {"title":"企业编号","key":"companyNum"},
                           {"title":"公司名称","key":"companyName"},
                           {"title":"运单号","key":"billNum"},
                           {"title":"税号","key":"taxplayerCode"},
                           {"title":"车牌号码","key":"plateNum"},
                           {"title":"运单开始时间","key":"startTime"},
+                          {"title":"开始指令时间","key":"intfaceStartTime"},
                           {"title":"运单结束时间","key":"predictEndTime"},
+                          {"title":"结束指令时间","key":"interfaceEndTime"},
                           {"title":"运单开始地址","key":"sourceAddr"},
                           {"title":"运单结束地址","key":"destAddr"},
                           {"title":"运单费用(元)","key":"fee"},

src/views/noCar/billwayException.vue

@@ -51,6 +51,11 @@
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
+            prop="customerName"
+            label="客户名称"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
             prop="companyName"
             label="公司名称"
             show-overflow-tooltip>
@@ -67,12 +72,55 @@
 
           </el-table-column>
           <el-table-column
+            label="车牌号码"
+            prop="plateNum"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="startTime"
+            label="运单开始时间"
+            width="120"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="intfaceStartTime"
+            label="开始指令时间"
+            width="120"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="predictEndTime"
+            label="运单结束时间"
+            width="120"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
             prop="interfaceEndTime"
             label="结束指令时间"
             width="120"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
+            prop="sourceAddr"
+            label="运单开始地址"
+            width="120"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="destAddr"
+            label="运单结束地址"
+            width="120"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="fee"
+            label="运单费用"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+               <span>{{scope.row.fee/100| rounding}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
             prop="billwayStatus"
             label="运单状态"
             show-overflow-tooltip>

src/views/noCar/invoice.vue

@@ -268,7 +268,8 @@ import XLSX from "xlsx";
             formCondition:{
               invoiceCode:'',
               invoiceNum:'',
-              waybillNum:''
+              waybillNum:'',
+              plateNum:''
             },
             invoiceStatusA:[
             {"label":"待开票","value":"1"},
@@ -335,9 +336,11 @@ import XLSX from "xlsx";
       var billNums = '';
       var invoiceCodes = '';
       var invoiceNums = '';
+      var carNums = '';
       if (tabJson && tabJson.length > 0) {
-        this.xlsxJson = tabJson
-        this.fileList = this.xlsxJson[0].sheet
+        this.xlsxJson = tabJson;
+        this.fileList = this.xlsxJson[0].sheet;
+        debugger;
         this.fileList.forEach((item, index, arr) => {
            if(item['运单编号']!=null && item['运单编号']!='' && typeof item['运单编号']!='undefined'){
                billNums+= item['运单编号'].trim()+',';
@@ -352,6 +355,9 @@ import XLSX from "xlsx";
            }else{
              invoiceNums+= '#,';
            }
+           if(item['车牌号']!=null && item['车牌号']!='' && typeof item['车牌号']!='undefined'){
+               carNums+= item['车牌号'].trim()+',';
+           }
         });
 
       }
@@ -365,6 +371,9 @@ import XLSX from "xlsx";
       if(invoiceCodes!=''){
          this.formCondition.invoiceNum =invoiceNums.substring(0,invoiceNums.length-1);
       }
+      if(carNums!=null || carNums!=''){
+        this.formCondition.plateNum = carNums.substring(0,carNums.length-1);
+      }
     })
   },
   file2Xce (file) {