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

src/components/TravelManager/TravelTeam/priceGroup.vue

 <style>
-  /* @import "../../assets/css/newTravelManager.css"; */
+  @import "../../../assets/css/newTravelManager.css";
 
   .productQuerySearch {
     width: 100%;
@@ -598,11 +598,89 @@
             <div class="el-col w_20">
               <div class="p20">
                 <div class="mb title"><i class="iconfont icon-hangban1"></i><span>航班信息</span></div>
-                <div class="mb" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
+                <!-- <div class="mb" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
                   <div> {{subItem.Flight_number}}
                     {{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
                     {{subItem.Arrival_time}}</div>
+                </div> -->
+                  
+                  <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
+                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                      <tr class="_color_666" style="text-align:center;">
+                        <th width="60">{{$t('Airticket.Air_segment')}}</th>
+                        <th width="80">{{$t('system.query_flightNum')}}</th>
+                        <th width="150">{{$t('system.ph_flightTime')}}</th>
+                        <th width="80">{{$t('system.query_arrivalTime')}}</th>
+                        <th width="100">{{$t('system.query_stopCity')}}</th>
+                      </tr>
+                      <tr v-for="(fItem,fIndex) in item.TravelTeamFlightList" :key="fIndex" style="text-align:center;">
+                        <td class="_d_name _color_666">
+                          <span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span>
+                          <span v-else-if="fIndex==item.TravelTeamFlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
+                          <span
+                            v-else-if="fIndex>0 && fIndex!=item.TravelTeamFlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
+                        </td>
+                        <td>
+                          <div>{{fItem.Flight_number}}</div>
+                          <div style="margin-top:5px;">{{fItem.AlName}}</div>
+                        </td>
+                        <td>
+                          <div>{{fItem.FlightDate}} {{fItem.Departure_time}}</div>
+                          <div style="margin-top:5px;">
+                            <span v-if="fItem.DIATA">({{fItem.DIATA}})</span>
+                            {{fItem.dName}}
+                          </div>
+                        </td>
+                        <td>
+                          <div>{{fItem.FlightArrivalTime}} {{fItem.Arrival_time}}</div>
+                          <div style="margin-top:5px;">
+                            <span v-if="fItem.AIATA">({{fItem.AIATA}})</span>
+                            {{fItem.aName}}
                           </div>
+                        </td>
+                        <td>
+                          <template v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}
+                        </td>
+                      </tr>
+                    </table>
+                    <div class="FlightDiv-TCL" slot="reference">
+                      <template>
+                        <div v-for="subItem in item.TravelTeamFlightList" slot="reference" :key="subItem.subCode"
+                          class="TCL-flighInfoList">
+                          <span class="travelnowrap">
+                            <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
+                            <span><template v-if="subItem.DIATA">({{subItem.DIATA}})</template>
+                              <template v-else>({{subItem.dName}})</template></span>
+                            {{subItem.DepartureName}}
+                            {{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
+                            <template v-if="subItem.ArrivalCityName">
+                              <span v-if="subItem.AIATA">
+                                -({{subItem.AIATA}})
+                              </span>
+                              <span v-else>-</span>
+                              {{subItem.ArrivalCityName}}
+                              <template v-if="!subItem.DIATA">({{subItem.aName}})</template>
+                            </template>
+                            <span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
+                            <span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
+                          </span>
+                        </div>
+                      </template>
+                      <!-- <template v-else>
+                        <div v-for="subItem in item.TravelTeamFlightList" slot="reference" :key="subItem.subCode"
+                          class="TCL-flighInfoList">
+                          <span class="travelnowrap">
+                            <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
+                            {{subItem.aName}} {{subItem.Departure_time}}
+                            -
+                            {{subItem.dName}} {{subItem.Arrival_time}}
+                            <span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
+                            <span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
+                          </span>
+                        </div>
+                      </template> -->
+                    </div>
+                  </el-popover>
               </div>
             </div>
             <div class="el-col w_10">

src/components/TravelManager/TravelTeam/travelPayList.vue

@@ -111,13 +111,13 @@
         GTeamId: 0, //包机团队Id
         //查询参数
         queryMsg: {
-          pageIndex: 1,
-          pageSize: 10,
+          // pageIndex: 1,
+          // pageSize: 10,
           total: 0,
           TCID: '',
           //是否有数据
           noData: false,
-          currentPage: 1,
+          // currentPage: 1,
           loading: false, //加载层
         },
         queryDataObj: {