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

src/components/Ticketing/PassengerList.vue

@@ -116,8 +116,8 @@
           </table>
         </li>
         <li>
-          <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" />
-          <!-- <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" /> -->
+          <!-- <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" /> -->
+          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" />
         </li>
       </ul>
     </div>
@@ -158,11 +158,12 @@
       <div style="border-bottom:1px solid #d1d1d1;">
           <table border=0 class="pg_table">
               <tr>
-                  <td width="50" style="vertical-align:top;position:relative;">
-                    <span class="Pgzhu">主</span>去程
+                  <td width="50" style="vertical-align:top;position:relative;" class="">
+                    <span class="Pgzhu">票务信息</span>
                   </td>
+              
                   <td>
-                        <div class="PgflightDiv" v-for="item in flightList" v-if="item.FlightSubType==1">
+                        <div class="PgflightDiv" v-for="item in flightList">
                           <p>
                             <span class="iconfont icon-hangban"></span>
                             <span>{{item.Flight_number}}</span>
@@ -192,8 +193,9 @@
                         </div>
                   </td>
               </tr>
+              
               <tr>
-                  <td width="50" style="vertical-align:top;">回程</td>
+                  <td width="50" style="vertical-align:top;">联运信息</td>
                   <td>
                        <div class="PgflightDiv" v-for="item in flightList" v-if="item.FlightSubType==3">
                           <p>

src/components/Ticketing/flightManagement.vue

@@ -230,7 +230,7 @@
               <el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index,1)"></el-button>
             </el-tooltip>
 
-            <el-tooltip class="item" effect="dark" content="效期维护" placement="top-start">
+            <el-tooltip class="item" effect="dark" content="效期维护" placement="top-start" style="display:none;">
               <el-button type="primary" icon="iconfont icon-weihu" circle @click="gotoChild(item)"></el-button>
             </el-tooltip>
           </el-row>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -715,7 +715,7 @@
     </div>
     <el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
       <table class="TphotelTable" border="0" cellspacing='1'>
-        <tr v-for="item in returnPriceList[0].PriceHotelList">
+        <!-- <tr v-if="returnPriceList" v-for="item in returnPriceList[0].PriceHotelList">
           <td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
           <td>
             <div class="tp_divList" v-for="(subItem,index) in item.SubList">
@@ -724,7 +724,7 @@
               </div>
             </div>
           </td>
-        </tr>
+        </tr> -->
       </table>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary">{{$t('pub.saveBtn')}}</button> &nbsp;