前端代码提交

src/views/customer/Customer.vue

@@ -4,8 +4,7 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="用户" class="input-demo" v-model="formCondition.customName"></el-input>
-              <el-input  placeholder="部门" class="input-demo" v-model="formCondition.startTime"></el-input>
+              <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customName"></el-input>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
                 <el-button type="success" style="margin-left: 1%;" @click="addCustomerShow = true">添加</el-button>
             </div>
@@ -165,11 +164,16 @@
             prop="customerName"
             show-overflow-tooltip>
           </el-table-column>
-           <!-- <el-table-column
-            prop="companyLeader"
-            label="公司负责人"
+           <el-table-column
+            prop="companyNum"
+            label="企业编号"
             show-overflow-tooltip>
-          </el-table-column> -->
+          </el-table-column>
+          <el-table-column
+            prop="contrantNum"
+            label="协议编号"
+            show-overflow-tooltip>
+          </el-table-column>
           <el-table-column
             prop="companyName"
             label="公司名称"
@@ -404,7 +408,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="customerRecConform" type="primary">信息上传</el-button>
-          <el-button type="primary" @click="changeStatusM">生成文档</el-button>
+          <el-button type="primary" @click="generateWord">生成文档</el-button>
         </div>
       </el-dialog>
        <el-dialog
@@ -862,6 +866,11 @@
                     });
                   }
           },
