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

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -34,7 +34,7 @@
           :TCNUM="TCNUM" id="firstAnchor" :LineList="LineList"></TravelConfig>
         <TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :NoticeParameters="NoticeParameters"
           :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
-          v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData"></TravelDaysTripDirect>
+          v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData" :TeamType="TeamType"></TravelDaysTripDirect>
         <TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
           :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
         <TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"

src/components/newTravelmanager/travelLineTrip/HotelTrip.vue

@@ -100,9 +100,9 @@
           </td>
           <td valign="middle" colspan="5">
             <!--酒店-->
-            <el-select v-if="!dayObj.isRead &&IsDirect==1" class="w478 Ht_hotelSelect" size="mini"
+            <el-select v-if="!dayObj.isRead &&IsDirect==1" class="w478 Ht_hotelSelect" size="mini" v-if="TeamType!=2"
                        v-model="HotelChooseArray"
-                       multiple :multiple-limit="flagWangYue?1:3" @visible-change="getHotelList($event)"
+                       multiple :multiple-limit="TeamType==0?3:1" @visible-change="getHotelList($event)"
                        @change="changeHotelList()"
                        filterable placeholder="请选择">
               <el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">
@@ -129,7 +129,7 @@
 </template>
 <script>
   export default {
-    props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig"],
+    props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig","TeamType"],
     data() {
       return {
         QHotelList: [],
@@ -194,7 +194,6 @@
             PicPath: ""
           }
         ],
-        flagWangYue: null,
         isFirstInitDinner: false //初始含有酒店列表，加载完酒店数据在初始化餐厅列表
       };
     },
@@ -650,11 +649,6 @@
       },
     },
     mounted() {
-      if (this.$route.query.flag) {
-        this.flagWangYue = this.$route.query.flag === "false" ? false : true;
-      } else {
-        this.flagWangYue = false;
-      }
       this.initializationData();
     },
     watch: {

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue

@@ -146,6 +146,7 @@
                   v-bind:NoticeParameters="NoticeParameters"
                   v-bind:subConfig="subConfig"
                   @change="handlerChangeDateList"
+                  :TeamType="TeamType"
                 ></travelDaysTrip>
               </div>
             </div>
@@ -168,7 +169,8 @@
       "UseTypeArray",
       "AirPickUp",
       "AirSend",
-      "NoticeParameters"
+      "NoticeParameters",
+      "TeamType"
     ],
     data() {
       return {

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -229,7 +229,7 @@
           </div>
         </div>
         <hotelTrip :dayObj="dayObj" :CurrentIndex="CurrentIndex" :DayList="DayList" :WarmTripDescribe="WarmTripDescribe"
-                   :IsDirect="NoticeParameters.IsDirect" :subConfig="subConfig"></hotelTrip>
+                   :IsDirect="NoticeParameters.IsDirect" :subConfig="subConfig"   :TeamType="TeamType"></hotelTrip>
         <div class="TD_OperaContent">
           <div class="TD_ComIcon">
             <i v-if="!dayObj.isRead" class="iconfont icon-chakan" @click="getRead"></i>
@@ -276,7 +276,8 @@
       "AirSend",
       "DayList", //线路行程
       "NoticeParameters",
-      "subConfig"
+      "subConfig",
+      "TeamType"
     ],
     data() {
       return {