s

src/components/Ticketing/PassengerList.vue

@@ -66,10 +66,33 @@
   border-top:1px dashed #d1d1d1;
   padding-top:10px;
 }
-/* .PassengerList .el-input__inner{
+.PassengerList .el-input__inner{
   height:23px!important;
   padding:0 5px;
-} */
+}
+.Pgzhu{
+  display: inline-block;
+  width:30px;
+  height:30px;
+  background-color: #E95252;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 30px;
+  color:#fff;
+  position: absolute;
+  top:-35px;
+  left:-20px;
+}
+.Pglian{
+  background-color: #47bf8c;
+  display: inline-block;
+  width:30px;
+  height:30px;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 30px;
+  color:#fff;
+}
 </style>
 
 <template>
@@ -93,8 +116,8 @@
           </table>
         </li>
         <li>
-          <input type="button" class="normalBtn" style="display:none;" value="导出报表" @click="getFlightInfo()" />
-          <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>
@@ -132,10 +155,12 @@
     </el-pagination>
 
     <el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
-      <div>
+      <div style="border-bottom:1px solid #d1d1d1;">
           <table border=0 class="pg_table">
               <tr>
-                  <td width="50" style="vertical-align:top;">去程</td>
+                  <td width="50" style="vertical-align:top;position:relative;">
+                    <span class="Pgzhu">主</span>去程
+                  </td>
                   <td>
                         <div class="PgflightDiv" v-for="item in flightList" v-if="item.FlightSubType==1">
                           <p>
@@ -203,8 +228,59 @@
               </tr>
           </table>
       </div>
+      <div>
+          <table border=0 class="pg_table">
+            <tbody v-for="(item,index) in combineTeamList">
+              <tr>
+                  <td colspan="2">
+                      <span class="Pglian" v-if="index==0">联</span>
+                      团号：{{item.TCNUM}}
+                  </td>
+              </tr>
+              <tr v-for="subItem in item.List">
+                  <td>{{subItem.CityName}}去程</td>
+                  <td>
+                      <div class="PgflightDiv" v-for="childItem in subItem.List" v-if="childItem.FlightSubType==1">
+                          <p>
+                            <span class="iconfont icon-hangban"></span>
+                            <span>{{item.Flight_number}}</span>
+                            <span>
+                                <el-input class="w60" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> -
+                                <el-input class="w60" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
+                            </span>
+                          </p>
+                          <el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start"
+                                      popper-class="max-w250">
+                            <p class="_add_info">
+                              <span>{{$t('Airticket.Air_StartTime')}}：{{item.FlightDate}}</span>
+                            </p>
+                          </el-tooltip>
+                          <el-tooltip class="item" effect="dark" :content="item.dName" placement="top-start"
+                                      popper-class="max-w250">
+                            <p class="_add_info">
+                              <span>{{$t('system.query_flightAir')}}：{{item.dName}}</span>
+                            </p>
+                          </el-tooltip>
+                          <el-tooltip class="item" effect="dark" :content="item.aName" placement="top-start"
+                                      popper-class="max-w250">
+                            <p class="_add_info">
+                              <span>{{$t('system.query_arrivalAir')}}：{{item.aName }}</span>
+                            </p>
+                          </el-tooltip>
+                      </div>
+                  </td>
+              </tr>
+              <tr>
+                  <td>回程</td>
+                  <td>
+
+                  </td>
+              </tr>  
+            </tbody>
+          </table>
+      </div>
       <div slot="footer" class="dialog-footer">
-        <button class="normalBtn" type="primary" @click="getCheckInfo()">{{$t('pub.saveBtn')}}</button> &nbsp;
+        <button class="normalBtn" type="primary" @click="getCheckInfo()">确认航班信息</button> &nbsp;
         <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>
@@ -238,6 +314,7 @@
         },
         outerVisible:false,
         flightList:[],
+        combineTeamList:[],
       };
     },
     methods: {
@@ -272,6 +349,7 @@
         this.apipost("ticket_get_GetEntityExtend", msg,res => {
             if (res.data.resultCode == 1) {
                 this.flightList = res.data.data.flightList;
+                console.log(this.flightList,'主团信息');
             } else {
               this.Error(res.data.message);
             }
@@ -279,6 +357,21 @@
         );
         this.outerVisible = true;
       },
+      //获取联运团信息
+      getCombinTeam(){
+        let msg = {
+          AirTicketId:this.$route.query.id
+        }
+        this.apipost("ticket_get_GetUnionFlightAllInfo", msg,res => {
+            if (res.data.resultCode == 1) {
+                this.combineTeamList = res.data.data;
+                console.log(this.combineTeamList,'联运信息');
+            } else {
+              this.Error(res.data.message);
+            }
+          },err => {}
+        );
+      },
       //确定
       getCheckInfo(){
         let FlightList = []