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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -2112,6 +2112,14 @@ export default {
         ) {
             this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
         }
+        var routeName = this.$route.name
+        if (routeName == 'TravelControlList') {
+          this.queryMsg.TeamType = 0;
+        }
+        if (routeName == 'TravelControlList2') {
+          this.queryMsg.TeamType = 3;
+        }
+
         this.getControlList();
     }
 };

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -379,8 +379,10 @@
                 else if (SaveType == 2 || SaveType == 3) {
                   let path = "TravelControlList";
                   //OP开团和地接开团
-                  if (TeamType == 0 || TeamType == 3) {
+                  if (TeamType == 0) {
                     path = "TravelControlList";
+                  } else if (TeamType == 3){
+                    path = "TravelControlList2";
                   } else if (TeamType == 1) {
                     path = "TravelControlListSale";
                   } else if (TeamType == 2) {

src/components/newTravelmanager/travelLineTrip/HotelTrip.vue

@@ -102,7 +102,7 @@
             <!--酒店-->
             <el-select v-if="!dayObj.isRead &&IsDirect==1&&TeamType!=2" class="w478 Ht_hotelSelect" size="mini"
                        v-model="HotelChooseArray"
-                       multiple :multiple-limit="TeamType==0?3:1" @visible-change="getHotelList($event)"
+                       multiple :multiple-limit="(TeamType==0||TeamType==3)?3:1" @visible-change="getHotelList($event)"
                        @change="changeHotelList()"
                        filterable placeholder="请选择" :disabled="IsOpenHotel==1?true:false">
               <el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">

src/router/config.js

@@ -1934,6 +1934,14 @@ export default {
                                 title: '团控列表'
                             },
                         },
+                        {
+                            path: '/TravelControlList2', //地接团控列表
+                            name: 'TravelControlList2',
+                            component: resolve => require(['@/components/TravelManager/TravelList/TravelControlList'], resolve),
+                            meta: {
+                                title: '地接团控列表'
+                            },
+                        },
                         {
                             path: '/PriceHotelWorkList', //团酒店工作列表
                             name: 'PriceHotelWorkList',