Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/customerManage/customerOrder.vue

@@ -259,6 +259,10 @@
                 let data = JSON.parse(this.$route.query.erpOrderObj)
                 this.msg.OrderId = data.OrderId
             }
+            //接收订单统计传过来的参数
+            if(this.$route.query.OrderId){
+                this.msg.OrderId = this.$route.query.OrderId
+            }
             this.Employee() //业务员
             this.GetTicketStatusEnumList() //出票枚举
             let $this = this

src/components/customerManage/orderList.vue

@@ -23,7 +23,7 @@
             <th width="12%">单号</th>
             <th width="8.5%">客人</th>
             <th width="6.5%">人数</th>
-            <th width="8.5%">起始城市</th>
+            <th width="8.5%">出行概述</th>
             <th width="6.5%">应收</th>
             <th width="6.5%">实收</th>
             <th width="6.5%">退款</th>
@@ -70,8 +70,7 @@
               </td>
               <td style="border:none">{{item.GuestCount}}人</td>
               <td style="border:none">
-                  {{item.StartCityName}}->
-                  {{item.EndCityName}}
+                  {{item.StartCityName}}
               </td>
               <td style="border:none">
                   <p @click="editOrderAmount(item)" class="cp"

src/components/guestManagement/ticketOrder.vue

@@ -631,7 +631,7 @@
               <div v-if="name=='凭证图'" class="Credentials-box">
                 <div class="Credentials-text">
                   <div class="Credentialstext-box">
-                    <p>熔断凭证</p>
+                    <p>熔断/取消凭证</p>
                     <div class="Credentialsimg-box">
                       <el-image v-for="(items,index) in obj.CancelVoucherList" :key="index"
                       :src="domainManager().ViittoFileUrl+items"></el-image>
@@ -639,7 +639,7 @@
                     
                   </div>
                   <div class="Credentialstext-box">
-                    <p>取消凭证</p>
+                    <p>出票凭证</p>
                     <div class="Credentialsimg-box">
                       <el-image v-for="(items,index) in obj.TicketVoucherList" :key="index"
                       :src="domainManager().ViittoFileUrl+items">

src/router.js

@@ -19,6 +19,7 @@ import customerConfiguration from "./components/customerManage/customerConfigura
 import customerOrder from "./components/customerManage/customerOrder"
 import myCustomerOrder from "./components/customerManage/myCustomerOrder"
 import automaticLogin from './views/automaticLogin'
+import planeTicketOrder from './components/planeTicketOrder/index'
 Vue.use(Router);
 
 export default new Router({
@@ -455,6 +456,14 @@ export default new Router({
                     meta: {
                         title: "我的订单"
                     }
+                },
+                {
+                    path: "/planeTicketOrder",
+                    name: "planeTicketOrder",
+                    component:planeTicketOrder,
+                    meta: {
+                        title: "订单核算统计"
+                    }
                 }
             ]
         },