前端代码合并提交

src/config/globle.js

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

src/router/index.js

@@ -31,6 +31,7 @@ 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');
+const mothaccount = () => import('@/views/noCar/mothaccount.vue');
 // 自有车部分
 
 const selfcarRec = () => import('@/views/selfCar/selfcarRec.vue');
@@ -104,6 +105,7 @@ const router = new Router({
         { name: 'noCarCalculateInfoStatis', path: '/noCarCalculateInfoStatis', component: noCarCalculateInfoStatis },
 
         { name: 'hcInvoice', path: '/hcInvoice', component: hcInvoice },
+        { name: 'mothaccount', path: '/mothaccount', component: mothaccount },
         // 自有车部分
         { name: 'selfcarRec', path: '/selfcarRec', component: selfcarRec },
         { name: 'selfInvoice', path: '/selfInvoice', component: selfInvoice },

src/views/Home.vue

@@ -211,6 +211,10 @@ export default {
               id:5,
               path:"hcInvoice",
               authName:"红冲发票查询"
+            },{
+              id:5,
+              path:"mothaccount",
+              authName:"月账单查询"
             }
           ]
          },{

src/views/platform/apply/already.vue

@@ -16,7 +16,7 @@
               <el-input  placeholder="请输入车牌号码" style="width:170px" class="input-demo" v-model="formList.carNum"></el-input>
               <el-date-picker v-model="formList.invoiceMakeTime" 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="firstLoadData" v-loading.fullscreen.lock="fullscreenLoading">查询</el-button>
-              <el-button type="success" style="margin-left: 1%;" @click="queryLook" v-loading.fullscreen.lock="fullscreenLoading">更新</el-button>
+              <el-button type="success" style="margin-left: 1%;" @click="queryLook" v-loading.fullscreen.lock="fullscreenLoading">更新（取票）</el-button>
             <el-button type="primary"  @click="exportExcel">导出报表</el-button>
             </div>
           </el-col>

src/views/selfCar/selfcarRec.vue

@@ -105,6 +105,7 @@
             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 == 0" style="color: red">备案失败</span>
             </template>
           </el-table-column>