机票调整

src/components/Hotel/roomQuery.vue

@@ -43,7 +43,8 @@
         <li><span><em>{{$t('sm.Date')}}</em>
             <!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
               :picker-options="pickerBeginDateBefore"></el-date-picker> -->
-            <DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate" @change="(date)=> msg.StartDate = date"></DateLimit>
+            <DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate"
+              @change="(date)=> msg.StartDate = date"></DateLimit>
             -
             <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
               :picker-options="pickerBeginDateAfter"></el-date-picker>
@@ -166,12 +167,19 @@
                       </div>
                     </td>
                     <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0' style="white-space:nowrap;">
-                      <template v-for="(fItem,fIndex) in item.FlightList">
-                        <span style="height:25px; line-height:25px;">
-                          <a style="color: #ff0066;font-weight: bold;">{{fItem.Flight_number}}</a>
-                          {{fItem.FlightDateStr}}
-                          {{fItem.Departure_time}} {{fItem.dName}} {{fItem.TicketArrivalTime}} {{fItem.aName}}
-                        </span><br />
+                      <template v-if="item.NewFlightList&&item.NewFlightList.length>0">
+                        <template v-for="(fItem,fIndex) in item.NewFlightList">
+                          <template v-for="(fdItem,fdIndex) in fItem.Flist">
+                            <span style="height:25px; line-height:25px;">
+                              <a style="color: #ff0066;font-weight: bold;">{{fdItem.Flight_number}}</a>
+                              {{fdItem.FlightDateStr}}
+                              {{fdItem.Departure_time}} {{fdItem.dName}} {{fdItem.TicketArrivalTime}} {{fdItem.aName}}
+                            </span><br />
+                          </template>
+                          <template v-if="fIndex!=item.NewFlightList.length-1">
+                              <hr/>
+                          </template>
+                        </template>
                       </template>
                     </td>
                     <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
@@ -240,7 +248,9 @@
 <script>
   import DateLimit from '../public/DateLimit.vue';
   export default {
-    components: {DateLimit},
+    components: {
+      DateLimit
+    },
     data() {
       return {
         userInfo: {}, //用户信息
@@ -506,7 +516,7 @@
       if (this.$route.query.hotelId) {
         this.msg.HotelId = Number(this.$route.query.hotelId);
       }
-      this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:'';
+      this.msg.TCNUM = this.$route.query.TCNUM ? this.$route.query.TCNUM : '';
       if (this.$route.query.dateStr) {
         this.msg.DateStr = this.$route.query.dateStr;
       }