机票修改

src/components/Ticketing/TicketManager.vue

@@ -1299,7 +1299,7 @@
         <li>
           <span>
             <em>编号</em>
-            <el-input v-model="msg.ID" placeholder="机票编号"></el-input>
+            <el-input v-model="msg.ID" placeholder="机票编号"  @keyup.native="checkInteger(msg,'ID')"></el-input>
           </span>
         </li>
         <li>
@@ -2733,8 +2733,7 @@
         this.chengeDelIdList = [];
         this.apipost(
           "ticket_get_GetEntityExtend", {
-            ID,
-            ID
+            ID:ID
           },
           res => {
             if (res.data.resultCode == 1) {
@@ -2751,8 +2750,6 @@
               res.data.data.flightList.forEach((x, index) => {
                 this.chengeDelIdList.push(x.ID);
               });
-
-              console.log(this.addMsg,'addmsg');
             } else {
               this.Warning(res.data.message);
             }

src/components/TravelManager/Ticket/TravelMyTicket.vue

 <style>
-.TravelMyTicket .el-input--prefix .el-input__inner {
+  .TravelMyTicket .el-input--prefix .el-input__inner {
     padding-left: 30px;
-}
-.TravelMyTicket_list {
+  }
+
+  .TravelMyTicket_list {
     padding: 20px 0 0 0;
-}
-.TravelMyTicket ._ol_info {
+  }
+
+  .TravelMyTicket ._ol_info {
     font-size: 12px;
     width: 100%;
     overflow-x: auto;
     height: 100%;
-}
+  }
 
-.TravelMyTicket ._ol_color {
+  .TravelMyTicket ._ol_color {
     font-size: 12px;
     width: 100%;
     margin-bottom: 20px;
-}
-.TravelMyTicket ._ol_color li {
+  }
+
+  .TravelMyTicket ._ol_color li {
     float: left;
     padding: 0 15px;
     display: flex;
     align-items: center;
-}
-.TravelMyTicket ._ol_color li ._cl {
+  }
+
+  .TravelMyTicket ._ol_color li ._cl {
     border-radius: 3px;
     display: inline-block;
     width: 5px;
     height: 12px;
     margin-right: 5px;
-}
-.TravelMyTicket ._red {
+  }
+
+  .TravelMyTicket ._red {
     background-color: #e95252;
-}
-.TravelMyTicket ._red_text {
+  }
+
+  .TravelMyTicket ._red_text {
     color: #e95252;
-}
-.TravelMyTicket ._green {
+  }
+
+  .TravelMyTicket ._green {
     background-color: #47bf8c;
-}
-.TravelMyTicket ._green_text {
+  }
+
+  .TravelMyTicket ._green_text {
     color: #47bf8c;
-}
-.TravelMyTicket ._blu {
+  }
+
+  .TravelMyTicket ._blu {
     background-color: #2aaef2;
-}
-.TravelMyTicket ._blu_text {
+  }
+
+  .TravelMyTicket ._blu_text {
     color: #2aaef2;
-}
-.TravelMyTicket ._ol_list {
+  }
+
+  .TravelMyTicket ._ol_list {
     margin-top: 20px;
     min-height: 500px;
-}
-.TravelMyTicket ._ol_list > li {
+  }
+
+  .TravelMyTicket ._ol_list>li {
     /* display: flex; */
     align-items: center;
     overflow: hidden;
@@ -61,27 +73,31 @@
     margin: 20px 0 0px 15px;
     transition: linear all 0.5s;
     background-color: #fff;
-}
-.TravelMyTicket ._ol_list > li:hover {
+  }
+
+  .TravelMyTicket ._ol_list>li:hover {
     box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
     transition: all linear 0.5s;
-}
-.TravelMyTicket ._oll_tit {
+  }
+
+  .TravelMyTicket ._oll_tit {
     color: #333333;
     font-size: 14px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-}
-.TravelMyTicket ._oll_tit span {
+  }
+
+  .TravelMyTicket ._oll_tit span {
     display: inline-block;
     padding: 1px 10px;
     font-size: 12px;
     border: solid 1px #ff9000;
     color: #ff9000;
     border-radius: 4px;
-}
-.TravelMyTicket ._oll_line {
+  }
+
+  .TravelMyTicket ._oll_line {
     max-width: 5px;
     min-width: 5px;
     height: 107px;
@@ -93,24 +109,29 @@
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;
     display: inline-block;
-}
-.TravelMyTicket ._oll_line._o_green {
+  }
+
+  .TravelMyTicket ._oll_line._o_green {
     background: #47bf8c;
-}
-.TravelMyTicket ._oll_line._o_blu {
+  }
+
+  .TravelMyTicket ._oll_line._o_blu {
     background: #2aaef2;
-}
-.TravelMyTicket ._oll_info {
+  }
+
+  .TravelMyTicket ._oll_info {
     padding-left: 20px;
     overflow: hidden;
-}
-.TravelMyTicket ._oll_img {
+  }
+
+  .TravelMyTicket ._oll_img {
     height: 50px;
     width: 50px;
     margin-top: 10px;
     border-radius: 50%;
-}
-.TravelMyTicket ._oll_adrr {
+  }
+
+  .TravelMyTicket ._oll_adrr {
     color: white;
     font-size: 12px;
     margin-top: 8px;
@@ -121,8 +142,9 @@
     padding: 4px 9px;
     background-color: #2aaef2;
     border-radius: 2px;
-}
-.TravelMyTicket .InfoChangeLog {
+  }
+
+  .TravelMyTicket .InfoChangeLog {
     max-width: 250px;
     height: auto;
     min-width: 250px;
@@ -134,8 +156,9 @@
     top: 70px;
     padding: 30px 20px 20px 0;
     box-shadow: 0px 0px 14px 0px #adadad;
-}
-.TravelMyTicket .InfoChangeLog .close {
+  }
+
+  .TravelMyTicket .InfoChangeLog .close {
     color: #cccccc;
     cursor: pointer;
     position: absolute;
@@ -143,8 +166,9 @@
     top: 10px;
     width: 17px;
     height: 17px;
-}
-.wangfan {
+  }
+
+  .wangfan {
     color: #2aaef2 !important;
     font-size: 12px !important;
     display: inline-block !important;
@@ -154,86 +178,102 @@
     border: 1px solid #2aaef2 !important;
     width: auto !important;
     height: auto !important;
-}
-.wangfan.hollowFixedBtn:hover {
+  }
+
+  .wangfan.hollowFixedBtn:hover {
     color: #ffffff;
     border-color: #2aaef2;
     background-color: #2aaef2;
-}
-.wangfan.hollowFixedBtn {
+  }
+
+  .wangfan.hollowFixedBtn {
     cursor: pointer;
-}
-.TravelMyTicket .TMT_CNY {
+  }
+
+  .TravelMyTicket .TMT_CNY {
     height: 100%;
     display: flex;
     align-items: center;
     color: #333333;
-  font-size: 16px;
-  padding-left: 25px;
-  min-width: 170px;
-}
-.TMT_CNY span {
+    font-size: 13px;
+    min-width: 100px;
+  }
+
+  .TMT_CNY span {
     color: #47bf8c;
     font-size: 18px;
-}
-.TMT_Seat {
+  }
+
+  .TMT_Seat {
     height: 100%;
     display: flex;
-}
-.TM_SeatList {
-  min-width: 250px;
+  }
+
+  .TM_SeatList {
+    min-width: 180px;
     height: 60px;
     background-color: #f9f9f9;
     margin: 9px 20px 0 0;
-}
-.TM_SeatList > ul > li:nth-child(1) {
+  }
+
+  .TM_SeatList>ul>li:nth-child(1) {
     margin-left: 16px;
-}
-.TM_SeatList > ul > li {
+  }
+
+  .TM_SeatList>ul>li {
     float: left;
     text-align: center;
     margin: 5px 21px 0 0;
-}
-.TM_SeatList > ul > li:last-child {
+  }
+
+  .TM_SeatList>ul>li:last-child {
     margin-right: 0;
-}
-.TM_SeatList .iconfont {
+  }
+
+  .TM_SeatList .iconfont {
     color: #d1d1d1;
     display: inline-block;
     margin-top: 5px;
-}
-.TM_SeatList ._num1 {
+  }
+
+  .TM_SeatList ._num1 {
     font-size: 20px;
     color: #333333;
     font-family: PingFangSC-Semibold, sans-serif;
-}
-.TM_SeatList .TM_num2 {
+  }
+
+  .TM_SeatList .TM_num2 {
     font-size: 20px;
     width: 45px;
     display: inline-block;
     text-align: left;
     color: #47bf8c;
     font-family: PingFangSC-Semibold, sans-serif;
-}
-.TM_SeatList ._num3 {
+  }
+
+  .TM_SeatList ._num3 {
     font-size: 20px;
     color: #e95252;
     font-family: PingFangSC-Semibold, sans-serif;
-}
-.TM_SeatList ._wz {
+  }
+
+  .TM_SeatList ._wz {
     color: #666666;
-}
-.TM_SeatList ._yiyong {
+  }
+
+  .TM_SeatList ._yiyong {
     cursor: pointer;
     text-decoration: underline;
-}
-/* .TMT_raduis{margin-left:50px;} */
-.TMT_raduis > ul {
+  }
+
+  /* .TMT_raduis{margin-left:50px;} */
+  .TMT_raduis>ul {
     display: -webkit-box;
     align-items: center;
     padding-left: 25px;
-}
-.TMT_raduis > ul > li:not(._head) {
+  }
+
+  .TMT_raduis>ul>li:not(._head) {
     height: 24px;
     width: 24px;
     border-radius: 50%;
@@ -242,103 +282,127 @@
     text-align: center;
     line-height: 24px;
     margin-right: 16px;
-}
-.TMT_raduis > ul > li:not(._head) {
+  }
+
+  .TMT_raduis>ul>li:not(._head) {
     background-color: #bcbcbc;
     color: #909090;
-}
-.TMT_raduis > ul > li._head {
+  }
+
+  .TMT_raduis>ul>li._head {
     display: flex;
     align-items: center;
-}
-.TMT_raduis > ul > li._head img {
+  }
+
+  .TMT_raduis>ul>li._head img {
     height: 26px;
     width: 26px;
     border-radius: 50%;
-}
-.TMT_raduis > ul > li._head span {
+  }
+
+  .TMT_raduis>ul>li._head span {
     padding-left: 7px;
     display: inline-block;
     margin-right: 25px;
-}
-._jztime {
+  }
+
+  ._jztime {
     color: #666666;
     min-width: 100px;
-}
-._jztime .PingFangSC {
+  }
+
+  ._jztime .PingFangSC {
     font-size: 12px;
-}
-._jztime ._text {
+  }
+
+  ._jztime ._text {
     font-size: 12px;
-}
-._btn._tmt_page {
+  }
+
+  ._btn._tmt_page {
     height: 100%;
     display: flex;
     align-items: center;
-}
-.edHeight {
+  }
+
+  .edHeight {
     display: block;
-}
-.TravelMyTicket .el-pagination {
+  }
+
+  .TravelMyTicket .el-pagination {
     border: none !important;
-}
-._tripDetails {
+  }
+
+  ._tripDetails {
     padding: 0;
     box-shadow: 0px 1px 3px 0px #dedede;
-}
-._tripDetails .popper__arrow::after {
+  }
+
+  ._tripDetails .popper__arrow::after {
     border-bottom-color: #ededed !important;
-}
-._tripDetails table {
+  }
+
+  ._tripDetails table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
     border-collapse: collapse;
     border: 1px solid #d2d2d2;
     font-size: 12px;
-}
-._tripDetails table th {
+  }
+
+  ._tripDetails table th {
     background-color: #ededed;
     padding: 5px;
-}
-._tripDetails table td {
+  }
+
+  ._tripDetails table td {
     background-color: #ffffff;
     padding: 9px 15px;
     color: #333333;
     border: 1px solid #d2d2d2;
-}
-._tripDetails table td._d_name {
+  }
+
+  ._tripDetails table td._d_name {
     background-color: #ededed;
-}
-._tripDetails table ._color_666 {
+  }
+
+  ._tripDetails table ._color_666 {
     color: #666666;
-}
-._tripDetails table tr._color_666 th {
+  }
+
+  ._tripDetails table tr._color_666 th {
     padding: 9px 15px;
-}
-.TMT_CNY p {
+  }
+
+  .TMT_CNY p {
     color: #333333;
     font-size: 14px;
-}
-.TravelMyTicket .InfoChangeLog .changLog {
+  }
+
+  .TravelMyTicket .InfoChangeLog .changLog {
     background-color: #f9f9f9;
     height: auto;
     max-height: 170px;
     width: 100%;
     overflow: auto;
-}
-.TravelMyTicket .InfoChangeLog .changLog ul {
+  }
+
+  .TravelMyTicket .InfoChangeLog .changLog ul {
     margin-left: 20px;
-}
-.TravelMyTicket .InfoChangeLog .changLog li {
+  }
+
+  .TravelMyTicket .InfoChangeLog .changLog li {
     border-left: 1px solid #e9e9e9;
     position: relative;
     padding-bottom: 15px;
     padding-left: 20px;
-}
-.TravelMyTicket .InfoChangeLog .changLog li p {
+  }
+
+  .TravelMyTicket .InfoChangeLog .changLog li p {
     text-align: left;
-}
-.TravelMyTicket .InfoChangeLog .changLog li .radius {
+  }
+
+  .TravelMyTicket .InfoChangeLog .changLog li .radius {
     width: 7px;
     height: 7px;
     border-radius: 50%;
@@ -346,72 +410,86 @@
     position: absolute;
     left: -4px;
     top: 4px;
-}
-.TravelMyTicket .InfoChangeLog .changLog li.red .radius {
+  }
+
+  .TravelMyTicket .InfoChangeLog .changLog li.red .radius {
     background-color: #e95252;
-}
-.TravelMyTicket .InfoChangeLog .changLog li.green .radius {
+  }
+
+  .TravelMyTicket .InfoChangeLog .changLog li.green .radius {
     background-color: #47bf8c;
-}
-.TravelMyTicket .InfoChangeLog .time {
+  }
+
+  .TravelMyTicket .InfoChangeLog .time {
     color: #666666;
     padding-bottom: 5px;
-}
-.TravelMyTicket .InfoChangeLog .changLog::-webkit-scrollbar,
-.TravelMyTicket ._ol_info::-webkit-scrollbar,
-.addTravelMyTicket::-webkit-scrollbar,
-.Journal .changLogList::-webkit-scrollbar {
+  }
+
+  .TravelMyTicket .InfoChangeLog .changLog::-webkit-scrollbar,
+  .TravelMyTicket ._ol_info::-webkit-scrollbar,
+  .addTravelMyTicket::-webkit-scrollbar,
+  .Journal .changLogList::-webkit-scrollbar {
     /*滚动条整体样式*/
-  width: 4px; /*高宽分别对应横竖滚动条的尺寸*/
+    width: 4px;
+    /*高宽分别对应横竖滚动条的尺寸*/
     height: 8px;
-}
-.TravelMyTicket .InfoChangeLog .changLog::-webkit-scrollbar-thumb,
-.TravelMyTicket ._ol_info::-webkit-scrollbar-thumb,
-.addTravelMyTicket::-webkit-scrollbar-thumb,
-.Journal .changLogList::-webkit-scrollbar-thumb {
+  }
+
+  .TravelMyTicket .InfoChangeLog .changLog::-webkit-scrollbar-thumb,
+  .TravelMyTicket ._ol_info::-webkit-scrollbar-thumb,
+  .addTravelMyTicket::-webkit-scrollbar-thumb,
+  .Journal .changLogList::-webkit-scrollbar-thumb {
     /*滚动条里面小方块*/
     border-radius: 4px;
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     background: #c9c9c9;
-}
-.TravelMyTicket .InfoChangeLog .changLog::-webkit-scrollbar-track,
-.TravelMyTicket ._ol_info::-webkit-scrollbar-track,
-.addTravelMyTicket::-webkit-scrollbar-track,
-.Journal .changLogList::-webkit-scrollbar-track {
+  }
+
+  .TravelMyTicket .InfoChangeLog .changLog::-webkit-scrollbar-track,
+  .TravelMyTicket ._ol_info::-webkit-scrollbar-track,
+  .addTravelMyTicket::-webkit-scrollbar-track,
+  .Journal .changLogList::-webkit-scrollbar-track {
     /*滚动条里面轨道*/
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     border-radius: 4px;
     background: #ededed;
-}
-._bg_gre {
+  }
+
+  ._bg_gre {
     background-color: #47bf8c !important;
     color: white !important;
-}
-.TravelMyTicket .Journal {
+  }
+
+  .TravelMyTicket .Journal {
     width: 250px !important;
-}
-.Journal .InfoChangeLog {
+  }
+
+  .Journal .InfoChangeLog {
     height: auto;
     max-height: 220px;
     background-color: #ffffff;
-}
-.Journal .changLogList {
+  }
+
+  .Journal .changLogList {
     padding-left: 20px;
     max-height: 220px;
     overflow: auto;
     margin: 15px 0;
-}
-.Journal .changLogList_l {
+  }
+
+  .Journal .changLogList_l {
     border-left: 1px solid #e9e9e9;
     position: relative;
     padding-bottom: 20px;
     padding-left: 20px;
-}
-.Journal .changLogList_l:last-child {
+  }
+
+  .Journal .changLogList_l:last-child {
     border-left: 0;
     padding-bottom: 0;
-}
-.TravelMyTicket .Journal ._radius_green {
+  }
+
+  .TravelMyTicket .Journal ._radius_green {
     background-color: #47bf8c;
     width: 7px;
     height: 7px;
@@ -420,76 +498,93 @@
     position: absolute;
     left: -4px;
     top: 15px;
-}
-.TravelMyTicket .icon-img_plane {
+  }
+
+  .TravelMyTicket .icon-img_plane {
     font-size: 12px;
     -webkit-transform: scale(0.8);
-}
-.TravelMyTicket .departName {
+  }
+
+  .TravelMyTicket .departName {
     text-align: right;
-}
-.TravelMyTicket .arrivalName {
+  }
+
+  .TravelMyTicket .arrivalName {
     text-align: left;
-}
-.TravelMyTicket ._destination .el-button:focus {
+  }
+
+  .TravelMyTicket ._destination .el-button:focus {
     background-color: #2aaef2 !important;
     color: #fff !important;
-}
-.TravelMyTicket .travelTo {
+  }
+
+  .TravelMyTicket .travelTo {
     position: relative;
     top: -2px;
-}
-.TravelMyTicket .multiple_input .el-input {
+  }
+
+  .TravelMyTicket .multiple_input .el-input {
     height: auto !important;
-}
-.TurnsOutSet {
+  }
+
+  .TurnsOutSet {
     position: fixed;
     width: 100%;
     height: 150px;
     background-color: #fff;
     border-top: 1px solid #d1d1d1;
     bottom: 0;
-}
-.TurnTips {
+  }
+
+  .TurnTips {
     margin: 20px 0 30px 20px;
     color: #e95252;
-}
-.TurnZhu,
-.TurnInputDiv,
-.flightSetNum {
+  }
+
+  .TurnZhu,
+  .TurnInputDiv,
+  .flightSetNum {
     margin-left: 20px;
-}
-.TurnSureBtn {
+  }
+
+  .TurnSureBtn {
     margin-left: 30px;
-}
-.flightCode {
+  }
+
+  .flightCode {
     width: 200px;
     height: 100%;
-}
-.Flight_number {
+  }
+
+  .Flight_number {
     font-size: 14px;
     color: #333;
     margin: 20px 0 5px 40px;
-}
-.flight_CodeName {
+  }
+
+  .flight_CodeName {
     margin-left: 40px;
     color: #666666;
     font-size: 12px;
-}
-.inversion {
+  }
+
+  .inversion {
     width: 60px;
     height: 25px;
     line-height: 25px;
     padding: 0 !important;
-}
-.logDate {
+  }
+
+  .logDate {
     position: relative;
     top: -4px;
-}
-.TM_logContent {
+  }
+
+  .TM_logContent {
     font-size: 12px;
-}
-.logCircle {
+  }
+
+  .logCircle {
     position: absolute;
     width: 7px;
     height: 7px;
@@ -497,73 +592,75 @@
     border-radius: 50%;
     left: -24px;
     top: 5px;
-}
-.TravelMyTicket .query-box ul .el-input {
+  }
+
+  .TravelMyTicket .query-box ul .el-input {
     width: 150px;
-}
-.TravelMyTicket .vmiddle {
+  }
+
+  .TravelMyTicket .vmiddle {
     display: flex;
     align-items: Center;
     height: 78px;
-}
-.TM_AirUrl {
+  }
+
+  .TM_AirUrl {
     margin-left: 20px;
-}
-.TM_PNR {
+  }
+
+  .TM_PNR {
     width: 120px;
     text-align: left;
     font-size: 12px;
-}
-.TravelMyTicket .TICK_Code {
+  }
+
+  .TravelMyTicket .TICK_Code {
     position: absolute;
     left: 25px;
     top: 5px;
-}
-.TravelMyTicket .TCID_cont {
+  }
+
+  .TravelMyTicket .TCID_cont {
     height: 28px;
     line-height: 28px;
     border-top: 1px dashed #ccc;
     text-indent: 20px;
-}
-.Ticket_TCID {
+  }
+
+  .Ticket_TCID {
     margin-right: 2px;
-}
+  }
+
+  /*航班详情*/
+  .TravelMyTicket .FlightDivDetails {
+    width: 100%;
+    height: 65px;
+    overflow: auto;
+  }
+
+  .TravelMyTicket ._flightList {
+    text-align: left;
+    font-size: 12px;
+    margin-bottom: 5px;
+    padding-right: 5px;
+  }
+
+  /*航班号*/
+  .TravelMyTicket .FlightNumber {
+    color: #ff0066;
+    font-weight: bold;
+  }
+
 </style>
 <template>
   <div class="flexOne TravelMyTicket">
     <div class="query-box">
       <ul>
-        <!-- <li>
-                    <span class="hotel_name">
-                        <em>出发地</em>
-                        <el-select v-model="Query.Departure_city" id='xxx'  filterable :placeholder="$t('system.ph_in')">
-                            <el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
-                            <el-option v-for="item in CityList"
-                                :label='item.Name'
-                                :value='item.ID'
-                                :key='item.ID'>
-                           </el-option>
-                        </el-select>
-                    </span>
-                </li>
-                <li>
-                    <span class="hotel_name">
-                        <em>目的地</em>
-                        <el-select v-model="Query.Arrival_city"  filterable :placeholder="$t('system.ph_in')">
-                            <el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
-                            <el-option v-for="item in CityList"
-                                :label='item.Name'
-                                :value='item.ID'
-                                :key='item.ID'>
-                            </el-option>
-                        </el-select>
-                    </span>
-                </li> -->
         <li>
           <span class="hotel_name">
             <em>起飞时间</em>
-            <el-date-picker class="w150" v-model="Query.QFlightDateStart" type="date" :picker-options="pickerBeginDateBefore"
-              value-format="yyyy-MM-dd" placeholder="开始日期">
+            <el-date-picker class="w150" v-model="Query.QFlightDateStart" type="date"
+              :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder="开始日期">
             </el-date-picker>
             <el-date-picker class="w150" v-model="Query.QFlightDateEnd" type="date" value-format="yyyy-MM-dd"
               :picker-options="pickerBeginDateAfter" placeholder="结束日期">
@@ -571,14 +668,10 @@
           </span>
         </li>
         <li>
-          <span class="hotel_name">
-            <em>余位数量</em>
-            <el-input v-model="Query.StartNum" type="text" class="w150" @keyup.native="checkInteger(Query,'StartNum')"
-              @keyup.native.enter="getList" placeholder="请输入数量"></el-input>
-            <el-input v-model="Query.EndNum" type="text" class="w150" @keyup.native="checkInteger(Query,'EndNum')"
-              @keyup.native.enter="getList" placeholder="请输入数量"></el-input>
+          <span>
+            <em>机票编号</em>
+            <el-input v-model="Query.AirticketId" placeholder="机票编号" @keyup.native="checkInteger(Query,'AirticketId')"></el-input>
           </span>
-
         </li>
         <li>
           <button class="normalBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
@@ -587,9 +680,12 @@
     </div>
     <div class="TravelMyTicket_list">
       <ul class="_ol_color clearfix">
-        <li><span class="_red _cl"></span><span class="_red_text">{{$t('Airticket.Air_redType')}}：</span>{{$t('Airticket.Air_firstClass')}}</li>
-        <li><span class="_green _cl"></span><span class="_green_text">{{$t('Airticket.Air_greenType')}}：</span>{{$t('Airticket.Air_businessClass')}}</li>
-        <li><span class="_blu _cl"></span><span class="_blu_text">{{$t('Airticket.Air_blueType')}}：</span>{{$t('Airticket.Air_EconomyClass')}}</li>
+        <li><span class="_red _cl"></span><span
+            class="_red_text">{{$t('Airticket.Air_redType')}}：</span>{{$t('Airticket.Air_firstClass')}}</li>
+        <li><span class="_green _cl"></span><span
+            class="_green_text">{{$t('Airticket.Air_greenType')}}：</span>{{$t('Airticket.Air_businessClass')}}</li>
+        <li><span class="_blu _cl"></span><span
+            class="_blu_text">{{$t('Airticket.Air_blueType')}}：</span>{{$t('Airticket.Air_EconomyClass')}}</li>
       </ul>
       <div class="_ol_info">
         <ul class="_ol_list" v-loading="loading">
@@ -600,44 +696,31 @@
                 <span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
                 <span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
                 <div class="TM_AirUrl">
-                  <span class="TICK_Code">编号：{{item.Id}}</span>
+                  <span class="TICK_Code">采购编号：{{item.Id}}</span>
                   <img v-if="!item.AirlineUrl" class="_oll_img" src="../../../assets/img/bg_z1@2x.png">
                   <img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg">
                 </div>
               </el-col>
-              <el-col :span="3" class="vmiddle">
+              <el-col :span="2" class="vmiddle">
                 <div class="_oll_info">
-                  <el-tooltip class="item" effect="dark" :content="item.AirlineName" placement="top-start" popper-class="max-w250">
+                  <el-tooltip class="item" effect="dark" :content="item.AirlineName" placement="top-start"
+                    popper-class="max-w250">
                     <p class="_oll_tit"> {{item.AirlineName}} </p>
                   </el-tooltip>
                   <span class="_oll_adrr">{{item.FreightSpaceStr}}</span>
                 </div>
               </el-col>
-              <el-col :span="1" class="vmiddle">
-                <div v-if="item.flightList!=null && item.flightList.length>0" class="_destination">
-                  <el-popover popper-class="_tripDetails" width="550" trigger="click">
-                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                      <tr class="_color_666">
-                        <th>{{$t('Airticket.Air_segment')}}</th>
-                        <th>{{$t('system.query_flightNum')}}</th>
-                        <th>{{$t('Airticket.Air_flightDate')}}</th>
-                        <th>{{$t('Airticket.Air_Trip')}}</th>
-                      </tr>
-                      <tr v-for="(ds,din) in item.flightList">
-                        <td class="_d_name _color_666" v-if="ds.FlightSubType==1&&din==0">{{$t('Airticket.Air_go')}}</td>
-                        <td class="_d_name _color_666" v-else-if="ds.FlightSubType==1&&din!==tripDetails.length-1">{{$t('Airticket.Air_transit')}}</td>
-                        <td class="_d_name _color_666" v-if="ds.FlightSubType==3&&din!==tripDetails.length-1">{{$t('Airticket.Air_transit')}}</td>
-                        <td class="_d_name _color_666" v-else-if="din==tripDetails.length-1">{{$t('Airticket.Air_returnTrip')}}</td>
-                        <td>{{ds.Flight_number}}</td>
-                        <td>{{ds.FlightDate}} {{ds.Departure_time}}</td>
-                        <td>
-                          <div>({{ds.DIATA}}){{ds.DepartureName}}-({{ds.AIATA}}){{ds.ArrivalCityName}}</div>
-                          <div style="margin-top:5px;">{{ds.dName}}-{{ds.aName}}</div>
-                        </td>
-                      </tr>
-                    </table>
-                    <el-button slot="reference" class="hollowFixedBtn wangfan">详情</el-button>
-                  </el-popover>
+              <el-col :span="4" class="vmiddle">
+                <div class="FlightDivDetails">
+                  <div class="_flightList" v-for="subItem in item.flightList">
+                    <span class="FlightNumber">{{subItem.Flight_number}}</span>
+                    <span>{{subItem.FlightDate}} {{subItem.Departure_time}}</span>
+                    <span>({{subItem.DIATA}}){{subItem.DepartureName}}</span>
+                    <span v-if="subItem.StopoverName">-</span>
+                    <span v-if="subItem.StopoverName">({{subItem.StopoverIATA}}){{subItem.StopoverName}}</span>
+                    <span v-if="subItem.ArrivalCityName">-</span>
+                    <span v-if="subItem.ArrivalCityName">({{subItem.AIATA}}){{subItem.ArrivalCityName}}</span>
+                  </div>
                 </div>
               </el-col>
               <el-col :span="1" class="vmiddle">
@@ -655,12 +738,12 @@
                   </el-popover>
                 </div>
               </el-col>
-              <el-col :span="3" class="vmiddle">
+              <el-col :span="2" class="vmiddle">
                 <div class="TMT_CNY">
                   <p slot="reference">{{$t('hotel.hotel_cost')}}<span class="PingFangSC">{{item.CostPrice}}</span></p>
                 </div>
               </el-col>
-              <el-col :span="5" class="vmiddle">
+              <el-col :span="4" class="vmiddle">
                 <div class="TMT_Seat">
                   <div class="TM_SeatList">
                     <ul class="clearfix">
@@ -668,17 +751,13 @@
                         <span class="iconfont icon-img_yizi"></span>
                       </li>
                       <li>
-                        <p class="TM_num2">{{item.PurchaseAmount==null?'0':item.PurchaseAmount}}</p>
-                        <p class="_wz">采购数量</p>
+                        <p class="TM_num2">{{item.TicketNum==null?'0':item.TicketNum}}</p>
+                        <p class="_wz">机票数量</p>
                       </li>
                       <li>
                         <p class="TM_num2">{{item.UseAmount==null?'0':item.UseAmount}}</p>
                         <p class="_wz">使用数量</p>
                       </li>
-                      <li>
-                        <p class="TM_num2">{{item.LockNum==null?'0':item.LockNum}}</p>
-                        <p class="_wz">锁定数量</p>
-                      </li>
                     </ul>
                   </div>
                 </div>
@@ -707,10 +786,10 @@
                   <p class="_text">{{$t('Airticket.Air_departureDate')}}</p>
                 </div>
               </el-col>
-              <el-col :span="2" class="vmiddle">
+              <el-col :span="3" class="vmiddle">
                 <div class="_btn _tmt_page">
                   <button class="hollowFixedBtn inversion" type="button" @click="outBtn(item)">转位</button>
-                  <el-tooltip class="item" effect="dark" content="日志" placement="top-start">
+                  <el-tooltip class="item" effect="dark" content="日志" placement="top-start" style="display:none">
                     <el-popover popper-class="Journal" width="400" trigger="click">
                       <div class="InfoChangeLog">
                         <div class="changLog">
@@ -727,7 +806,8 @@
                           </ul>
                         </div>
                       </div>
-                      <button slot="reference" class="normalBtn inversion" type="button" @click="getLog(item.ID)">日志</button>
+                      <button slot="reference" class="normalBtn inversion" type="button"
+                        @click="getLog(item.ID)">日志</button>
                     </el-popover>
                   </el-tooltip>
                 </div>
@@ -755,8 +835,8 @@
         <div class="noData" v-show="noData">
           {{$t('system.content_noData')}}
         </div>
-        <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
-          :page-size=Query.pageSize :total=Query.total>
+        <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+          layout="total,prev, pager, next, jumper" :page-size=Query.pageSize :total=Query.total>
         </el-pagination>
         <div class="combottomDiv TC_divCon" v-if="isShowSet" style="height:200px;">
           <div class="TurnTips">转出余位 <span class="TurnZhu">注：余位转出是指可以把剩余座位转让给其他的OP人员，但是需要得到对方的确认</span></div>
@@ -764,11 +844,13 @@
             <span>接收人：</span>
             <el-select v-model="outData.ReciveEmployeeId" filterable :placeholder="$t('system.ph_in')" class="w150">
               <el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
-              <el-option v-for="item in EmployeeList" :label='item.EmName' :value='item.EmployeeId' :key='item.EmployeeId'>
+              <el-option v-for="item in EmployeeList" :label='item.EmName' :value='item.EmployeeId'
+                :key='item.EmployeeId'>
               </el-option>
             </el-select>
-            <span class="flightSetNum">转让机位数：</span>
-            <el-input v-model="outData.OutNum" type="text" class="w160" :placeholder="OutPlaceHolder"></el-input>
+            <span class="flightSetNum" style="display:none;">转让机位数：</span>
+            <el-input v-model="outData.OutNum" type="text" class="w160" :placeholder="OutPlaceHolder"
+              style="display:none;"></el-input>
             <button class="normalBtn TurnSureBtn" @click="setOut()">确认</button>
             <button class="normalBtn" @click="isShowSet=false,outData.OutNum='',outData.ReciveEmployeeId=0">取消</button>
           </div>
@@ -778,7 +860,7 @@
   </div>
 </template>
 <script>
-export default {
+  export default {
     data() {
       return {
         Query: {
@@ -797,7 +879,9 @@ export default {
           QFlightDateEnd: "",
           //余位数量
           StartNum: "",
-        EndNum: ""
+          EndNum: "",
+          //机票编号
+          AirticketId: ""
         },
         pickerBeginDateBefore: {
           disabledDate: time => {
@@ -841,13 +925,15 @@ export default {
         //日志列表
         LogList: [],
         //默认图片
-      defaultImg:
-        'this.src="' + require("../../../assets/img/bg_z1@2x.png") + '"'
+        defaultImg: 'this.src="' + require("../../../assets/img/bg_z1@2x.png") + '"'
       };
     },
     methods: {
       getList() {
         this.loading = true;
+        if (this.Query.AirticketId == "") {
+          this.Query.AirticketId = 0;
+        }
         this.apipost(
           "TravelAirTicket_Get_GetPurchasePageList",
           this.Query,
@@ -857,6 +943,9 @@ export default {
               this.Query.total = res.data.data.count;
               this.dataList = res.data.data.pageData;
               this.noData = !this.Query.total > 0;
+              if (this.Query.AirticketId == 0) {
+                this.Query.AirticketId = "";
+              }
             } else {
               this.Warning(res.data.message);
             }
@@ -898,38 +987,46 @@ export default {
       },
       //机票转出
       setOut() {
+
         if (this.outData.ReciveEmployeeId == 0) {
           this.Warning("请选择接受人员");
           return false;
         }
 
-      if (this.outData.OutNum == 0 || this.outData.OutNum == "") {
-        this.Warning("请输入要采购的数量");
-        this.outData.OutNum = "";
-        return false;
-      }
-      this.apipost(
+        // if (this.outData.OutNum == 0 || this.outData.OutNum == "") {
+        //   this.Warning("请输入要采购的数量");
+        //   this.outData.OutNum = "";
+        //   return false;
+        // }
+        var that = this;
+        this.Confirm("是否将机票转出?", function () {
+          that.apipost(
             "TravelAirTicket_Post_SetAirticketOut",
-        this.outData,
+            that.outData,
             res => {
               if (res.data.resultCode == 1) {
-            this.Success("转出机位成功!");
-            this.isShowSet = false;
-            this.outData.ReciveEmployeeId = 0;
-            this.outData.OutNum = "";
-            this.getList();
+                that.Success("转出机位成功!");
+                that.isShowSet = false;
+                that.outData.ReciveEmployeeId = 0;
+                that.outData.OutNum = "";
+                that.getList();
               } else {
-            this.Error(res.data.message);
+                that.Error(res.data.message);
               }
             },
             err => {}
           );
+        });
+
       },
       //根据当前员工所在部门获取该部门及子部门员工信息
       getEmployeeList() {
+        var msg = {
+          GroupId: this.getLocalStorage().RB_Group_id
+        }
         this.apipost(
-        "admin_get_GetEmployeeByUserDepartmentId",
-        {},
+          "admin_get_EmployeeGetList",
+          msg,
           res => {
             if (res.data.resultCode == 1) {
               this.EmployeeList = res.data.data;
@@ -961,5 +1058,6 @@ export default {
       this.getList();
       this.getEmployeeList();
     }
-};
+  };
+
 </script>

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -627,8 +627,8 @@
             <em>线路</em>
             <el-select v-model="Query.LineId" :placeholder="$t('pub.pleaseSel')" class="w120">
               <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
-              <el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName"
-                         :value="item.LineID"></el-option>
+              <el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" :value="item.LineID">
+              </el-option>
             </el-select>
           </span>
         </li>
@@ -660,6 +660,12 @@
             </el-input>
           </span>
         </li>
+        <li>
+          <span>
+            <em>机票编号</em>
+            <el-input v-model="Query.ID" placeholder="机票编号" @keyup.native="checkInteger(Query,'ID')"></el-input>
+          </span>
+        </li>
         <li>
           <button class="hollowFixedBtn" type="button"
             @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
@@ -816,7 +822,8 @@
                 <div class="TCID_cont PingFangSC">
                   团期：
                   <span v-show="item.PriceList.length==0">暂无</span>
-                  <span class="Ticket_TCID" v-for="subItem in item.PriceList">({{subItem.TCID}}){{subItem.TCNUM}} &nbsp;</span>
+                  <span class="Ticket_TCID" v-for="subItem in item.PriceList">({{subItem.TCID}}){{subItem.TCNUM}}
+                    &nbsp;</span>
                 </div>
               </el-col>
               <el-col :span="6">
@@ -860,7 +867,7 @@
     data() {
       return {
         Query: {
-          LineId:0,//线路编号
+          LineId: 0, //线路编号
           //页码
           pageIndex: 1,
           //每页显示条数
@@ -887,10 +894,12 @@
           //起飞状态
           FlyState: "0",
           //是否查询采购人员(1-查询，0-不查询)
-          IsQueryPurchase:1,
+          IsQueryPurchase: 1,
+          //机票编号
+          ID: "",
         },
         //线路列表
-        LineList:[],
+        LineList: [],
         //下拉框默认值
         selectDefauleValue: 0,
         //防止重复提交
@@ -932,6 +941,9 @@
     methods: {
       getList() {
         this.loading = true;
+        if (this.Query.ID == "") {
+          this.Query.ID = 0;
+        }
         this.apipost(
           "AirTicket_get_GetPageList",
           this.Query,
@@ -941,7 +953,9 @@
               this.Query.total = res.data.data.count;
               this.noData = !this.Query.total > 0;
               this.dataList = res.data.data.pageData;
-             
+              if (this.Query.ID == 0) {
+                this.Query.ID = "";
+              }
             } else {
               this.Warning(res.data.message);
             }
@@ -958,8 +972,7 @@
               this.LineList = res.data.data;
             }
           },
-          err => {
-          }
+          err => {}
         );
       },
       GetPlaceHolder() {