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

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -38,7 +38,7 @@
           :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>
-        <TravelFeature  :class="{'showOther':(TeamType==3)}" ref="TravelFeature" id="thirdAnchor"
+        <TravelFeature :class="{'showOther':(TeamType==3)}" ref="TravelFeature" id="thirdAnchor"
           @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" :isNewConfig="isNewConfig"
           @unlockFormCommit="unlockFormCommit" :CurrentUserInfo="CurrentUserInfo"></TravelFeature>
         <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
@@ -54,9 +54,9 @@
         <TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           v-if="TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType"></TravelPrice3>
-        <TravelPrice4  @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
-          v-if="TeamType==3" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
-          :TeamType="TeamType"></TravelPrice4>
+        <TravelPrice4 @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
+          :PostDaysTrip="PostDaysTrip" v-if="TeamType==3" :priceList="PriceList" :PostConfig="PostConfig"
+          :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice4>
 
         <div class="btnFixedDiv" v-if="IsShowBtn">
           <div class="toTop" @click="backTop">
@@ -153,6 +153,10 @@
           DayNum: 0, //行程天数
           OfferId: 0, //报价单Id
           OpenState: 2, //1-已开团，2-未开团
+          WAreaId: 0, //大区编号
+          WCountryId: 0, //国家编号
+          WLocationId: 0, //位置编号
+          WCityId: 0, //城市编号
         },
         //行程
         FeatureData: {
@@ -313,15 +317,6 @@
       },
       //提交验证
       submitForm(SaveType) {
-        // let travelConfigVal = this.$refs["TravelConfig"].validateForm();
-        // let travelDaysTripVal = this.$refs["TravelDaysTrip"].validateForm();
-        // if (!travelConfigVal) {
-        //   this.Error("请完善配置信息");
-        // }
-        // if (!travelDaysTripVal) {
-        //   this.Error("请完善行程信息");
-        // }
-        //if (travelConfigVal && travelDaysTripVal) {
         if (this.isSubmit) {
           this.isSubmit = false;
           this.SaveData(SaveType);
@@ -373,6 +368,10 @@
         basicData.WarmTipList = this.PostDaysTrip.WarmTipList;
         basicData.TitleList = this.PostDaysTrip.TitleList;
         basicData.RemoveImg = this.PostDaysTrip.RemoveImg;
+        basicData.WAreaId = this.PostConfig.WAreaId;
+        basicData.WCountryId = this.PostConfig.WCountryId;
+        basicData.WLocationId = this.PostConfig.WLocationId;
+        basicData.WCityId = this.PostConfig.WCityId;
         this.journeyList.IsUpdateTrip = this.PostDaysTrip.IsUpdateTrip;
         //行程特色数据
         var TripFeature = {};
@@ -663,7 +662,6 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
-
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;
@@ -720,6 +718,10 @@
                 this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe;
                 this.PostConfig.IsOpenHotel = tempData.IsOpenHotel;
                 this.PostConfig.DayNum = tempData.DayNum; //行程天数
+                this.PostConfig.WAreaId = tempData.WAreaId;
+                this.PostConfig.WCountryId = tempData.WCountryId;
+                this.PostConfig.WLocationId = tempData.WLocationId;
+                this.PostConfig.WCityId = tempData.WCityId;
 
 
                 this.NoticeParameters.ConfigId = tempData.ConfigId;
@@ -791,8 +793,6 @@
                 this.UseTypeArray = tempData.UseTypeArray;
                 this.AirPickUp = tempData.AirPickUp;
                 this.AirSend = tempData.AirSend;
-
-
                 this.PostConfig.PDFAlias = tempData.PDFAlias;
               } else {
                 this.Error(res.data.message);
@@ -842,7 +842,6 @@
         let userInfo = this.getLocalStorage();
         var B2BDomain = userInfo.B2BDomain;
         let configId = this.NewConfigId;
-
         var B2BDomain = this.CurrentUserInfo.B2BDomain;
         this.$tripUtils.GotoB2BPage(B2BDomain, encodeURIComponent(configId), 0);
       },