+          generateWord(){
+            const BASEURL = "http://127.0.0.1:18080/"
+            const token = sessionStorage.getItem('token');
+            window.open(BASEURL+'customer/generateWord?customerRecId='+this.customerRec['id']+'&token='+token);
+          },
           async customerRecConform(){
              const response = await this.$http.post(`customer/customeRec`, this.customerRec);
              debugger

src/views/noCar/billway.vue

@@ -4,12 +4,21 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-input  placeholder="企业" class="input-demo" v-model="noCarWayBill.companyName"></el-input>
-                <el-select v-model="noCarWayBill.historyFlag" placeholder="请选择类型">
-                      <el-option v-for="item in optionone" :key="item.value" :label="item.label" :value="item.value"/>
-                </el-select>
+              <div class="demo-input-suffix">
+               <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>
+              </div>
+              <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
+                 <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>
+                 <el-date-picker v-model="noCarWayBill.startBegin"  type="date" placeholder="开始指令上传时间始"></el-date-picker> -->
+                <!-- <el-date-picker v-model="noCarWayBill.endBegin" type="date" placeholder="结束指令上传时间始"></el-date-picker>
+                <el-date-picker v-model="noCarWayBill.endEnd" type="date" placeholder="结束指令上传时间止"></el-date-picker> -->
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
-               <el-button type="success" style="margin-left: 1%;">重新(待实现)</el-button>
+               <el-button type="success" style="margin-left: 1%;" @click="updateStatus">更新状态</el-button>
+              </div>
             </div>
           </el-col>
         </el-row>
@@ -24,13 +33,13 @@
           border
           tooltip-effect="dark">
           <el-table-column
-            label="客户名称"
-            prop="customerName"
+            label="企业编号"
+            prop="companyNum"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
             prop="companyName"
-            label="公司名称"
+            label="客戶名称"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -38,9 +47,9 @@
             label="运单编号"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="plateNum"
-            label="车牌号"
+           <el-table-column
+            prop="taxplayerCode"
+            label="税号"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -49,9 +58,21 @@
             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="预计完成时间"
+            label="运单结束时间"
+            width="120"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="interfaceEndTime"
+            label="结束指令时间"
             width="120"
             show-overflow-tooltip>
           </el-table-column>
@@ -63,7 +84,7 @@
           </el-table-column>
            <el-table-column
             prop="destAddr"
-            label="运单目的地址"
+            label="运单结束地址"
             width="120"
             show-overflow-tooltip>
           </el-table-column>
@@ -72,23 +93,31 @@
             label="运单费用"
             show-overflow-tooltip>
           </el-table-column>
-           <el-table-column
-            prop="taxplayerCode"
-            label="税号"
-            show-overflow-tooltip>
-            
-          </el-table-column>
+          
           <el-table-column
             prop="billwayStatus"
             label="运单状态"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.billwayStatus == 1" style="color: green">开票中</span>
-              <span v-else-if="scope.row.billwayStatus == -2" style="color: red">运单超时</span>
-              <span v-else-if="scope.row.billwayStatus == -1" style="color: green">指令开始</span>
-              <span v-else-if="scope.row.billwayStatus == 0" style="color: green">指令结束</span>
+              <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
+              <span v-else-if="scope.row.billwayStatus == 2" style="color: green">开票中</span>
               <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
-              <span v-else-if="scope.row.billwayStatus == 2" style="color: red">作废</span>
+              <span v-else-if="scope.row.billwayStatus == 4" style="color: red">超时运单</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="updateTime"
+            label="最后更新时间"
+            width="120"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="hisFlag"
+            label="运单类型"
+            show-overflow-tooltip>
+             <template slot-scope="scope">
+              <span v-if="scope.row.hisFlag == 0" >实时运单</span>
+              <span v-else-if="scope.row.hisFlag == 1">历史运单</span>
             </template>
           </el-table-column>
         </el-table>
@@ -112,8 +141,6 @@
         data(){
           return{
             noCarWayBill:{
-              companyName:'',
-              historyFlag:0
             },
              optionone: [{
               value: 0,
@@ -137,13 +164,31 @@
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-            formData.append('hisFlag',this.noCarWayBill.historyFlag);
+            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) {
               this.billWayTable = response.data.data.records;
               this.total = response.data.data.total;
             }
           },
+         async updateStatus(){
+            const response = await this.$http.post(`noCar/updateStatus`);
+                  if(response.data.code === 0) {
+                    this.loadData();
+                    this.$message({
+                      type: 'success',
+                      message: '更新成功'
+                    });
+                  }else {
+                    this.$message({
+                      type: 'error',
+                      message: '更新失败'
+                    });
+                  }
+          },
           // 分页方法
           handleSizeChange(val) {
             this.pagesize = val;

src/views/noCar/billwayException.vue

@@ -4,12 +4,20 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-input  placeholder="企业" class="input-demo" v-model="formCondition.companyName"></el-input>
-                <el-select v-model="formCondition.historyFlag" placeholder="请选择类型">
-                      <el-option v-for="item in optionone" :key="item.value" :label="item.label" :value="item.value"/>
-                </el-select>
+                <div class="demo-input-suffix">
+               <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>
+              </div>
+              <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
+                 <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>
+                 <el-date-picker v-model="noCarWayBill.startBegin"  type="date" placeholder="开始指令上传时间始"></el-date-picker> -->
+                <!-- <el-date-picker v-model="noCarWayBill.endBegin" type="date" placeholder="结束指令上传时间始"></el-date-picker>
+                <el-date-picker v-model="noCarWayBill.endEnd" type="date" 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="updateStatus">更新状态</el-button>
+              </div>
             </div>
           </el-col>
         </el-row>
@@ -24,13 +32,13 @@
           border
           tooltip-effect="dark">
           <el-table-column
-            label="客户名称"
-            prop="customerName"
+            label="企业编号"
+            prop="companyNum"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
             prop="companyName"
-            label="公司名称"
+            label="客戶名称"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -38,57 +46,48 @@
             label="运单编号"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="plateNum"
-            label="车牌号"
+           <el-table-column
+            prop="taxplayerCode"
+            label="税号"
             show-overflow-tooltip>
+            
           </el-table-column>
           <el-table-column
-            prop="startTime"
-            label="运单开始时间"
+            prop="interfaceEndTime"
+            label="结束指令时间"
             width="120"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="predictEndTime"
-            label="预计完成时间"
-            width="120"
+            prop="billwayStatus"
+            label="运单状态"
             show-overflow-tooltip>
+             <template slot-scope="scope">
+              <span v-if="scope.row.billwayStatus == 1" style="color: green">未结束</span>
+              <span v-else-if="scope.row.billwayStatus == 2" style="color: green">开票中</span>
+              <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
+              <span v-else-if="scope.row.billwayStatus == 4" style="color: red">超时运单</span>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="sourceAddr"
-            label="运单开始地址"
+            prop="updateTime"
+            label="最后更新时间"
             width="120"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
-            prop="destAddr"
-            label="运单目的地址"
+            prop="updateTime"
+            label="超长时间(天)"
             width="120"
             show-overflow-tooltip>
           </el-table-column>
-           <el-table-column
-            prop="fee"
-            label="运单费用"
-            show-overflow-tooltip>
-          </el-table-column>
-           <el-table-column
-            prop="taxplayerCode"
-            label="税号"
-            show-overflow-tooltip>
-            
-          </el-table-column>
           <el-table-column
-            prop="billwayStatus"
-            label="运单状态"
+            prop="hisFlag"
+            label="运单类型"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.recStatus == 1" style="color: green">开票中</span>
-              <span v-else-if="scope.row.recStatus == -2" style="color: red">运单超时</span>
-              <span v-else-if="scope.row.recStatus == -1" style="color: red">指令开始</span>
-              <span v-else-if="scope.row.recStatus == 0" style="color: red">指令结束</span>
-              <span v-else-if="scope.row.recStatus == 3" style="color: red">开票完成</span>
-              <span v-else-if="scope.row.recStatus == 2" style="color: red">作废</span>
+              <span v-if="scope.row.hisFlag == 0" >实时运单</span>
+              <span v-else-if="scope.row.hisFlag == 1">历史运单</span>
             </template>
           </el-table-column>
         </el-table>
@@ -111,9 +110,8 @@
       export default {
         data(){
           return{
-            formCondition:{
-              companyName:'',
-              historyFlag:0
+            noCarWayBill:{
+              
             },
              optionone: [{
               value: 0,
@@ -137,13 +135,30 @@
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+            for(var i in this.noCarWayBill){
+                formData.append(i,this.noCarWayBill[i]);
+            }
             const response = await this.$http.post(`noCar/findBillWayException`, formData);
             if (response.data.code === 0) {
               this.billWayTable = response.data.data.records;
               this.total = response.data.data.total;
             }
           },
+           async updateStatus(){
+            const response = await this.$http.post(`noCar/updateStatus`);
+                  if(response.data.code === 0) {
+                    this.loadData();
+                    this.$message({
+                      type: 'success',
+                      message: '更新成功'
+                    });
+                  }else {
+                    this.$message({
+                      type: 'error',
+                      message: '更新失败'
+                    });
+                  }
+           },
           // 分页方法
           handleSizeChange(val) {
             this.pagesize = val;

src/views/noCar/hcInvoice.vue

@@ -4,9 +4,9 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <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="月份 2021-07" class="input-demo" v-model="formCondition.month"></el-input>
+              <!-- <el-input  placeholder="客户" class="input-demo" v-model="formCondition.customerName"></el-input> -->
+              <el-input  placeholder="企业编号" class="input-demo" v-model="formCondition.companyNum"></el-input>
+              <el-date-picker v-model="formCondition.month" type="month" placeholder="选择月份"> </el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
             </div>
           </el-col>
@@ -72,9 +72,6 @@
         data(){
           return{
             formCondition:{
-              companyName:'',
-              customerName:'',
-              month:''
             },
            invoiceTable:[],
           }

src/views/noCar/invoice.vue

@@ -4,8 +4,18 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="企业" class="input-demo" v-model="formCondition.companyName"></el-input>
-               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+              <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>
+                <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-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-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-left: 1%;" @click="loadData">查询</el-button>
+              </div>
             </div>
           </el-col>
         </el-row>
@@ -20,13 +30,13 @@
           border
           tooltip-effect="dark">
           <el-table-column
-            label="客户名称"
-            prop="customerName"
+            label="企业编号"
+            prop="companyNum"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
             prop="companyName"
-            label="公司名称"
+            label="客户名称"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -34,6 +44,16 @@
             label="运单号"
             show-overflow-tooltip>
           </el-table-column>
+           <el-table-column
+            prop="buyerTaxpayerCode"
+            label="购方税号"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="plateNum"
+            label="车牌号"
+            show-overflow-tooltip>
+          </el-table-column>
           <el-table-column
             prop="waybillStartTime"
             label="运单开始时间"
@@ -47,8 +67,15 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="transactionId"
-            label="交易Id"
+            prop="enStation"
+            label="入口收费站"
+             width="100"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="exStation"
+            label="出口收费站"
+             width="100"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -61,50 +88,38 @@
             label="发票号码"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="invoiceMakeTime"
-            label="开票时间"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            prop="invoiceUrl"
-            label="下载地址"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            prop="enStation"
-            label="入口收费站"
-             width="100"
+           <el-table-column
+            prop="transactionId"
+            label="交易Id"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="exStation"
-            label="出口收费站"
-             width="100"
+            prop="invoiceMakeTime"
+            label="开票时间"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
+           <el-table-column
             prop="exTime"
             label="交易时间"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="plateNum"
-            label="车牌号"
+           <el-table-column
+            prop="fee"
+            label="交易金额"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="sellerName"
-            label="销方名称"
+           <el-table-column
+            prop="totalAmount"
+            label="价税合计"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="sellerTaxpayerCode"
-            label="销方税号"
+           <el-table-column
+            prop="totalTaxAmount"
+            label="税额"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="fee"
+           <el-table-column
+            prop="amount"
             label="金额"
             show-overflow-tooltip>
           </el-table-column>
@@ -113,14 +128,15 @@
             label="税率"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="totalTaxAmount"
-            label="税额"
+         
+         <el-table-column
+            prop="invoiceHtmlUrl"
+            label="预览地址"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="totalAmount"
-            label="价税合计"
+            prop="invoiceUrl"
+            label="下载地址"
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
@@ -144,7 +160,6 @@
         data(){
           return{
             formCondition:{
-              companyName:''
             },
            invoiceTable:[],
             current: 1,
@@ -161,7 +176,9 @@
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+             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) {
               this.invoiceTable = response.data.data.records;

src/views/noCar/nocarRec.vue

@@ -4,8 +4,8 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="客户" class="input-demo" v-model="customerName"></el-input>
-              <el-input  placeholder="企业" class="input-demo" v-model="companyName"></el-input>
+              <el-input  placeholder="公司名称" class="input-demo" v-model="companyName"></el-input>
+              <el-input  placeholder="车牌号" class="input-demo" v-model="carNum"></el-input>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
             </div>
           </el-col>
@@ -119,7 +119,7 @@
           return{
             nocarRecCarTable:[],
             companyName:'',
-            customerName:'',
+            carNum:'',
             current: 1,
             pagesize: 8,
             total:''
@@ -135,7 +135,7 @@
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
             formData.append('companyName', this.companyName);
-            formData.append('customerName', this.customerName);
+            formData.append('carNum', this.carNum);
             formData.append('businessType', 2);
             const response = await this.$http.post(`noCar/findCarRec`, formData);
             if (response.data.code === 0) {

src/views/selfCar/selfCarTrade.vue

@@ -19,29 +19,29 @@
            height="370px"
           border
           tooltip-effect="dark">
-          <el-table-column
-            label="客户名称"
-            prop="customId"
+         <el-table-column
+            label="企业编号"
+            prop="companyNum"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
             prop="companyName"
-            label="公司名称"
+            label="客户名称"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="cardId"
-            label="ETC卡号"
+           <el-table-column
+            prop="companyReferencenum"
+            label="公司税号"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
+           <el-table-column
             prop="tradeId"
             label="交易Id"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="exTime"
-            label="交易时间"
+            prop="cardId"
+            label="ETC卡号"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
@@ -49,21 +49,25 @@
             label="交易费用"
             show-overflow-tooltip>
           </el-table-column>
+          <el-table-column
+            prop="exTime"
+            label="交易时间"
+            show-overflow-tooltip>
+          </el-table-column>
+         
            <el-table-column
             prop="aclTime"
-            label="开票时间"
+            label="申请开票时间"
             show-overflow-tooltip>
-            
           </el-table-column>
           <el-table-column
             prop="status"
             label="状态"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.status == 0" style="color: green">未开票</span>
-              <span v-else-if="scope.row.status == 1" style="color: red">开票中</span>
-              <span v-else-if="scope.row.status == 2" style="color: red">成功开票</span>
-              <span v-else-if="scope.row.status == 3" style="color: red">取票成功</span>
+              <span v-if="scope.row.status == 1" style="color: green">待开票</span>
+              <span v-else-if="scope.row.status == 2" style="color: red">开票中</span>
+              <span v-else-if="scope.row.status == 3" style="color: red">已开票</span>
             </template>
           </el-table-column>
         </el-table>

src/views/selfCar/selfcarRec.vue

@@ -4,9 +4,24 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-              <el-input  placeholder="客户" class="input-demo" v-model="customerName"></el-input>
-              <el-input  placeholder="企业" class="input-demo" v-model="companyName"></el-input>
-               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+               <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.companyNum"></el-input>
+                  <el-input  placeholder="etc卡号" class="input-demo" v-model="formCondition.etcNum"></el-input>
+                   <el-input  placeholder="车牌号" class="input-demo" v-model="formCondition.carNum"></el-input>
+              </div>
+                <div class="demo-input-suffix" style="margin-top: 5px;margin-left: 10px;">
+                 
+                  <el-select v-model="formCondition.recStatus" placeholder="备案状态">
+                      <el-option
+                        v-for="item in recLists"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                </el-select>
+                 <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+                </div>
             </div>
           </el-col>
         </el-row>
@@ -21,13 +36,13 @@
           border
           tooltip-effect="dark">
           <el-table-column
-            label="客户名称"
-            prop="customerName"
+            label="企业编号"
+            prop="companyNum"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
             prop="companyName"
-            label="公司名称"
+            label="客户名称"
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
@@ -50,16 +65,16 @@
             label="车辆颜色"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.plateColor == 0" style="color: green">蓝色</span>
-              <span v-else-if="scope.row.plateColor == 1" >黄色</span>
-              <span v-else-if="scope.row.plateColor == 2" >黑色</span>
-              <span v-else-if="scope.row.plateColor == 3" >白色</span>
-              <span v-else-if="scope.row.plateColor == 4" >渐变绿色</span>
-              <span v-else-if="scope.row.plateColor == 5" >黄绿渐变色</span>
-              <span v-else-if="scope.row.plateColor == 6" >蓝白渐变色</span>
-              <span v-else-if="scope.row.plateColor == 7" >未确定</span>
-              <span v-else-if="scope.row.plateColor == 8" >未确定</span>
-              <span v-else-if="scope.row.plateColor == 9" >未确定</span>
+              <span v-if="scope.row.carColor == 0">蓝色</span>
+              <span v-else-if="scope.row.carColor == 1" >黄色</span>
+              <span v-else-if="scope.row.carColor == 2" >黑色</span>
+              <span v-else-if="scope.row.carColor == 3" >白色</span>
+              <span v-else-if="scope.row.carColor == 4" >渐变绿色</span>
+              <span v-else-if="scope.row.carColor == 5" >黄绿渐变色</span>
+              <span v-else-if="scope.row.carColor == 6" >蓝白渐变色</span>
+              <span v-else-if="scope.row.carColor == 7" >未确定</span>
+              <span v-else-if="scope.row.carColor == 8" >未确定</span>
+              <span v-else-if="scope.row.carColor == 9" >未确定</span>
             </template>
           </el-table-column>
            <el-table-column
@@ -125,8 +140,10 @@
         data(){
           return{
             selfcarRecCarTable:[],
-            companyName:'',
-            customerName:'',
+            recLists:[{"label":"备案失败","value":"1"},{"label":"备案成功","value":"2"}],
+            formCondition:{
+              businessType: "0"
+            },
             current: 1,
             pagesize: 8,
             total:''
@@ -141,9 +158,9 @@
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-            formData.append('companyName', this.companyName);
-            formData.append('customerName', this.customerName);
-            formData.append('businessType', 0);
+           for(var i in this.formCondition){
+                formData.append(i,this.formCondition[i]);
+            }
             const response = await this.$http.post(`noCar/findCarRec`, formData);
             if (response.data.code === 0) {
               this.selfcarRecCarTable = response.data.data.records;