前端代码合并提交

src/views/customer/Customer.vue

@@ -171,7 +171,7 @@
         @close="addCustomerClose"
         :visible.sync="recVisList"
         style="font-size: 0px;">
-        <div class="tou">客户--备案列表  <el-button type="success" size="small" style="margin-left: 1%;" @click="showAddCustomerRec">添加</el-button></div>
+        <div class="tou">客户--备案列表 <el-input  placeholder="公司名称"  class="input-demo" v-model="customer.company"></el-input> <el-button type="success"  style="margin-left: 1%;" @click="queryCustomerRec">查询</el-button> <el-button type="success"  style="margin-left: 1%;" @click="showAddCustomerRec">添加</el-button></div>
         <div class="line"></div>
 
          <!-- 表格部分 -->
@@ -951,6 +951,12 @@ import XLSX from "xlsx";
 
             this.recVisList = true;
           },
+          async queryCustomerRec(){
+            const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":this.customer.customerName,"companyName":this.customer.company});
+            if (response.data.code === 0) {
+              this.customeRecQueryListTable = response.data.data;
+            }
+          },
           async carInfo(recoder){
             const response = await this.$http.post(`lowerService/customerCarRecQuery`, {"customerName":recoder.customerName});
             if (response.data.code === 0) {

src/views/noCar/billway.vue

@@ -14,15 +14,17 @@
                         :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.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-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>
 
@@ -76,6 +78,11 @@
             label="税号"
             show-overflow-tooltip>
           </el-table-column>
+           <el-table-column
+            label="车牌号码"
+            prop="plateNum"
+            show-overflow-tooltip>
+          </el-table-column>
           <el-table-column
             prop="startTime"
             label="运单开始时间"
@@ -456,7 +463,7 @@ import XLSX from "xlsx";
 }
 .billWay_container .input-demo {
   display: inline-block;
-  width: 20%;
+  width: 15%;
   margin-left: 1%;
 }
 .billWay_container .block {