前端代码合并提交

src/config/globle.js

@@ -1,3 +1,3 @@
-//window.hostUrl = "http://invoice.jkcredit.com:80/";
-window.hostUrl = "http://127.0.0.1:18081/"
+window.hostUrl = "http://invoice.jkcredit.com:80/";
+//window.hostUrl = "http://127.0.0.1:18081/"
 window.tableHeight =  (document.body.clientHeight*0.6-20);

src/views/selfCar/selfCarApply.vue

@@ -49,13 +49,13 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="enStation"
+            prop="enStationName"
             label="入口收费站"
             width="100"
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="exStation"
+            prop="exStationName"
             label="出口收费站"
             width="100"
             show-overflow-tooltip>
@@ -162,11 +162,6 @@
             prop="invoiceStatus"
             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="msg"
@@ -215,6 +210,11 @@ import XLSX from "xlsx";
             const response = await this.$http.post('selfCarService/getSelfCarInvoicesByAppl', formData);
             if (response.data.code === 0) {
               this.invoiceTable = response.data.data;
+            }else{
+              this.$message({
+                      type: 'error',
+                      message: '查询结果:'+response.data.msg
+                    });
             }
           },
 
@@ -234,7 +234,6 @@ import XLSX from "xlsx";
           /* generate workbook object from table */
           //  .table要导出的是哪一个表格
           var wb = XLSX.utils.table_to_book(document.querySelector(".table"),{ raw: true });
-          this.formartNum(wb);
           /* get binary string as output */
           var wbout = XLSX.write(wb, {
             bookType: "xlsx",

src/views/selfCar/selfCarTrade.vue

@@ -97,6 +97,11 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
+            prop="applId"
+            label="申请Id"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
             prop="status"
             label="状态"
             show-overflow-tooltip>
@@ -405,6 +410,7 @@ import XLSX from "xlsx";
                       {"title":"交易费用","key":"fee"},
                       {"title":"交易时间","key":"exTime"},
                       {"title":"申请开票时间","key":"aclTime"},
+                      {"title":"申请Id","key":"applId"},
                       {"title":"状态","key":"status"}  
                     ];
                     this.exportExcelComm(cloums,recodes,name,loading)