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

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -65,18 +65,19 @@
     text-align: center;
     margin: 10px;
   }
- .PassengerList .disClick {
+
+  .PassengerList .disClick {
     background-color: #d1d1d1;
     color: #fff;
     border: 1px solid #d1d1d1;
   }
- .PassengerList .disClick:hover {
+
+  .PassengerList .disClick:hover {
     background-color: #d1d1d1 !important;
     cursor: default !important;
     box-shadow: none !important;
   }
 
-
 </style>
 
 <template>
@@ -99,8 +100,7 @@
           </table>
         </li>
         <li>
-          <!-- <input type="button" class="normalBtn" v-if="!allDIs" value="分房表确认" @click="querenHotel(2)"> -->
-           <input type="button" class="normalBtn" v-if="allDIs" value="取消分房表确认" @click="querenHotel(0)">
+          <input type="button" class="normalBtn" v-if="allDIs" value="取消分房表确认" @click="querenHotel(0)">
           <input type="button" class="normalBtn" value="分房表下载" @click="exportExcel_singleRoom()">
           <input type="button" class="normalBtn" value="旅客名单下载" @click="exportExcel()">
         </li>
@@ -148,12 +148,8 @@
             </el-select>
           </td>
           <td>
-            <!-- <el-select v-model="subItem.HouseType" placeholder="请选择" @change="changeRmType(subItem, subIndex)" v-if="subItem.IsLeaderOrder==1">
-              <el-option :disabled="(subItem.HouseType == 1 && IsLeaderGuide == 1) || allDIs"
-                v-for="(hs, hsIndex) in HouseTypeList" :key="hsIndex" :label="hs.HouseName" :value="hs.HouseType">
-              </el-option>
-            </el-select> -->
-            <el-select v-model="subItem.HouseType" placeholder="请选择" @change="changeRmType1(subItem, subIndex,subItem.HouseType)" v-if="subItem.IsLeaderOrder==1">
+            <el-select v-model="subItem.HouseType" placeholder="请选择"
+              @change="changeRmType1(subItem, subIndex,subItem.HouseType)" v-if="subItem.IsLeaderOrder==1">
               <el-option :disabled="(hs.disabled && IsLeaderGuide == 1) || allDIs"
                 v-for="(hs, hsIndex) in HouseTypeList" :key="hsIndex" :label="hs.HouseName" :value="hs.HouseType">
               </el-option>
@@ -189,7 +185,8 @@
         </tr>
         <tr v-if="!allDIs" style="height:50px; line-height:50px;">
           <td style="text-align:right" colspan="23">
-            <input type="button" value="保存" :class="{'disClick':!isSubmit}" class="leader2Btn" @click="saveOPSetGuestHouse">
+            <input type="button" value="保存" :class="{'disClick':!isSubmit}" class="leader2Btn"
+              @click="saveOPSetGuestHouse">
           </td>
         </tr>
       </tbody>
@@ -260,12 +257,12 @@
         houseList: [],
         HouseTypeList: [],
         //领队才能选数据
-        LeaderHouseList:[],
+        LeaderHouseList: [],
         numberList: [],
         dataList: [],
         otherList: [], //单机票和自由行列表
         //只有两个项、
-        twoList:[],
+        twoList: [],
         allDIs: false,
         //验证重复提交
         isSubmit: true,
@@ -277,7 +274,7 @@
         this.apipost(
           "travel_get_UpdateOpSureHouse", {
             TCID: this.TCID,
-            OpSureHouse:OpSureHouse
+            OpSureHouse: OpSureHouse
           },
           res => {
             if (res.data.resultCode == 1) {
@@ -291,11 +288,11 @@
         );
       },
       // 修改类型1
-      changeRmType1: function (obj, index,type) {
-        if(type==1||type==6){
-          this.HouseTypeList.forEach((x,index)=>{
-            if(index!=0&&index!=5){
-              x.disabled=true
+      changeRmType1: function (obj, index, type) {
+        if (type == 1 || type == 6) {
+          this.HouseTypeList.forEach((x, index) => {
+            if (index != 0 && index != 5) {
+              x.disabled = true
             }
           })
         }
@@ -309,7 +306,6 @@
         list = list.sort(this.compare)
         this.dataList = list;
       },
-
       // 修改类型
       changeRmType: function (obj, index) {
         let list = this.dataList;
@@ -387,26 +383,6 @@
         }
         return str;
       },
-      //获取房间类型
-      getHouseTypeStr(HouseType) {
-        var str = "";
-        if (HouseType == 1) {
-          str = "自然单间";
-        } else if (HouseType == 2) {
-          str = "标准双人间";
-        } else if (HouseType == 3) {
-          str = "大床房";
-        } else if (HouseType == 4) {
-          str = "三人间";
-        } else if (HouseType == 5) {
-          str = "拼凑双人间";
-        }else if (HouseType == 6) {
-          str = "司导间";
-        } else {
-          str = "未分配";
-        }
-        return str;
-      },
       getHouseTypeList: function () {
         this.apipost(
           "travel_get_GetHouseType",
@@ -415,14 +391,14 @@
             this.QueryMsg.loading = false;
             if (res.data.resultCode == 1) {
               this.HouseTypeList = res.data.data;
-              this.LeaderHouseList=[];
-              this.twoList=[];
-              this.HouseTypeList.forEach(x=>{
-                x.disabled=false;
-                if(x.HouseType!=6){
+              this.LeaderHouseList = [];
+              this.twoList = [];
+              this.HouseTypeList.forEach(x => {
+                x.disabled = false;
+                if (x.HouseType != 6) {
                   this.LeaderHouseList.push(x)
                 }
-                if(x.HouseType==1||x.HouseType==6){
+                if (x.HouseType == 1 || x.HouseType == 6) {
                   this.twoList.push(x);
                 }
               })
@@ -431,30 +407,6 @@
           err => {}
         );
       },
-      setDataList: function (list) {
-        var Diningmap = {},
-          Diningdest = [];
-        for (var i = 0; i < list.length; i++) {
-          var ai = list[i];
-          if (!Diningmap[ai.HouseNo]) {
-            Diningdest.push({
-              HouseType: ai.HouseType,
-              HouseNo: ai.HouseNo,
-              data: [ai]
-            });
-            Diningmap[ai.HouseNo] = ai;
-          } else {
-            for (var j = 0; j < Diningdest.length; j++) {
-              var dj = Diningdest[j];
-              if (dj.HouseType == ai.HouseType && dj.HouseNo == ai.HouseNo) {
-                dj.data.push(ai);
-                break;
-              }
-            }
-          }
-        }
-        this.QueryMsg.dataList = Diningdest;
-      },
       //获取数据
       getList() {
         this.QueryMsg.loading = true;
@@ -513,27 +465,26 @@
           TCID: this.msg.TCID,
           isGetTicket: 1, //不查询机票
           isGetZiYouXing: 0, //查询自由行
-          isOnlyFenFang:1,//只查询已分房的
+          isOnlyFenFang: 1, //只查询已分房的
         };
         var fileName = "旅客名单.xls";
         if (this.QueryMsg.TeamInfoData != null) {
           fileName =
-            "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】分房表["+this.getCurrentTime()+"].xls";
+            "【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】分房表[" + this.getCurrentTime() + "].xls";
         }
         this.GetLocalFile("travel_get_GetTravelRoomExport", msg, fileName, res => {
           this.QueryMsg.loading = false;
         });
       },
-      getCurrentTime()
-      {
+      getCurrentTime() {
         var date = new Date();
         var year = date.getFullYear();
-        var month = date.getMonth()+1;
+        var month = date.getMonth() + 1;
         var day = date.getDate();
         var hour = date.getHours();
         var minute = date.getMinutes();
         var second = date.getSeconds();
-        return year+'_'+month+'_'+day+'_'+hour+'_'+minute+'_'+second;
+        return year + '_' + month + '_' + day + '_' + hour + '_' + minute + '_' + second;
       },
       //获取团期信息
       getTeamInfo() {

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -824,8 +824,6 @@
                   this.PostConfig.TripColor = tempData.LineTripColor;
                   this.FeatureData.TripColor = tempData.LineTripColor;
                 }
-                console.log(" this.PostConfig", this.PostConfig)
-                console.log(" this.FeatureData", this.FeatureData)
                 this.FeatureData.LtName = tempData.LtName;
                 this.FeatureData.DayList = tempData.DayList;
 

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -76,7 +76,7 @@
           </div>
         </div>
         <Tripmap v-if="ShowMap" :PostConfig="PostConfig" :ConfigId="ConfigId" @Cancel="ShowMap=false"
-          @Success="getMapImgSuccess()" @saveMsg="SaveData(1)"></Tripmap>
+          @saveMsg="ShowMap=false,SaveData(1)"></Tripmap>
       </div>
       <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
         :subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
@@ -299,10 +299,6 @@
       };
     },
     methods: {
-      getMapImgSuccess(path) {
-        this.PostConfig.MapUrl = path
-        this.ShowMap = false
-      },
       /*获取行程特色内容对象*/
       getFeature(featureObj) {
         this.PostFeature = featureObj;

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue

@@ -109,6 +109,7 @@
         ],
         homeBg3: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg",
         homeBg1: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg",
+        homeBgOz1: "https://imgfile.oytour.com/Static/NewTripFeature/homebgoz.jpg", //欧洲线默认图
         homeBg2: "http://imgfile.oytour.com/Static/NewTripFeature/homeBg2.jpg",
         dinner1: "http://imgfile.oytour.com/Static/NewTripFeature/dinner1.jpg",
         dinner2: "http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg",
@@ -292,13 +293,14 @@
       },
       //介绍页数据
       getIntroduceData(tripObj, newObj) {
-        newObj.ImgList = [{
+        var imgObj = {
           url: this.homeBg1,
           x: 0,
           y: 0,
-        }];
+        }
         if (this.FeatureData && this.FeatureData.LineShortName && this.FeatureData.LineShortName.indexOf('欧洲') > -1) {
-          newObj.MainName = "欧洲旅行家";
+          imgObj.url = this.homeBgOz1;
+          newObj.MainName = "欧洲旅行专家";
           newObj.SubName = '‹印象欧洲› 欧洲旅行家';
           newObj.MainDesc =
             "坚持以高端旅游服务广大客户群体！我们坚信旅游是美好的体验！带您体验欧洲的四季之美，印象欧洲不断思索旅游本质，坚持旅游质量，对于旅游的专业与服务有着深刻认知！我们的用心，您一定会看的见！选择印象欧洲，会是你前往欧洲最好的选择，您一定会认同并期待您的参与，这也是我们由衷的期盼！“旅游”不是舟车劳顿的代名词~提供高档旅游产品，印象之旅有其独到的见解与坚持，这就是各位选择旅游的真正定义!来吧~如果你还在犹豫不知道该选择什么样的欧洲产品，相信印象之旅是你最棒的选择！最后并祝各位有个愉快的旅游假期!"
@@ -308,6 +310,7 @@
           newObj.MainDesc =
             "坚持以高端旅游服务广大客户群体！我们坚信旅游是美好的体验！带您体验日本的四季之美，赏花.赏枫.赏雪并且享受怀石料理，泡露天温泉，遨游日本的秀丽山海美景！印象日本不断思索旅游本质，坚持旅游质量，对于旅游的专业与服务有着深刻体认！我们的用心，您一定会看的见！选择印象日本，会是你前往日本最好的选择，您一定会认同并期待您的参与，这也是我们由衷的期盼！“旅遊”不是舟車勞頓的代名詞~提供高档旅游产品，印象之旅有其独到的见解与坚持，这就是各位选择旅游的真正定义!来吧~如果你还在犹豫不知道该选择什么样的日本产品，相信印象之旅对是你最棒的选择！最后并祝各位有个愉快的旅游假期!";
         }
+        newObj.ImgList = [imgObj];
       },
       //详情页数据
       getDetailsData(tripObj, newObj) {

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -591,7 +591,6 @@
       //选中的景点
       'ChooseScenicArray': {
         handler: function (val, oldVal) {
-          console.log("this.ChooseScenicArray",this.ChooseScenicArray)
           //新增
           this.ChooseScenicArray.forEach(x => {
             let isExist = false;
@@ -604,7 +603,6 @@
               let scenic = this.$tripUtils.scenicObj();
               this.QScenicList.forEach(s => {
                 if (s.ID === x) {
-                  console.log("scenic22",s);
                   scenic.Description = s.Feature;
                   scenic.CouponsId = x;
                   scenic.CouponsName = s.Name;