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

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -346,6 +346,9 @@
                   } else if (TeamType == 2) {
                     path = "TravelManager4";
                   }
+                  if(postData.isfromManager){
+                    path = "TravelManager5";
+                  }
                   this.Success("保存成功");
                   if (this.isNewConfig) {
                     this.$router.push({

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -331,21 +331,21 @@
             <ul class="days">
               <li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked" class="other-month">{{dayobject.day.getDate()}}</span>
-                <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1" :class="dayobject.click?'_yes_click':''"
-                      @click="dayobject.click?clickedDay(dayobject):''">{{dayobject.day.getDate()}}</span>
-                <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" :class="dayobject.click?'_yes_click':''"
-                      @click="dayobject.click?clickedDay(dayobject):''">{{dayobject.day.getDate()}}</span>
+                <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
+                      @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
+                      @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
               </li>
+              <!-- <li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
+                <span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
+                  class="other-month">{{dayobject.day.getDate()}}</span>
+                <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+              </li> -->
             </ul>
           </div>
-          <!--<div>-->
-            <!--<el-date-picker-->
-              <!--v-model="chooseDay"-->
-              <!--@change="clickedDay()"-->
-              <!--type="date"-->
-              <!--placeholder="选择日期">-->
-            <!--</el-date-picker>-->
-          <!--</div>-->
         </div>
       </div>
       <div class="TPright"></div>
@@ -637,7 +637,7 @@
 
 
                 </div>
-                  <div class="clearfix">
+                <div class="clearfix">
                   <div class="leftSetInfo">
                     <span class="TPbaseSet" style="width:62px;"></span>
                     <span class="TPsecondTitle" style="width:66px;">op对外备注</span>
@@ -691,6 +691,15 @@
                     </el-form-item>
                   </div>
                 </div>
+                <div class="TPright" style="float:left;">
+                    <span>团期标签</span>
+                    <span>
+                       <el-checkbox-group v-model="priceData.PriceTagIds">
+                        <el-checkbox v-for="team in teamTips" :label="team.ID"
+                          :key="team.Content">{{team.Content}}</el-checkbox>
+                      </el-checkbox-group>
+                    </span>
+                </div>
               </div>
             </el-form>
           </div>
@@ -727,7 +736,7 @@
             Url: "",
             Name: ""
           },
-          SaleBranchIdArray: []
+          SaleBranchIdArray: [],
         },
         returnPriceList: this.priceList,
         companyList: [],
@@ -779,6 +788,8 @@
         queryFlightAirListData:[],
         queryFlightAirDateList:[],
         getSelectdata:'',
+        //团期标签
+        teamTips:[],
       };
     },
     methods: {
@@ -871,6 +882,8 @@
                 AirticketBindList: [],
                 LowNum: 2,
                 TeamType:1,
+                //选中团期标签
+                PriceTagIds:[],
                 PriceFlight: JSON.parse(
                   JSON.stringify(this.PostConfig.FlightList)
                 )
@@ -1388,7 +1401,22 @@
             });
           }
         });
-      }
+      },
+      //获取所有小包团
+      getAllTeamTips(){
+        let msg = {
+          name:'theme',
+          code:'1'
+        }
+        this.apipost("travel_get_GetTravelPriceTag", msg, res => {
+            if (res.data.resultCode == 1) {
+              this.teamTips = res.data.data;
+            }else{
+              this.Error(res.data.message);
+            }
+          },err => {}
+        );
+      },
     },created(){
       localStorage.removeItem('queryFlightAirMsg');
       if(this.TeamType==1){
@@ -1404,6 +1432,7 @@
       this.currentMonth = dateObj.CurrentMonth;
       this.initCalendar();
       this.getCompanyList();
+      this.getAllTeamTips();
     },
     watch: {
       priceList: {
@@ -1429,7 +1458,7 @@
           this.returnPriceList.forEach((x, index) => {
             if (index == 0) {
               this.priceData = this.returnPriceList[index];
-
+              console.log(this.priceData,'刚进来。。。');
               x["Checked"] = true;
               this.chooseDay = this.priceData.StartDate;
               //this.getSelectFilght(this.priceData.StartDate);
@@ -1442,6 +1471,13 @@
         },
         deep: true
       },
+
+      priceData: {
+        handler:function(val,oldVal){
+        },
+        deep:true
+      },
+
       returnPriceList: {
         //深度监听，可监听到对象、数组的变化
         handler: function (val, oldVal) {

src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue

@@ -189,6 +189,7 @@
         TeamType:'',
         loading: false,
         isNewConfig: true,
+        isfromManager:true,
       };
     },
     components: {
@@ -339,7 +340,7 @@
         TripFeature.B2BRemark = this.PostNotice.B2BRemark;
         TripFeature.ShopRemark = this.PostNotice.ShopRemark;
         TripFeature.VisaRemark = this.PostNotice.VisaRemark;
-
+        
         if (
           basicData.TrafficList != null &&
           basicData.TrafficList.length > 0 &&
@@ -365,9 +366,10 @@
             if (res.data.resultCode == 1) {
               //配置编号
               TripFeature.ConfigId = res.data.data;
+              TripFeature.isfromManager = true;
               this.$refs.TravelFeature.getHtml(TripFeature, SaveType,this.TeamType);
-              this.$refs.TravelPrice.closeHotelDialog();
-              this.$refs.TravelPrice.initStatus();
+              // this.$refs.TravelPrice.closeHotelDialog();
+              // this.$refs.TravelPrice.initStatus();
             } else if (res.data.resultCode == 10009) {
               this.FeatureData.IsSave = false;
               //表单重复提交