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

src/components/Ticketing/TicketManager.vue

@@ -1371,7 +1371,7 @@
               <el-col :span="2">
                 <span class="_lian_style" v-if="item.IsSetUnion==1">联</span>
                 <div class="_oll_img_box">
-                  <span class="TICK_Code PingFangSC">编号：{{item.ID}}</span>
+                  <span class="TICK_Code PingFangSC">编号：{{item.ID}}&nbsp;&nbsp;天数：<span style="color:#ff0066;font-weight:bold">{{item.DayNum}}</span></span>
                   <img v-if="!item.AirlineUrl" class="_oll_img" :src="defaultImg">
                   <img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg">
                 </div>
@@ -1936,7 +1936,7 @@
           </el-form-item>
         </el-col>
          <el-col :span="5">
-          <el-form-item label="行程天数(国际段)" >
+          <el-form-item label="行程天数(国际)" >
              <el-input v-model="addMsg.DayNum" placeholder="行程天数" @keyup.native="checkInteger(addMsg,'DayNum')" maxlength="2"></el-input>
           </el-form-item>
         </el-col>
@@ -2075,7 +2075,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="行程天数(国际段)" >
+          <el-form-item label="行程天数(国际)" >
              <el-input v-model="addMsg.DayNum" placeholder="行程天数" @keyup.native="checkInteger(addMsg,'DayNum')" maxlength="2"></el-input>
           </el-form-item>
         </el-col>

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -134,6 +134,7 @@
           IsUpdateHotel: 0,
           OpenTeamDescribe: "", //开团备注
           IsOpenHotel: 0, //0可以添加删除酒店，1-不能修改酒店信息
+          DayNum:0,//行程天数
         },
         //行程
         FeatureData: {
@@ -679,6 +680,7 @@
                 this.PostConfig.VideoStr = tempData.VideoStr;
                 this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe;
                 this.PostConfig.IsOpenHotel = tempData.IsOpenHotel;
+                this.PostConfig.DayNum=tempData.DayNum;//行程天数
 
 
                 this.NoticeParameters.ConfigId = tempData.ConfigId;

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -1470,12 +1470,10 @@
       },
       //选中航班选择框
       getSelect(item) {
-
-        // if (this.PostConfig.LineId == 14 && item.DayNum != this.PostConfig.DayNum) {
-        //   this.Error("团期行程天数和机票的行程天数不一致!请重新选择!");
-        //   return;
-        // }
-
+        if (this.PostConfig.LineId == 14 && item.DayNum != this.PostConfig.DayNum) {
+          this.Error("团期行程天数和机票的行程天数不一致!请重新选择!");
+          return;
+        }
         item.IsSelected = !item.IsSelected;
         this.FinfoList = [];
         this.selectFilghtList.forEach(x => {