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

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -660,6 +660,13 @@
             </el-input>
           </span>
         </li>
+        <li>
+          <span class="hotel_name">
+            <em>PNR</em>
+            <el-input v-model="Query.PNR" type="text" @keyup.native.enter="getList" placeholder="请输入航班号">
+            </el-input>
+          </span>
+        </li>
         <li>
           <span>
             <em>机票编号</em>
@@ -897,6 +904,7 @@
           IsQueryPurchase: 1,
           //机票编号
           ID: "",
+          PNR:""
         },
         //线路列表
         LineList: [],

src/components/confirmationOrderDownLoad.vue

@@ -2,6 +2,9 @@
   .confirmOrder{
     width:950px;
   }
+  .travelControlTrip .hangban-info tr td,.travelControlTrip .hangban-info tr th{
+    padding-left: 0 !important;
+  }
 </style>
 
 <template>