页面修改

src/assets/utils/tripUtils.js

@@ -637,6 +637,41 @@ var tripUtils = {
     }
     return "";
   },
+  /*
+   * 获取交通城市编号,逗号分隔【一日游】
+   * 默认取当天上一个交通的结束城市编号，
+   * 如果当天没有取上一天结束城市编号
+   * 参数说明:DayList-行程数组，currentDayIndex-天数，numIndex:索引,isCompareIndex:是否比较索引(当前的数据需要验证索引，前一天的数据不需要验证索引)
+   */
+  NewOneDayTripGetCityId: function (DayList, currentDayIndex) {
+    var cityIdStr = "";
+    if (DayList != null && DayList.length > 0) {
+      DayList.forEach((dayItem, dayIndex) => {
+        if (dayIndex == currentDayIndex) {
+          if (dayItem.dayArray != null && dayItem.dayArray.length > 0) {
+            dayItem.dayArray.forEach(subItem => {
+              if (subItem.Type == "1" && subItem.childItem.SubTraffic && subItem.childItem.SubTraffic.length > 0) {
+                subItem.childItem.SubTraffic.forEach(childItem => {
+                  cityIdStr += childItem.StartCityId + "," + childItem.ArrivalCityId + ","
+                })
+              }
+            });
+          }
+        }
+      });
+      cityIdStr = cityIdStr.substring(0, cityIdStr.lastIndexOf(','));
+      if (currentDayIndex == 0) {
+        return cityIdStr;
+      } else if (currentDayIndex != 0) {
+        if (cityIdStr != "") {
+          return cityIdStr;
+        } else {
+          return tripUtils.NewTripGetCityId(DayList, currentDayIndex - 1);
+        }
+      }
+    }
+    return "";
+  },
   //获取距离当前项目最近的一天交通的所有城市(查询，酒店、餐厅、景点使用)
   GetCityIdArray: function (DayList, dayNum, currentIndex, isCompareIndex) {
     var array = [];

src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue

@@ -9,7 +9,6 @@
     <el-form :model="subConfig" :rules="Rules" ref="dayTripForm">
       <div class="TravelDaysTrip" :class="{'foldHeight':isFold==1}">
         <span class="TMTitle"><i></i>{{$t('sm.xianluxingcheng')}} </span>
-        <!-- <span class="foldList" style="margin-left:20px" @click="goUrl('TravelPreview')">预览行程</span> -->
         <div class="DaysTripTop">
           <span class="TDTextspan">{{$t('visa.v_xcdays')}}</span>
           <span class="TDInputspan">
@@ -107,11 +106,11 @@
                   </div>
                   <div v-if="subItem.Type==$tripUtils.TypeKey.hotel">
                     <span v-if="IsDirect==1">
-                      <hotelTrip v-bind:subItemObj="subItem" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
+                      <hotelTrip v-bind:subItemObj="subItem" v-bind:DayList="subConfig.DayList" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
                         v-bind:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
                         v-bind:subTotalIndex="item.dayArray.length"></hotelTrip>
                        <!---->  
-                      <hotelTripV2 v-bind:subItemObj="subItem" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
+                      <hotelTripV2 v-bind:subItemObj="subItem" v-bind:DayList="subConfig.DayList" v-bind:DefaultList="hotelSameList" v-bind:subIndex="subIndex"
                         v-bind:DinnerList="DinnerList" v-bind:index="index" :isOpenGroup="isOpenGroup"
                         v-bind:subTotalIndex="item.dayArray.length"  style="display:none;"></hotelTripV2>
                     </span>
@@ -120,13 +119,13 @@
                   </div>
                   <div v-if="subItem.Type==$tripUtils.TypeKey.scenic">
                     <span v-if="IsDirect==1">
-                      <scienTrip v-bind:subItemObj="subItem" v-bind:DefaultList="scenicSameList" v-bind:subIndex="subIndex"
+                      <scienTrip v-bind:subItemObj="subItem" v-bind:DayList="subConfig.DayList" v-bind:DefaultList="scenicSameList" v-bind:subIndex="subIndex"
                         v-bind:index="index" :isOpenGroup="isOpenGroup" v-bind:subTotalIndex="item.dayArray.length"></scienTrip>
                     </span>
                   </div>
                   <div v-if="subItem.Type==$tripUtils.TypeKey.dinner">
                     <span v-if="IsDirect==1">
-                      <dinnerTrip v-bind:subItemObj="subItem" v-bind:DefaultList="dinnerSameList" v-bind:subIndex="subIndex"
+                      <dinnerTrip v-bind:subItemObj="subItem" v-bind:DayList="subConfig.DayList" v-bind:DefaultList="dinnerSameList" v-bind:subIndex="subIndex"
                         v-bind:HotelList="HotelList" v-bind:index="index" :isOpenGroup="isOpenGroup"
                         v-bind:subTotalIndex="item.dayArray.length"></dinnerTrip>
                     </span>

src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue

@@ -168,7 +168,8 @@
       "HotelList",
       "index",
       "isOpenGroup",
-      "subTotalIndex"
+      "subTotalIndex",
+      "DayList",
     ],
     data() {
       var TimeTypeValidate = (rule, value, callback) => {
@@ -304,6 +305,14 @@
       "my-edit": MyEdit
     },
     methods: {
+      //获取交通城市
+      getCityIdStr() {
+        var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
+          this.DayList,
+          this.index,
+        );
+        return cityIdStr;
+      },
       //获取餐厅列表
       getDinnerList(event) {
         if (event) {
@@ -311,7 +320,7 @@
           var msg = {
             IsGetPic: 1,
             IsGetFeature: 1,
-            QCity: this.subItemObj.childItem.QCity
+            QCity: this.getCityIdStr()
           };
           this.apipost(
             "dining_post_GetLineDinnerList",

src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue

@@ -182,7 +182,8 @@
       "subIndex",
       "isOpenGroup",
       "subTotalIndex",
-      "TimeTypeList"
+      "TimeTypeList",
+      "DayList",
     ],
     data() {
       var TimeTypeValidate = (rule, value, callback) => {
@@ -257,13 +258,21 @@
       "my-edit": MyEdit
     },
     methods: {
+      //获取交通城市
+      getCityIdStr() {
+        var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
+          this.DayList,
+          this.index,
+        );
+        return cityIdStr;
+      },
       //获取酒店列表
       getHotelList(event) {
         if (event) {
           var msg = {
             IsGetPic: 1,
             IsGetRemark: 1,
-            QCity: this.subItemObj.childItem.QCity
+            QCity: this.getCityIdStr()
           };
           this.apipost(
             "hotel_post_GetLineHotelList",

src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct_V2.vue

@@ -152,7 +152,8 @@
       "subIndex",
       "isOpenGroup",
       "subTotalIndex",
-      "TimeTypeList"
+      "TimeTypeList",
+      "DayList",
     ],
     data() {
       var TimeTypeValidate = (rule, value, callback) => {
@@ -228,13 +229,21 @@
       comCheckHotelV2,
     },
     methods: {
+         //获取交通城市
+      getCityIdStr() {
+        var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
+          this.DayList,
+          this.index,
+        );
+        return cityIdStr;
+      },
       //获取酒店列表
       getHotelList(event) {
         if (event) {
           var msg = {
             IsGetPic: 1,
             IsGetRemark: 1,
-            QCity: this.subItemObj.childItem.QCity
+            QCity: this.getCityIdStr()
           };
           this.apipost(
             "hotel_post_GetLineHotelList",

src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue

@@ -57,14 +57,6 @@
               @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
             &nbsp;&nbsp;分钟
           </div>
-          <!-- <div class="TDRightPlan">
-            <label class="comTravelLeft">{{$t('scen.sc_etTime')}}</label>
-            <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour"
-              @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时
-            <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes"
-              @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
-            &nbsp;&nbsp;分钟
-          </div> -->
         </div>
       </div>
       <div class="TP_edit">
@@ -171,7 +163,8 @@
       "index",
       "isOpenGroup",
       "subTotalIndex",
-      "TimeTypeList"
+      "TimeTypeList",
+      "DayList",
     ],
     data() {
       var TimeTypeValidate = (rule, value, callback) => {
@@ -222,6 +215,15 @@
       "my-edit": MyEdit
     },
     methods: {
+         //获取交通城市
+      getCityIdStr() {
+        var cityIdStr = this.$tripUtils.NewOneDayTripGetCityId(
+          this.DayList,
+          this.index,
+ 
+        );
+        return cityIdStr;
+      },
       //获取景区列表
       getQScenicList(event) {
         if (event) {
@@ -229,7 +231,7 @@
           var msg = {
             IsGetPic: 1,
             IsGetFeature: 1,
-            QCity: this.subItemObj.childItem.QCity
+            QCity: this.getCityIdStr()
           };
           this.apipost(
             "ticketcoupons_post_GetLineScienList",