页面修改

src/components/Ticketing/PassengerList.vue

@@ -80,7 +80,7 @@
     padding-top: 10px;
   }
 
-   .pmyTable .el-input__inner {
+  .pmyTable .el-input__inner {
     height: 23px !important;
     padding: 0 5px;
   }
@@ -109,14 +109,17 @@
     line-height: 30px;
     color: #fff;
   }
-/*拒签人员*/
- .singeRowTable .redTr td{
+
+  /*拒签人员*/
+  .singeRowTable .redTr td {
     color: #E95252;
- }
- .pg_checkModule{
-   margin-top:20px;
-   font-size:14px;
- }
+  }
+
+  .pg_checkModule {
+    margin-top: 20px;
+    font-size: 14px;
+  }
+
 </style>
 
 <template>
@@ -131,7 +134,7 @@
               <th width="50">人数</th>
               <th width="120">出发日期</th>
             </tr>
-            <tr v-for="item in QueryMsg.TeamInfoData">
+            <tr v-for="(item,index) in QueryMsg.TeamInfoData" :key="index">
               <td>{{item.TCNUM}}</td>
               <td>{{item.Title}}</td>
               <td>{{item.OfferNumber}}人</td>
@@ -141,12 +144,9 @@
         </li>
         <li>
           <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(0),getCombinTeam()" />
-          <el-tooltip class="item" effect="dark" content="包含联运机票信息" placement="top">
-        <span>  
-          <input type="button" class="normalBtn" value="导出旅客" @click="getFlightInfo(1),getCombinTeam()" />
-        </span>
-    </el-tooltip>
-        
+          <el-tooltip class="item" effect="dark" content="包含机票信息" placement="bottom">
+            <input type="button" class="normalBtn" value="导出旅客&航班" @click="getFlightInfo(1),getCombinTeam()" />
+          </el-tooltip>
           <input type="button" class="normalBtn" v-if="isShowGuoji" value="制作财务单据" @click="makeFinacelDoc()" />
           <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" style="display:none;" />
         </li>
@@ -176,7 +176,7 @@
         <th>客人联系方式</th>
         <th>签证状态</th>
       </tr>
-      <tr v-for="(item,index) in QueryMsg.dataList" :class="{'redTr':item.VisaState==1}">
+      <tr v-for="(item,index) in QueryMsg.dataList" :class="{'redTr':item.VisaState==1}" :key="index+10000">
         <td v-if="isShowGuoji">
           <input v-model="item.guoji" type="checkbox" />
         </td>
@@ -225,7 +225,7 @@
           <th>起飞机场</th>
           <th>到达机场</th>
         </tr>
-        <tr v-for="item in flightList">
+        <tr v-for="(item,index) in flightList" :key="index+20000">
           <td>{{item.Flight_number}}</td>
           <td>
             <el-input class="w60" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')">
@@ -256,7 +256,7 @@
           <th>起飞机场</th>
           <th>到达机场</th>
         </tr>
-        <tbody v-for="subItem in combineTeamList">
+        <tbody v-for="(subItem,subIndex) in combineTeamList" :key="subIndex+30000">
           <tr>
             <td rowspan="2">{{subItem.TCNUM}}({{subItem.TCID}})</td>
             <td rowspan="2">{{subItem.UnionBranchName}}({{subItem.UnionCityName}})</td>
@@ -270,7 +270,6 @@
               <el-input class="w60" v-model="subItem.GoArriveTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')">
               </el-input>
             </td>
-            </td>
             <td>{{subItem.GoDepartAirportName}}</td>
             <td>{{subItem.GoArrivalAirportName}}</td>
           </tr>
@@ -285,7 +284,6 @@
               <el-input class="w60" v-model="subItem.BackArriveTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')">
               </el-input>
             </td>
-            </td>
             <td>{{subItem.BackDepartAirportName}}</td>
             <td>{{subItem.BackArrivalAirportName}}</td>
           </tr>
@@ -300,8 +298,8 @@
             <el-option label="航空公司B2B模板" :value="1"></el-option>
           </el-select>
         </span>
-       <!--南方航空模板-->
-       <span class="pg_checkModule" v-if="isShowSelect==2">
+        <!--南方航空模板-->
+        <span class="pg_checkModule" v-if="isShowSelect==2">
           选择模板
           <el-select v-model="checkModule" filterable :placeholder="$t('system.ph_buxian')" class="w180">
             <el-option label="代码模板" :value="0"></el-option>
@@ -309,7 +307,6 @@
           </el-select>
         </span>
         <button class="normalBtn" type="primary" @click="getIsSure()">确认航班信息</button> &nbsp;
-        <!-- <button class="normalBtn" type="primary" @click="getIsSureAirTicket()">导出航班信息</button> &nbsp; -->
         <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>
@@ -340,7 +337,7 @@
           TempCode: ""
         },
         outerVisible: false,
-        TemplateType:0,
+        TemplateType: 0,
         flightList: [],
         combineTeamList: [],
         isShowGuoji: false,
@@ -356,8 +353,8 @@
         checkedGJzd: false,
         checkedshuijin: false,
         checkedsc: false,
-        isShowSelect:0,
-        checkModule:0
+        isShowSelect: 0,
+        checkModule: 0
       };
     },
     methods: {
@@ -395,7 +392,7 @@
         );
       },
       getFlightInfo(val) {
-        this.TemplateType=val;
+        this.TemplateType = val;
         let msg = {
           ID: this.$route.query.id
         }
@@ -475,8 +472,8 @@
       exportExcel() {
         let msg = {
           AirTicketId: this.msg.AirTicketId,
-          Type:this.checkModule,
-          TemplateType:this.TemplateType
+          Type: this.checkModule,
+          TemplateType: this.TemplateType
         };
         var fileName = this.$route.query.flightdate //this.QueryMsg.nowDate;
         var TempfileName = ""
@@ -549,9 +546,10 @@
             this.jipiaoObj.shengcangArr.push(x.GuestName);
           }
         })
-        if(this.jipiaoObj.guojiArr.length==0&&this.jipiaoObj.guoneiArr.length==0&&this.jipiaoObj.gjzdArr.length==0&&this.jipiaoObj.shuijinArr.length==0&&this.jipiaoObj.shengcangArr.length==0){
+        if (this.jipiaoObj.guojiArr.length == 0 && this.jipiaoObj.guoneiArr.length == 0 && this.jipiaoObj.gjzdArr
+          .length == 0 && this.jipiaoObj.shuijinArr.length == 0 && this.jipiaoObj.shengcangArr.length == 0) {
           this.Error('请选择旅客名单');
-        }else{
+        } else {
           sessionStorage.setItem("guoji", JSON.stringify(this.jipiaoObj));
           let orderObj = {
             OrderID: 0,
@@ -589,9 +587,9 @@
     mounted() {
       this.QueryMsg.AirTicketId = this.$route.query.id;
       var alcode = this.$route.query.alcode;
-      if(alcode=='HO'){
+      if (alcode == 'HO') {
         this.isShowSelect = 1;
-      }else if(alcode=="CZ"){
+      } else if (alcode == "CZ") {
         this.isShowSelect = 2;
       }
       this.msg.AirTicketId = this.$route.query.id;