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

src/components/Ticketing/IndividualTicketOrder.vue

@@ -113,7 +113,7 @@
         <th width="160">{{$t('fnc.danhao')}}&{{$t('visa.v_tuanhao')}}</th>
         <th width="60">{{$t('fnc.khxinxi')}}</th>
         <th width="70">{{$t('salesModule.Type')}}</th>
-        <th width="180">{{$t('advmanager.v_xilie')}}&{{$t('advmanager.v_line')}}</th>
+        <th width="180">{{$t('visa.v_hangban')}}</th>
         <th width="100">{{$t('Airticket.Air_Number')}}/{{$t('salesModule.AirNum')}}{{$t('salesModule.AirNum')}}</th>
         <th width="80">{{$t('fnc.danjia')}}</th>
         <th width="80">{{$t('fnc.cjdanjia')}}</th>
@@ -121,13 +121,10 @@
         <th width="80">{{$t('fnc.shishou')}}</th>
         <th width="70">{{$t('fnc.youhui')}}</th>
         <th width="70">{{$t('salesModule.HappinessPassbook')}}</th>
-        <th width="70">{{$t('fnc.xiaofei')}}</th>
         <th width="70">{{$t('fnc.tuikuan')}}</th>
-        <th width="70">{{$t('fnc.ptshuijin')}}</th>
-        <th width="80">{{$t('Operation.Op_platZaitu')}}</th>
         <th width="80">{{$t('Operation.Op_daishou')}}</th>
-        <th width="60">{{$t('admin.admin_status')}}</th>
-        <th width="140">{{$t('admin.admin_operate')}}</th>
+        <th width="80">{{$t('admin.admin_status')}}</th>
+        <th width="70">{{$t('admin.admin_operate')}}</th>
       </tr>
       <tr>
         <td v-show="list.length==0" colspan="18" align="center">{{$t('system.content_noData')}}</td>
@@ -175,10 +172,14 @@
           <p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>
         </td>
         <td class="fz12">
-          <p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.lineName">
-            <span>{{item.lineName}}</span>
-          </p>
-          <p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
+          <div v-for="subItem in item.flightList" slot="reference" @click="goTicketManager('票务管理','TicketManager',item.airTicketId)" :key="subItem.subCode" class="TCL-flighInfoList">
+            <span class="travelnowrap">
+              <span class="TCL-FlightNumber">{{subItem.flight_number}}</span>
+              ({{subItem.diata}}){{subItem.departureName}} {{subItem.stopoverName==''?'':'-('+subItem.stopoverIATA+')'+subItem.stopoverName}} {{subItem.arrivalCityName==''?'':'-('+subItem.aiata+')'+subItem.arrivalCityName}}
+              <span v-if="subItem.flightState==1" class="TCL-greenType">【OK】</span>
+              <span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
+            </span>
+          </div>
         </td>
         <td>
           {{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}
@@ -262,17 +263,13 @@
               </el-popover>
                 <span v-else style="color: #e95252;text-decoration: underline;">{{item.redEnvelopeMoney}}</span>
         </td>
-        <td v-if="item.tipMoney">{{item.tipMoney}}</td>
-        <td v-else>0.00</td>
         
         <td>{{item.refund}}</td>
-        <td>{{item.platformTax}}</td>
-        <td>{{item.zaiTuMoney}}</td>
         <td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
         <td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td>
         <td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
         <td>
-          <button v-if="item.airConfirm==2" class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSureInfo(item)">确认</button>
+          <button v-if="item.airConfirm==2" class="normalBtn" style="width:80px;padding:0" @click="getSureInfo(item)">确认</button>
         </td>
       </tr>
       <tr style="height:20px">
@@ -403,7 +400,7 @@
           QStartDate: "",
           QEndDate: "",
           pageIndex: 1,
-          pageSize: 10,
+          pageSize: 5,
           tempOrderId: "",
           SellFormEmp: 0,
           GroupType: '-1',
@@ -550,6 +547,16 @@
           }
         });
       },
+      goTicketManager(name,path,id){
+        this.$router.push({
+          name: path,
+          query: {
+            id: id,
+            blank: 'y',
+            tab: name
+          }
+        });
+      },
       getDdztList() {
         this.apipost(
           "sellorder_post_GetSellOrderStatusEnumList", {},
@@ -611,7 +618,6 @@
           "sellorder_get_GetAirToDayOrderList",
           this.msg,
           res => {
-            console.log('res',res);
             if (res.data.resultCode == 1) {
               this.loading = false;
               this.total = res.data.data.count;
@@ -1058,5 +1064,13 @@
     display: inline-block;
     margin: 0 10px 0 0;
   }
+  .groupts .TCL-flighInfoList{text-align: left;font-size:12px;margin-bottom:5px;cursor: pointer;}
+  /*强制不换行*/
+  .groupts .travelnowrap{white-space: nowrap}
+  .groupts .TCL-FlightNumber{color:#FF0066;font-weight:bold;}
+  .groupts .TCL-greenType{color:rgb(71, 191, 140)!important;}
+  .groupts .TCL-redType {
+    color: red !important;
+  }
 
 </style>

src/components/Ticketing/TicketManager.vue

@@ -1199,8 +1199,8 @@
   }
 
   .FinaDetailContent {
-    height: 25px;
-    overflow: auto;
+    /* height: 25px; */
+    /* overflow: auto; */
   }
 
   .TicketManager .TK_raduis ul li {