页面修改

src/assets/utils/tripUtils.js

@@ -470,7 +470,7 @@ var tripUtils = {
       ImaArray: [],
       Rank: 0,
       //餐厅名称
-      DinnerName: "",
+      DinnerName: "酒店内享用早餐",
       //套餐名称
       MealName: "",
       QCity: '',

src/components/newTravelmanager/TravelGroupControl/TravelTemp/VEditDiv.vue

@@ -28,14 +28,17 @@
         }
         this.$emit("input", this.$el.innerText);
         setTimeout(() => {
-          var range = sel.getRangeAt(0);
-          var textNode = range.startContainer;
-          range.setStart(textNode, offset);
-          sel.removeAllRanges();
-          sel.addRange(range);
+          try {
+            var range = sel.getRangeAt(0);
+            var textNode = range.startContainer;
+            range.setStart(textNode, offset);
+            sel.removeAllRanges();
+            sel.addRange(range);
+          } catch(err) {
+             console.warn(err);
+          }
         }, 0);
       },
-
     }
   };
 

src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue

 <style>
-  .TravelDayContentThree .TC-HotelDinner td{
+  .TravelDayContentThree .TC-HotelDinner td {
     padding-left: 0 !important;
   }
-  .TC-HotelDinner{
+
+  .TC-HotelDinner {
     display: flex;
     justify-content: space-between;
     flex-wrap: wrap;
   }
-  .TC-Comtitlediv{
+
+  .TC-Comtitlediv {
     width: 100%;
   }
-  .Traveltrip-item-box{
+
+  .Traveltrip-item-box {
     overflow: hidden;
   }
-  .TC-HotelDinner{
+
+  .TC-HotelDinner {
     display: flex;
     flex-wrap: wrap;
     padding: 0 10px;
   }
+
   .TC-HotelDinner tr td {
     vertical-align: middle;
   }
@@ -40,7 +45,8 @@
     font-size: 13px;
     margin-left: 20px;
   }
-  .Ht_hotelSelect{
+
+  .Ht_hotelSelect {
     width: 330px;
   }
 
@@ -64,9 +70,10 @@
             </td>
             <td width="140" valign="middle">
               <el-select v-if="!dayObj.isRead&&IsDirect==1" class="" :placeholder="$t('pub.pleaseSel')" filterable
-                v-model="dayObj.DinnerArray[0].BreakfastUseType">
+                v-model="dayObj.DinnerArray[0].BreakfastUseType" @change="changeBreakfastList(dayObj.DinnerArray[0])">
                 <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
-                <el-option v-for="item in breakFirstList" :label="item.name" :value="item.Id" :key="item.Id"></el-option>
+                <el-option v-for="item in breakFirstList" :label="item.name" :value="item.Id" :key="item.Id">
+                </el-option>
               </el-select>
               <el-input type="text" v-model="dayObj.DinnerArray[0].DinnerName" class=""
                 v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(0)"></el-input>
@@ -101,29 +108,23 @@
               <img src="../../../assets/img/daily_dinner.png">
             </td>
             <td valign="middle">
-              <el-select v-if="!dayObj.isRead&&IsDirect==1" class="" style="width: 140px;" :placeholder="$t('pub.pleaseSel')" filterable
-                v-model="dayObj.DinnerArray[2].DinnerId" @visible-change="getDinnerList($event)"
-                @change="changeDinner2List(dayObj.DinnerArray[2])">
+              <el-select v-if="!dayObj.isRead&&IsDirect==1" class="" style="width: 140px;"
+                :placeholder="$t('pub.pleaseSel')" filterable v-model="dayObj.DinnerArray[2].DinnerId"
+                @visible-change="getDinnerList($event)" @change="changeDinner2List(dayObj.DinnerArray[2])">
                 <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
                 <el-option v-for="item in QDinnerList2" :label="item.Name" :value="item.ID" :key="item.ID">
                   <span>{{ item.Name }}</span>
                   <span class="TC-realSpan">{{item.RealName}}</span>
                 </el-option>
               </el-select>
-
               <el-input type="text" v-model="dayObj.DinnerArray[2].DinnerName" class=""
                 v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(2)"></el-input>
               <span class="TC-hotelName" v-if="dayObj.isRead">
                 {{IsDirect==1?getQDinnerList2(dayObj.DinnerArray[2].DinnerId):dayObj.DinnerArray[2].DinnerName}}
               </span>
-
             </td>
           </tr>
         </template>
-
-        <!-- <tr>
-          <td colspan="6" height="15"></td>
-        </tr> -->
         <tr class="marginT10">
           <td width="70" valign="top">
             <img crossorigin="Anonymous" src="../../../assets/img/daily_hotel-1.png">
@@ -168,7 +169,7 @@
         QDinnerList: [],
         QDinnerList2: [],
         DefaultSelectValue: 0,
-        breakFirstList: [  ],
+        breakFirstList: [],
         showDining: false,
         HotelChooseArray: this.dayObj.HotelChooseArray,
         dinnerArray: this.dayObj.DinnerArray,
@@ -189,7 +190,7 @@
       noDirectDinnerChange: function (dIndex) {
         if (this.dinnerArray[dIndex].MD5Sign === '') {
           this.dinnerArray[dIndex].MD5Sign = this.md5(
-          `DayNum=${this.dinnerArray[dIndex].DayNum}&Type=2${new Date()}`);
+            `DayNum=${this.dinnerArray[dIndex].DayNum}&Type=2${new Date()}`);
         }
       },
       //获取交通城市
@@ -326,6 +327,21 @@
         });
         return isExist;
       },
+      //早餐切换
+      changeBreakfastList(breakfastObj) {
+        if (breakfastObj.BreakfastUseType != 0) {
+          //获取当前选中的对象
+          let obj = {};
+          obj = this.breakFirstList.find(item => {
+            return item.Id === breakfastObj.BreakfastUseType; //筛选出匹配数据
+          });
+          if (obj != undefined) {
+            breakfastObj.DinnerName = obj.name;
+          }
+        } else {
+          breakfastObj.DinnerName = "";
+        }
+      },
       //获取餐厅列表
       getDinnerList(event) {
         if (event) {
@@ -632,9 +648,9 @@
           "travel_get_GetConfigDinnerList", {},
           res => {
             if (res.data.resultCode == 1) {
-              this.breakFirstList= res.data.data.breakFirstList;
-              this.otherDinner=res.data.data.otherDinner;
-              this.hotelHotSpringDinner=res.data.data.hotelHotSpringDinner;
+              this.breakFirstList = res.data.data.breakFirstList;
+              this.otherDinner = res.data.data.otherDinner;
+              this.hotelHotSpringDinner = res.data.data.hotelHotSpringDinner;
             }
           },
           err => {}

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -10,7 +10,7 @@
                 <span>{{item.DayNum>9?item.DayNum:'0'+item.DayNum}}</span>
               </div>
               <div class="travelDaysTitlle-left-textTwo">
-                <span>{{day}}</span>
+                <span>DAY</span>
               </div>
             </div>
           </div>
@@ -54,13 +54,7 @@
                 v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
                 class="absolute" src="../../../../assets/img/defaultairline.png">
             </div>
-            <div class="travelDaysMasterMap-text absolute z-index2">
-              <vEditDiv v-if="ScenicArrayList.length==0" :canEdit='canEdit'
-                v-model="item.TrafficObj.trafficIntroduce.IntroduceTitle"></vEditDiv>
-              <template v-if="ScenicArrayList.length>0">{{ScenicArrayList[0].CouponsName}}</template>
-            </div>
           </div>
-
         </div>
         <div class="travelDaysContent">
           <div class="travelDaysContent-text" v-for="(jindian,j) in item.ScenicArray" v-if="item.ScenicArray.length>0"
@@ -84,9 +78,7 @@
         </div>
         <div class="travelDaysdetails-tsTextBox">
           <div class="travelDaysdetails-tsText" :style="{'background':backgroundColor2}">
-
             <span class="travelDaysdetails-text0">温馨提示：</span>
-
             <template v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
               <div v-html="item.WarmTipObj.Description"></div>
             </template>
@@ -98,15 +90,26 @@
             <div class="travelDaysdetails-textBox row">
               <div class="travelDaysdetails-text row">
                 <span class="travelDaysdetails-text0">早餐：</span>
-                <div>{{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}</div>
+                <div>
+                  <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>0">
+                    {{item.DinnerArray[0].DinnerName?item.DinnerArray[0].DinnerName:'无'}}
+                  </template>
+                </div>
               </div>
               <div class="travelDaysdetails-text row">
                 <span class="travelDaysdetails-text0">午餐：</span>
-                <div>{{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}</div>
+                <div>
+                  <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>1">
+                    {{item.DinnerArray[1].DinnerName?item.DinnerArray[1].DinnerName:'无'}}
+                  </template>
+                </div>
               </div>
               <div class="travelDaysdetails-text row">
                 <span class="travelDaysdetails-text0">晚餐：</span>
-                <div>{{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}</div>
+                <div> <template v-if="item&&item.DinnerArray&&item.DinnerArray.length>2">
+                    {{item.DinnerArray[2].DinnerName?item.DinnerArray[2].DinnerName:'无'}}
+                  </template>
+                </div>
               </div>
             </div>
             <div class="travelDaysdetails-textBox">
@@ -133,7 +136,6 @@
         <span>底线</span>
       </div>
     </div>
-
     <el-dialog custom-class="resourceImgAdd" :title="$t('sm.chooseImg')" center :visible.sync="isShowScenicImg">
       <!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
       <DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:isCheckmore="1"
@@ -141,7 +143,6 @@
       </DMCchooseImg>
     </el-dialog>
   </div>
-
 </template>
 
 <script>
@@ -163,8 +164,7 @@
       return {
         RenderingOk: false,
         canEdit: true,
-        title: '北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）北京-马德里-塞戈维亚-萨拉曼卡-贝尼多姆/小镇-瓦伦西亚-巴塞罗那（约 253km，约 3h）',
-        day: 'DAY',
+
         backgroundColor: '',
         backgroundColor2: '',
         textColor: '',

src/components/newTravelmanager/travelLineTrip/travelDaysTripThree.vue

@@ -315,25 +315,7 @@
       getScenicArray(){
         let i = 1
         let list = []
-        // this.ScenicArray.forEach(y=>{
-        //   this.dayObj.ScenicArray.forEach(x=>{
-        //     x.Rank = 0
-        //     if(x.CouponsId==y){
-        //         list.push(x)
-        //     }
-        //   })
-        // })
-        // this.dayObj.ScenicArrayImg = JSON.parse(JSON.stringify(this.ScenicArray));
-        // list.forEach((x,index)=>{
-        //   x.Rank = index+1
-        // })
-        // this.dayObj.ScenicArray.forEach(x=>{
-        //   list.forEach(y=>{
-        //     if(x.CouponsId==y.CouponsId){
-        //       x.Rank = y.Rank
-        //     }
-        //   })
-        // })
+ 
         this.dayObj.ScenicArray.forEach(x=>{
           x.Rank = 0
           if(x.CouponsId===this.ScenicArraySingle){