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

src/components/Complaints/ComplaintsManage.vue

@@ -453,6 +453,8 @@
                 if (res.data.resultCode == 1) {
                   that.Success(res.data.message);
                   that.getList();
+                }else{
+                  that.Error(res.data.message);
                 }
               },
               null

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -180,6 +180,11 @@
     border: 1px solid #d1d1d1;
   }
 
+  ._TravelPriceDetails .jiDiv{
+    width:800px;
+    height:400px;
+    overflow: auto;
+  }
   ._TravelPriceDetails table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
@@ -187,7 +192,7 @@
     border: 1px solid #d2d2d2;
     font-size: 12px;
     margin: 0 20px 5px 0;
-    min-width: 800px;
+    width: 100%;
   }
 
   ._TravelPriceDetails table ._color_666 {
@@ -198,7 +203,7 @@
 
   ._TravelPriceDetails table td {
     background-color: #ffffff;
-    padding: 9px 30px;
+    padding: 9px 0;
     color: #333333;
     text-align: center;
     border: 1px solid #d2d2d2;
@@ -672,37 +677,38 @@
                           </el-date-picker>
                           <button class="normalBtn" @click.stop="getSelectFilght()">查询</button>
                         </div>
-
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                          <tr>
-                            <td class="_color_666">选择</td>
-                            <td class="_color_666">航班号</td>
-                            <td class="_color_666">航空公司</td>
-                            <td class="_color_666">航段</td>
-                            <td class="_color_666">时间</td>
-                            <td class="_color_666">PNR</td>
-                            <td class="_color_666">机票数量</td>
-                            <td class="_color_666">使用数量</td>
-                            <td class="_color_666">绑定机位数</td>
-                          </tr>
-                          <tr v-for="fitem in selectFilghtList">
-                            <td>
-                              <el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>
-                            </td>
-                            <td><span class="TP_Airticktid"
-                                @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span>
-                            </td>
-                            <td>{{fitem.AlName}}</td>
-                            <td>{{fitem.DepartureName}}-{{fitem.ArrivalCityName}}</td>
-                            <td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
-                            <td>{{fitem.PNR}}</td>
-                            <td>{{fitem.TicketNum}}</td>
-                            <td>{{fitem.UseAmount}}</td>
-                            <td>
-                              <el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
-                            </td>
-                          </tr>
-                        </table>
+                        <div class="jiDiv">
+                          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td class="_color_666">选择</td>
+                              <td class="_color_666">航班号</td>
+                              <td class="_color_666">航空公司</td>
+                              <td class="_color_666">航段</td>
+                              <td class="_color_666">时间</td>
+                              <td class="_color_666">PNR</td>
+                              <td class="_color_666">机票数量</td>
+                              <td class="_color_666">使用数量</td>
+                              <td class="_color_666">绑定机位数</td>
+                            </tr>
+                            <tr v-for="fitem in selectFilghtList">
+                              <td>
+                                <el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>
+                              </td>
+                              <td><span class="TP_Airticktid"
+                                  @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span>
+                              </td>
+                              <td>{{fitem.AlName}}</td>
+                              <td>{{fitem.DepartureName}}-{{fitem.ArrivalCityName}}</td>
+                              <td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
+                              <td>{{fitem.PNR}}</td>
+                              <td>{{fitem.TicketNum}}</td>
+                              <td>{{fitem.UseAmount}}</td>
+                              <td>
+                                <el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
+                              </td>
+                            </tr>
+                          </table>
+                        </div>
                       </div>
                       <div slot="reference" class="SimulateDrop-box">
                         <span class="SD_flight" v-for="item in FinfoList">{{item.name}} {{item.date}}</span>