页面修改

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -140,7 +140,7 @@
               </div>
             </div>
             <div>
-              <span class="openGroup opbd"  @click="goToOpenTravel('TravelManager',item.ID,item.OpenState)">
+              <span class="openGroup opbd"  @click="goToOpenTravel('TravelManager2',item.ID,item.OpenState)">
                 开
               </span>
               <span class="bianji opbd" @click="goUrl('QuotationNewPrice',item.ID,false)" >
@@ -268,7 +268,7 @@
       //初始化表格数据
       getList() {
         this.loading = true;
-        this.apipost("travel_get_GetTravelOfferPageList", this.queryData, res => {
+        this.apipost("travel_get_GetTravelOfferPageList_V2", this.queryData, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.queryData.total = res.data.data.count;
@@ -440,7 +440,8 @@
             name: path,
             query: {
               configId: configId,
-              openState: openState
+              openState: openState,
+              isOffer:1
             }
           });
         } else {

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -84,8 +84,9 @@
     },
     data() {
       return {
-        IsShowBtn:false,//是否显示按钮
+        IsShowBtn: false, //是否显示按钮
         ConfigId: 0, //地址栏查询参数
+        IsHaveOffer: 0, //是否有报价单
         NewConfigId: "", //configID加密后的字符串【预览使用】
         TCNUM: '', //团控列表传过来的tcnum
         NoticeParameters: {
@@ -135,7 +136,7 @@
           IsUpdateHotel: 0,
           OpenTeamDescribe: "", //开团备注
           IsOpenHotel: 0, //0可以添加删除酒店，1-不能修改酒店信息
-          DayNum:0,//行程天数
+          DayNum: 0, //行程天数
         },
         //行程
         FeatureData: {
@@ -238,10 +239,13 @@
       /*获取组件配置信息【回调方法】*/
       getConfig(configObj) {
         this.PostConfig = configObj;
-        this.NoticeParameters.ConfigId = this.PostConfig.ConfigId;
-        this.NoticeParameters.CountryID = this.PostConfig.CountryID;
-        this.NoticeParameters.IsDirect = this.PostConfig.IsDirect;
-        this.NoticeParameters.LineId = this.PostConfig.LineId;
+        //没有报价单根据线路设置直采和非直采方式生成线路行程
+        if (this.IsHaveOffer == 0) {
+          this.NoticeParameters.ConfigId = this.PostConfig.ConfigId;
+          this.NoticeParameters.CountryID = this.PostConfig.CountryID;
+          this.NoticeParameters.IsDirect = this.PostConfig.IsDirect;
+          this.NoticeParameters.LineId = this.PostConfig.LineId;
+        }
         if (this.ConfigId == 0) {
           this.FeatureData.LineName = this.PostConfig.LineName;
           this.FeatureData.Subtitle = this.PostConfig.LineTeamName;
@@ -370,11 +374,10 @@
         if (TripFeature.FeatureType >= 4) {
           var htmlObj = document.getElementById("newFeatureBox");
           if (htmlObj && htmlObj.innerHTML != null && htmlObj.innerHTML != "") {} else {
-             //更新行程特色
-             if(this.journeyList.IsUpdateTrip==1)
-             {
-                 this.MsgBus.$emit('comUpTravel');
-             }
+            //更新行程特色
+            if (this.journeyList.IsUpdateTrip == 1) {
+              this.MsgBus.$emit('comUpTravel');
+            }
           }
         }
 
@@ -404,7 +407,7 @@
         }
         basicData.TeamType = this.TeamType;
         basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel;
-  
+
         this.apipost(
           "travel_post_SetTravelConfigInfo",
           basicData,
@@ -631,6 +634,7 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
+                console.log("tempData",tempData);
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;
@@ -686,7 +690,7 @@
                 this.PostConfig.VideoStr = tempData.VideoStr;
                 this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe;
                 this.PostConfig.IsOpenHotel = tempData.IsOpenHotel;
-                this.PostConfig.DayNum=tempData.DayNum;//行程天数
+                this.PostConfig.DayNum = tempData.DayNum; //行程天数
 
 
                 this.NoticeParameters.ConfigId = tempData.ConfigId;
@@ -709,6 +713,8 @@
                 this.PostConfig.IsSubstitution = tempData.IsSubstitution;
                 this.PostConfig.IsDirect = tempData.IsDirect;
                 this.PostConfig.PriceIsDirect = tempData.PriceIsDirect;
+                //是否有报价单
+                this.IsHaveOffer = tempData.IsHaveOffer;
 
                 if (tempData.FlightList != null) {
                   this.PostConfig.FlightList = tempData.FlightList;
@@ -753,7 +759,7 @@
                 this.Error(res.data.message);
               }
               this.loading = false;
-              this.IsShowBtn=true;
+              this.IsShowBtn = true;
             },
             err => {}
           );
@@ -784,7 +790,7 @@
                 this.Error(res.data.message);
               }
               this.loading = false;
-              this.IsShowBtn=true;
+              this.IsShowBtn = true;
             },
             err => {}
           );