前端代码合并提交

src/config/globle.js

@@ -1,2 +1,2 @@
-window.hostUrl = "http://127.0.0.1:18080/";
+window.hostUrl = "http://192.168.50.4:18080/";
 window.tableHeight =  (document.body.clientHeight*0.6-20)+"px";

src/router/index.js

@@ -25,6 +25,7 @@ const billway = () => import('@/views/noCar/billway.vue');
 const nocarInvoice = () => import('@/views/noCar/invoice.vue');
 const billwayException = () => import('@/views/noCar/billwayException.vue');
 const noCarCalculateInfo = () => import('@/views/noCar/calculateInfo.vue');
+const noCarCalculateInfoStatis = () => import('@/views/noCar/calculateInfostatis.vue');
 const hcInvoice = () => import('@/views/noCar/hcInvoice.vue');
 // 自有车部分
 
@@ -94,6 +95,8 @@ const router = new Router({
         { name: 'nocarInvoice', path: '/nocarInvoice', component: nocarInvoice },
         { name: 'billwayException', path: '/billwayException', component: billwayException },
         { name: 'noCarCalculateInfo', path: '/noCarCalculateInfo', component: noCarCalculateInfo },
+        { name: 'noCarCalculateInfoStatis', path: '/noCarCalculateInfoStatis', component: noCarCalculateInfoStatis },
+        
         { name: 'hcInvoice', path: '/hcInvoice', component: hcInvoice },
         // 自有车部分
         { name: 'selfcarRec', path: '/selfcarRec', component: selfcarRec },

src/views/Home.vue

@@ -239,7 +239,11 @@ export default {
             {
               id:2,
               path:"noCarCalculateInfo",
-              authName:"无车计费查询"
+              authName:"无车计费明细查询"
+            }, {
+              id:2,
+              path:"noCarCalculateInfoStatis",
+              authName:"无车计费统计信息查询"
             }
           ]
          },{

src/views/customer/Customer.vue

@@ -5,6 +5,8 @@
           <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.company"></el-input>
+               <el-input  placeholder="公司名称" class="input-demo" v-model="formCondition.subCompany"></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>-->
                 <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
@@ -642,7 +644,8 @@ import XLSX from "xlsx";
           return{
             formCondition:{
               customerName:'',
-              startTime:''
+              company:'',
+              subCompany:''
             },
             hightt:'0px',
             coustomerTable:[],
@@ -720,6 +723,7 @@ import XLSX from "xlsx";
             customerRec:{
 
             },
+            queryParam:{},
             customer:{
                id:0,
                customerName:'',
@@ -1047,6 +1051,8 @@ import XLSX from "xlsx";
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
             formData.append('customerName', this.formCondition.customerName);
+            formData.append('company', this.formCondition.company);
+            formData.append('subCompany', this.formCondition.subCompany);
             const response = await this.$http.post(`customer/findCustomer`, formData);
             if (response.data.code === 0) {
               this.coustomerTable = response.data.data.records;
@@ -1064,41 +1070,43 @@ import XLSX from "xlsx";
             // console.log(`当前页: ${val}`);
           },
      async exportExcel() {
-        let curr = this.current;
-      let pagesize1 = this.pagesize;
-      this.current = 1; 
-      this.pagesize = this.total;
-      await this.loadData();
-      // 设置当前日期
-      let time = new Date();
-      //console.log(time);
-      let year = time.getFullYear();
-      let month = time.getMonth() + 1;
-      let day = time.getDate();
-      let name = "客户管理查询列表_"+year + "" + month + "" + day;
-      // console.log(name)
-      /* generate workbook object from table */
-      //  .table要导出的是哪一个表格
-      var wb = XLSX.utils.table_to_book(document.querySelector(".table"),{ raw: true });
-      /* get binary string as output */
-      var wbout = XLSX.write(wb, {
-        bookType: "xlsx",
-        bookSST: true,
-        type: "array"
-      });
-      try {
-        //  name+'.xlsx'表示导出的excel表格名字
-        FileSaver.saveAs(
-          new Blob([wbout], { type: "application/octet-stream" }),
-          name + ".xlsx"
-        );
-      } catch (e) {
-        if (typeof console !== "undefined") console.log(e, wbout);
-      }
-      this.current = curr; 
-      this.pagesize = pagesize1;
-      this.loadData();
-      return wbout;
+        let customer = this.formCondition.customerName;
+        window.location.href = hostUrl+"customer/findCustomerRecListExport?customerName="+customer+"&&companyName="+this.formCondition.subCompany+"&&companyBelongName="+this.formCondition.company;
+      //   let curr = this.current;
+      // let pagesize1 = this.pagesize;
+      // this.current = 1; 
+      // this.pagesize = this.total;
+      // await this.loadData();
+      // // 设置当前日期
+      // let time = new Date();
+      // //console.log(time);
+      // let year = time.getFullYear();
+      // let month = time.getMonth() + 1;
+      // let day = time.getDate();
+      // let name = "客户管理查询列表_"+year + "" + month + "" + day;
+      // // console.log(name)
+      // /* generate workbook object from table */
+      // //  .table要导出的是哪一个表格
+      // var wb = XLSX.utils.table_to_book(document.querySelector(".table"),{ raw: true });
+      // /* get binary string as output */
+      // var wbout = XLSX.write(wb, {
+      //   bookType: "xlsx",
+      //   bookSST: true,
+      //   type: "array"
+      // });
+      // try {
+      //   //  name+'.xlsx'表示导出的excel表格名字
+      //   FileSaver.saveAs(
+      //     new Blob([wbout], { type: "application/octet-stream" }),
+      //     name + ".xlsx"
+      //   );
+      // } catch (e) {
+      //   if (typeof console !== "undefined") console.log(e, wbout);
+      // }
+      // this.current = curr; 
+      // this.pagesize = pagesize1;
+      // this.loadData();
+      // return wbout;
     },
         }
       };

src/views/customer/custRecMoney.vue

@@ -5,6 +5,7 @@
           <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.company"></el-input>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
             </div>
@@ -74,7 +75,8 @@ import XLSX from "xlsx";
         data(){
           return{
             formCondition:{
-              customerName:''
+              customerName:'',
+              company:''
             },
             customeRecMoneyListTable:[],
              hightt:'0px',
@@ -99,6 +101,7 @@ import XLSX from "xlsx";
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
             formData.append('customerName', this.formCondition.customerName);
+            formData.append('company', this.formCondition.company);
             const response = await this.$http.post(`customer/findCustomerMoney`, formData);
             if (response.data.code === 0) {
               this.customeRecMoneyListTable = response.data.data.records;

src/views/customer/custRecTime.vue

@@ -5,6 +5,7 @@
           <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.companyBelongName"></el-input>
                <el-date-picker v-model="formCondition.serviceEndTime" type="daterange" value-format="yyyy-MM-dd HH:mm:SS" range-separator="至" start-placeholder="服务结束时间始" end-placeholder="服务结束时间止"></el-date-picker>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
@@ -83,7 +84,8 @@ import XLSX from "xlsx";
           return{
             formCondition:{
               customerName:'',
-              serviceEndTime:''
+              serviceEndTime:'',
+              companyBelongName:''
             },
             customeRecTimeListTable:[],
              hightt:'0px',
@@ -104,6 +106,7 @@ import XLSX from "xlsx";
             formData.append('size', this.pagesize);
             formData.append('customerName', this.formCondition.customerName);
             formData.append('serviceEndTime', this.formCondition.serviceEndTime);
+            formData.append('companyBelongName', this.formCondition.companyBelongName);
             const response = await this.$http.post(`customer/findCustomerRecTimeList`, formData);
             if (response.data.code === 0) {
               this.customeRecTimeListTable = response.data.data.records;

src/views/customer/customerRecharge.vue

@@ -5,6 +5,7 @@
           <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-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
                <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
 
@@ -28,6 +29,11 @@
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
+            label="主体名称"
+            prop="companyName"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
             prop="beforeMony"
             label="充值后账户余额"
             show-overflow-tooltip>
@@ -71,7 +77,8 @@ import XLSX from "xlsx";
         data(){
           return{
             formCondition:{
-              customerName:''
+              customerName:'',
+              companyName:''
             },
             hightt:'0px',
             customerRechargeList:[],
@@ -96,6 +103,7 @@ import XLSX from "xlsx";
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
             formData.append('customerName', this.formCondition.customerName);
+            formData.append('companyName', this.formCondition.companyName);
             const response = await this.$http.post(`customer/findCustomerRecharge`, formData);
             if (response.data.code === 0) {
               this.customerRechargeList = response.data.data.records;

src/views/noCar/billway.vue

@@ -23,6 +23,9 @@
                <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-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-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>
@@ -31,10 +34,10 @@
                  <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 style="margin-right: 1%;" @click="DownloadTemplate">查询模板下载</el-button>
+                
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
                <el-button type="success" style="margin-left: 1%;" @click="updateStatus">更新状态</el-button>
-               <el-button type="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
+               
               </div>
             </div>
           </el-col>
@@ -49,7 +52,11 @@
           :data="billWayTable"
           :height="heightt"
           border
-          tooltip-effect="dark">
+          tooltip-effect="dark" @selection-change="handleSelectionChange">
+           <el-table-column
+              type="selection"
+              width="55">
+        </el-table-column>
           <el-table-column
             label="企业编号"
             prop="companyNum"
@@ -114,7 +121,7 @@
                <span>{{scope.row.fee/100| rounding}}</span>
             </template>
           </el-table-column>
-          
+
           <el-table-column
             prop="billwayStatus"
             label="运单状态"
@@ -142,7 +149,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </template> 
+      </template>
       <!-- 分页 -->
       <div class="block">
         <el-pagination
@@ -168,6 +175,7 @@ import XLSX from "xlsx";
              formUserList: {
             "file": ""
             },
+            multipleSelection: [],
              optionone: [{
               value: 0,
               label: '实时运单'
@@ -184,7 +192,7 @@ import XLSX from "xlsx";
         },
         created() {
           //设置表格高度
-          this.heightt = tableHeight;
+          this.heightt = '300px';
           this.loadData();
         },
         filters: {
@@ -201,7 +209,7 @@ import XLSX from "xlsx";
             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;
@@ -224,8 +232,14 @@ import XLSX from "xlsx";
           handleSuccess (a) {
             this.formUserList.file = a.raw;
           },
+           handleSelectionChange(value){
+                       this.multipleSelection = value;
+                       console.log(this.multipleSelection);
+                    },
          async updateStatus(){
-            const response = await this.$http.post(`noCar/updateStatus`);
+             const formData = new FormData();
+            formData.append('noCarWayBillStr', JSON.stringify(this.multipleSelection));
+            const response = await this.$http.post(`noCar/updateStatus`,formData);
                   if(response.data.code === 0) {
                     this.loadData();
                     this.$message({
@@ -271,7 +285,7 @@ import XLSX from "xlsx";
               let curr = this.current;
               let pagesize1 = this.pagesize;
 
-              this.current = 1; 
+              this.current = 1;
               this.pagesize = this.total;
              await this.loadData();
             // 设置当前日期
@@ -300,7 +314,7 @@ import XLSX from "xlsx";
             } catch (e) {
               if (typeof console !== "undefined") console.log(e, wbout);
             }
-            this.current = curr; 
+            this.current = curr;
             this.pagesize = pagesize1;
             this.loadData();
             return wbout;
@@ -362,4 +376,4 @@ import XLSX from "xlsx";
   margin: 15px auto;
   font-size: 18px;
 }
-</style>
+</style>

src/views/noCar/billwayException.vue

@@ -32,7 +32,11 @@
           :data="billWayTable"
           :height="heightt"
           border
-          tooltip-effect="dark">
+          tooltip-effect="dark"  @selection-change="handleSelectionChange">
+          <el-table-column
+              type="selection"
+              width="55">
+          </el-table-column>
           <el-table-column
             label="企业编号"
             prop="companyNum"
@@ -78,7 +82,7 @@
             show-overflow-tooltip>
           </el-table-column>
            <el-table-column
-            prop="updateTime"
+            prop="days"
             label="超长时间(天)"
             width="120"
             show-overflow-tooltip>
@@ -117,6 +121,7 @@ import XLSX from "xlsx";
             noCarWayBill:{
               
             },
+             multipleSelection: [],
              optionone: [{
               value: 0,
               label: '实时运单'
@@ -140,6 +145,7 @@ import XLSX from "xlsx";
               return value.toFixed(2)
             }
         },
+        
         methods:{
           // 列表展示
           async loadData() {
@@ -156,7 +162,9 @@ import XLSX from "xlsx";
             }
           },
            async updateStatus(){
-            const response = await this.$http.post(`noCar/updateStatus`);
+             const formData = new FormData();
+            formData.append('noCarWayBillStr', JSON.stringify(this.multipleSelection));
+            const response = await this.$http.post(`noCar/updateStatus`,formData);
                   if(response.data.code === 0) {
                     this.loadData();
                     this.$message({
@@ -170,6 +178,7 @@ import XLSX from "xlsx";
                     });
                   }
            },
+            
           // 分页方法
           handleSizeChange(val) {
             this.pagesize = val;

src/views/noCar/hcInvoice.vue

@@ -5,7 +5,7 @@
           <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.companyNum"></el-input>
+              <el-input  placeholder="购方名称" class="input-demo" v-model="formCondition.companyName"></el-input>
               <el-date-picker v-model="formCondition.month" 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="primary" style="margin-left: 1%;" @click="exportExcel">导出报表</el-button>
@@ -95,13 +95,9 @@ import XLSX from "xlsx";
         methods:{
           // 列表展示
           async loadData() {
-            const formData = new FormData();
-            formData.append('current', this.current);
-            formData.append('size', this.pagesize);
-
             const response = await this.$http.post('noCarService/hCVoiceQuery', this.formCondition);
             if (response.data.code === 0) {
-              this.invoiceTable = response.data.data.records;
+              this.invoiceTable = response.data.data;
             }else{
               this.$message({
                               type: 'error',

src/views/noCar/invoice.vue

@@ -174,6 +174,22 @@
             label="下载地址"
             show-overflow-tooltip>
           </el-table-column>
+           <el-table-column
+            prop="calculateTime"
+            label="扣费时间"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="billStatus"
+            label="运单状态"
+            show-overflow-tooltip>
+             <template slot-scope="scope">
+              <span v-if="scope.row.billStatus == 1" style="color: green">未结束</span>
+              <span v-else-if="scope.row.billStatus == 2" style="color: green">开票中</span>
+              <span v-else-if="scope.row.billStatus == 3" style="color: green">开票完成</span>
+              <span v-else-if="scope.row.billStatus == 4" style="color: red">超时运单</span>
+            </template>
+          </el-table-column>
         </el-table>
       </template> 
       <!-- 分页 -->

src/views/platform/invoice/list.vue

@@ -8,6 +8,7 @@
               <el-input  placeholder="运单编号" class="input-demo" v-model="waybillNum"></el-input>
               <el-input  placeholder="车牌号" class="input-demo" v-model="plateNum"></el-input>
               <el-input  placeholder="发票号码" class="input-demo" v-model="invoiceNum"></el-input>
+               <el-input  placeholder="发票代码" class="input-demo" v-model="invoiceCode"></el-input>
             </div>
           </el-col>
         </el-row>
@@ -172,11 +173,17 @@
             label="交易ID"
             show-overflow-tooltip>
           </el-table-column>
+           <el-table-column
+            prop="calculateTime"
+            label="扣费时间"
+            show-overflow-tooltip>
+          </el-table-column>
+          
           <el-table-column
             label="操作"
             width="80">
             <template slot-scope="scope" show-overflow-tooltip>
-              <span style="cursor:pointer;" @click="checkLook(scope.row.invoiceUrl)">下载</span>
+              <span style="cursor:pointer;color:blue" @click="checkLook(scope.row.invoiceUrl)">下载</span>
             </template>
           </el-table-column>
         </el-table>
@@ -216,6 +223,7 @@ export default{
       taxPlayerCode: "",
       plateNum: "",
       invoiceNum: "",
+      invoiceCode: "",
       startTime: "",
       endTime: "",
       batchNumber: '',
@@ -243,6 +251,7 @@ export default{
         formData.append('plateNum', this.plateNum);
         formData.append('companyName', this.taxPlayerCode);
         formData.append('invoiceNum', this.invoiceNum);
+        formData.append('invoiceCode', this.invoiceCode);
         //formData.append('startTime', this.startTime);
         //formData.append('endTime', this.endTime);
         const response = await this.$http.post(`noCar/findNocarInvoices`, formData);
@@ -280,6 +289,7 @@ export default{
         formData.append('plateNum', this.plateNum);
         formData.append('companyName', this.taxPlayerCode);
         formData.append('invoiceNum', this.invoiceNum);
+        formData.append('invoiceCode', this.invoiceCode);
         formData.append('batchNumber', this.batchNumber);
         //formData.append('startTime', this.startTime);
         //formData.append('endTime', this.endTime);

src/views/platform/waybillmanagement/noinvoice.vue

@@ -62,7 +62,11 @@
             :data="usertabletwo"
             :height="heightt"
             border
-            tooltip-effect="dark">
+            tooltip-effect="dark"  @selection-change="handleSelectionChange">
+            <el-table-column
+              type="selection"
+              width="55">
+        </el-table-column>
           <el-table-column
             label="运单编号"
             prop="billNum"
@@ -161,6 +165,7 @@ export default{
       batchNumber: '',
       hightt:'0px',
       billStartTime: '',
+       multipleSelection: [],
       billEndTime: '',
       createStartTime: '',
       createEndTime: '',
@@ -231,12 +236,27 @@ export default{
 
       window.location.href= url;
     },
+    handleSelectionChange(value){
+                       this.multipleSelection = value;
+                       console.log(this.multipleSelection);
+                    },
  //批量开票
     async makeInvoice() {
-      this.$message({
-            type: 'success',
-             message: '开票成功'
-          })
+      const formData = new FormData();
+            formData.append('noCarWayBillStr', JSON.stringify(this.multipleSelection));
+            const response = await this.$http.post(`noCar/updateStatus`,formData);
+                  if(response.data.code === 0) {
+                    this.loadDataCar();
+                    this.$message({
+                      type: 'success',
+                      message: '更新成功'
+                    });
+                  }else {
+                    this.$message({
+                      type: 'error',
+                      message: '更新失败'
+                    });
+                  }
       // this.fullscreenLoading = true;
       // this.formList.userId = Number(this.formUserList.userId);
       // for(var i = 0; i < this.multipleSelection.length; i++) {

src/views/selfCar/calculateInfo.vue

@@ -7,7 +7,7 @@
                <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customId"></el-input>
                <el-input  placeholder="税号" class="input-demo" v-model="formCondition.companyReferencenum"></el-input>
                <el-input  placeholder="etc卡号" class="input-demo" v-model="formCondition.etcNum"></el-input>
-               <el-date-picker v-model="formCondition.calTime" type="monthrange" value-format="yyyy-MM" range-separator="至" start-placeholder="计费开始" end-placeholder="计费结束"></el-date-picker>
+               <el-date-picker v-model="formCondition.calTime" type="monthrange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="计费开始" end-placeholder="计费结束"></el-date-picker>
             </div>
             <div class="top">
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
@@ -43,17 +43,17 @@
           </el-table-column>
           <el-table-column
             prop="etcNum"
-            label="ETC卡数量"
+            label="ETC卡号"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="tradeIdNum"
-            label="交易id数量"
+            prop="fee"
+            label="费用"
             show-overflow-tooltip>
           </el-table-column>
-         <el-table-column
-            prop="feeNum"
-            label="计费条数"
+          <el-table-column
+            prop="calTime"
+            label="计费时间"
             show-overflow-tooltip>
           </el-table-column>
         </el-table>
@@ -104,7 +104,7 @@ import XLSX from "xlsx";
                 formData.append(i,this.formCondition[i]);
             }
 
-            const response = await this.$http.post(`selfCar/findSelfcarCalculateInfoSta`, formData);
+            const response = await this.$http.post(`selfCar/findSelfcarCalculateInfo`, formData);
             if (response.data.code === 0) {
               this.calculateInfo = response.data.data;
             }

src/views/selfCar/invoice.vue

@@ -145,6 +145,21 @@
             label="下载地址"
             show-overflow-tooltip>
           </el-table-column>
+           <el-table-column
+            prop="tradeStatus"
+            label="状态"
+            show-overflow-tooltip>
+             <template slot-scope="scope">
+              <span v-if="scope.row.tradeStatus == 1" style="color: green">待开票</span>
+              <span v-else-if="scope.row.tradeStatus == 2" style="color: red">开票中</span>
+              <span v-else-if="scope.row.tradeStatus == 3" style="color: red">已开票</span>
+            </template>
+          </el-table-column>
+           <el-table-column
+            prop="calculateTime"
+            label="计费时间"
+            show-overflow-tooltip>
+          </el-table-column>
         </el-table>
       </template>
       <!-- 分页 -->

src/views/selfCar/selfCarTradeException.vue

@@ -62,6 +62,11 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
+            prop="exTime"
+            label="交易时间"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
             prop="status"
             label="状态"
             show-overflow-tooltip>