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

src/components/busManagement/JourneyTripPlan.vue

@@ -92,6 +92,9 @@
                     <template v-else-if="subItem.AirportPickUp==2">
                       <font style="color:#FF0080"> 送</font>
                     </template>
+                    <template v-else-if="subItem.AirportPickUp==16">
+                      <font style="color:#FF0080">酒店派车</font>
+                    </template>
                     <template v-else-if="subItem.UseType==1">
                       <font style="color:#67C23A">√</font>
                     </template>

src/components/index.vue

@@ -2460,6 +2460,7 @@
         let msg = {
           StartDate: ''
         }
+        
         this.apipost(
           "orderank_post_GetDetails",
           msg,

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -53,8 +53,8 @@
       <TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :dataAll="PostConfig"
         :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"
-        :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
+        :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" :HotelPaiChe="HotelPaiChe"
+        @change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
       <TravelFeature :TripColor="PostConfig.TripColor" :dataAll="PostConfig" :class="{'showOther':(TeamType==3)}"
         ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData"
         :TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"
@@ -122,7 +122,7 @@
           @click="submitForm(2)">
           {{$t('fnc.tijiao')}}</div>
         <div v-if="modifyType==2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" :loading="saveLoading"
-          @click="submitForm(3)" >{{$t('pub.saveBtn')}}
+          @click="submitForm(3)">{{$t('pub.saveBtn')}}
         </div>
         <div style="display:none;" v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">
           {{$t('sm.yulan')}}
@@ -231,8 +231,8 @@
           NotQueryCityList: [], //使用系统中的经纬度城市
           FeaturePageType: 0, //1横版 2竖版
           TeamType: 0,
-          IsSplitTeam:0,//当团修改是否拆分团队(1-拆分)
-          BackScenicList:[],//可退景点
+          IsSplitTeam: 0, //当团修改是否拆分团队(1-拆分)
+          BackScenicList: [], //可退景点
         },
         //行程
         FeatureData: {
@@ -302,6 +302,7 @@
         UseTypeArray: [], //用车类型
         AirPickUp: 0, //接机
         AirSend: 0, //送机
+        HotelPaiChe: 0, //酒店派车
         isgetPrice: true,
         realSave: 1, //1：制作报价单，2保存草稿
         outerVisible: false,
@@ -560,7 +561,7 @@
 
         basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel;
         basicData.MapUrl = this.PostConfig.MapUrl;
-        basicData.IsSplitTeam=this.PostConfig.IsSplitTeam;
+        basicData.IsSplitTeam = this.PostConfig.IsSplitTeam;
         console.log("travel_post_SetTravelConfigInfo", basicData);
         this.isSubmit = false;
         this.apipost(
@@ -972,7 +973,7 @@
                 this.PostConfig.TripMapList = tempData.TripMapList;
                 this.PostConfig.NotQueryCityList = tempData.NotQueryCityList;
                 this.PostConfig.MapUrl = tempData.MapUrl;
-                this.PostConfig.BackScenicList=tempData.BackScenicList;
+                this.PostConfig.BackScenicList = tempData.BackScenicList;
                 let arrList = function (list) {
                   list.forEach(x => {
                     x.CountrySelectList = []; //国家下拉列表
@@ -1066,6 +1067,7 @@
                 this.UseTypeArray = tempData.UseTypeArray;
                 this.AirPickUp = tempData.AirPickUp;
                 this.AirSend = tempData.AirSend;
+                this.HotelPaiChe = tempData.HotelPaiChe;
                 this.PostConfig.PDFAlias = tempData.PDFAlias;
                 this.ScrollMethod();
               } else {
@@ -1102,6 +1104,7 @@
                 this.UseTypeArray = tempData.UseTypeArray;
                 this.AirPickUp = tempData.AirPickUp;
                 this.AirSend = tempData.AirSend;
+                this.HotelPaiChe = tempData.HotelPaiChe;
               } else {
                 this.Error(res.data.message);
               }

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue

@@ -230,7 +230,7 @@
                   <travelDaysTrip :dataAll="dataAll" v-bind:dayObj="item" v-bind:CurrentIndex="index"
                     v-bind:TotalCount="subConfig.DayList.length" v-bind:isOpenGroup="isOpenGroup"
                     v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity" v-bind:UseTypeArray="UseTypeArray"
-                    v-bind:AirPickUp="AirPickUp" v-bind:AirSend="AirSend" v-bind:DayList="subConfig.DayList"
+                    v-bind:AirPickUp="AirPickUp" v-bind:AirSend="AirSend" :HotelPaiChe="HotelPaiChe" v-bind:DayList="subConfig.DayList"
                     v-bind:NoticeParameters="NoticeParameters" v-bind:subConfig="subConfig"
                     @change="handlerChangeDateList" :TeamType="TeamType" :IsOpenHotel="IsOpenHotel"></travelDaysTrip>
                 </div>
@@ -258,6 +258,7 @@
       "UseTypeArray",
       "AirPickUp",
       "AirSend",
+      "HotelPaiChe",
       "NoticeParameters",
       "TeamType",
       "IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息

src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue

@@ -172,7 +172,7 @@
         <!-- 交通 -->
         <div class="TC-Comtitlediv" style="padding: 5px 0 10px 0;">
           <trifficTrip v-bind:trafficObj="dayObj.TrafficObj" :isOpenGroup="isOpenGroup" v-bind:AllCityList="AllCityList"
-            v-bind:UseTypeArray="UseTypeArray" v-bind:AirPickUp="AirPickUp" v-bind:AirSend="AirSend"
+            v-bind:UseTypeArray="UseTypeArray" v-bind:AirPickUp="AirPickUp" v-bind:AirSend="AirSend" v-bind:HotelPaiChe="HotelPaiChe"
             v-bind:StartCity="StartCity" v-bind:CurrentIndex="CurrentIndex" v-bind:TotalCount="TotalCount"
             v-bind:dayObj="dayObj" :isRead="dayObj.isRead"></trifficTrip>
         </div>
@@ -301,6 +301,7 @@
       "UseTypeArray",
       "AirPickUp",
       "AirSend",
+      "HotelPaiChe",
       "DayList", //线路行程
       "NoticeParameters",
       "subConfig",

src/components/newTravelmanager/travelLineTrip/trifficTripThree.vue

@@ -66,6 +66,7 @@
           <label>{{$t('objFill.yongchejih')}}</label>
           <span :class="{'ListCked':trafficObj.AirportPickUp==1}" @click="changeAirportType(1)">{{AirPickUp}}</span>
           <span :class="{'ListCked':trafficObj.AirportPickUp==2}" @click="changeAirportType(2)">{{AirSend}}</span>
+          <span :class="{'ListCked':trafficObj.AirportPickUp==16}" @click="changeAirportType(16)">{{HotelPaiChe}}</span>
         </div>
         <div class="clearfix TC-userCarPlan_time marginT10 marginL20" style="width: 100%;">
           <div v-if="!isOpenGroup" class="useTypeDiv" v-for="useTypeItem in UseTypeArray">
@@ -125,6 +126,7 @@
       "UseTypeArray",
       "AirPickUp",
       "AirSend",
+      "HotelPaiChe",
       "isRead",
       "dayObj"
     ],