Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -231,7 +231,7 @@
         </li>
 
         <li>
-          <input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList()" :value="$t('pub.searchBtn')" />
+          <input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList(),getTotalCount()" :value="$t('pub.searchBtn')" />
         </li>
       </ul>
     </div>

src/components/TravelManager/TravelList/freeTravelOrder.vue → src/components/TravelManager/TravelList/freeTravelOrderStati.vue

@@ -231,7 +231,7 @@
         </li>
 
         <li>
-          <input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList()" :value="$t('pub.searchBtn')" />
+          <input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList(),getTotalCount()" :value="$t('pub.searchBtn')" />
         </li>
       </ul>
     </div>
@@ -334,16 +334,16 @@
             <td>
                 <el-row>
                   <el-button-group>
-                    <el-tooltip class="item" effect="dark" content="付款" placement="top-start">
+                    <el-tooltip class="item" effect="dark" content="付款" placement="top-start" v-if="item.OrderStatus!=='已取消'">
                       <el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" ></el-button>
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="取消订单" placement="top-start">
+                    <el-tooltip class="item" effect="dark" content="取消订单" placement="top-start" v-if="item.OrderStatus!=='已取消'">
                       <el-button type="info" v-if="item.IsCanOrder == 0" icon="iconfont icon-quxiao1" @click="Exit(item)"></el-button>
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="确定" placement="top-start">
+                    <el-tooltip class="item" effect="dark" content="确定" placement="top-start" v-if="item.OrderStatus!=='已取消'">
                       <el-button  type="success" icon="iconfont icon-duigou" v-if="item.IsCanClear == 0" @click="queren(1, item.OrderID)" ></el-button>
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="取消确认" placement="top-start">
+                    <el-tooltip class="item" effect="dark" content="取消确认" placement="top-start" v-if="item.OrderStatus!=='已取消'">
                       <el-button type="info" icon=" iconfont icon-quxiao1" v-if="item.IsCanClear == 1" @click="queren(0, item.OrderID)"></el-button>
                     </el-tooltip>
                     <!-- <el-tooltip class="item" effect="dark" content="关联团" placement="top-start">
@@ -792,7 +792,6 @@ export default {
     let userInfo=this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id;    //集团
     this.getDepartmentMsg.RB_Branch_Id=userInfo.RB_Branch_id;   //公司
-
     this.getCompanyList()
     this.getDepartment()
     this.getEmployee()

src/router/config.js

@@ -1892,20 +1892,27 @@ export default {
                                 title: '散卖酒店订单统计'
                             },
                         }, {
-                            path: '/freeTravelOrder', // 操作 自由行订单
-                            name: 'freeTravelOrder',
-                            component: resolve => require(['@/components/TravelManager/TravelList/freeTravelOrder'], resolve),
+                            path: '/freeTravelOrderStati', // 操作 自由行订单统计
+                            name: 'freeTravelOrderStati',
+                            component: resolve => require(['@/components/TravelManager/TravelList/freeTravelOrderStati'], resolve),
                             meta: {
                                 title: '自由行订单统计'
                             },
                         }, {
-                            path: '/freeTravelOrderDetails', // 操作 自由行订单 详情
-                            name: 'freeTravelOrderDetails',
-                            component: resolve => require(['@/components/TravelManager/TravelList/freeTravelOrderDetails'], resolve),
+                            path: '/freeTravelOrderStatiDetails', // 操作 自由行订单统计详情
+                            name: 'freeTravelOrderStatiDetails',
+                            component: resolve => require(['@/components/TravelManager/TravelList/freeTravelOrderStatiDetails'], resolve),
                             meta: {
                                 title: '自由行订单详情'
                             },
                         }, {
+                            path: '/freeTravelOrder', // 销售 自由行订单
+                            name: 'freeTravelOrder',
+                            component: resolve => require(['@/components/SalesModule/freeTravelOrder'], resolve),
+                            meta: {
+                                title: '自由行订单'
+                            },
+                        },{
                             path: '/AmoebaDetail', //阿米巴结算详情
                             name: 'AmoebaDetail',
                             component: resolve => require(['@/components/TravelManager/TravelList/AmoebaDetail'], resolve),