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

src/components/Ticketing/PassengerList.vue

@@ -140,7 +140,13 @@
           </table>
         </li>
         <li>
-          <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" />
+          <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>
+        
           <input type="button" class="normalBtn" v-if="isShowGuoji" value="制作财务单据" @click="makeFinacelDoc()" />
           <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" style="display:none;" />
         </li>
@@ -303,6 +309,7 @@
           </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>
@@ -333,6 +340,7 @@
           TempCode: ""
         },
         outerVisible: false,
+        TemplateType:0,
         flightList: [],
         combineTeamList: [],
         isShowGuoji: false,
@@ -386,7 +394,8 @@
           err => {}
         );
       },
-      getFlightInfo() {
+      getFlightInfo(val) {
+        this.TemplateType=val;
         let msg = {
           ID: this.$route.query.id
         }
@@ -426,7 +435,7 @@
             this.$message.info("已取消！");
           });
       },
-      //确定
+
       getCheckInfo() {
         let FlightList = []
         this.flightList.forEach(x => {
@@ -466,7 +475,8 @@
       exportExcel() {
         let msg = {
           AirTicketId: this.msg.AirTicketId,
-          Type:this.checkModule
+          Type:this.checkModule,
+          TemplateType:this.TemplateType
         };
         var fileName = this.$route.query.flightdate //this.QueryMsg.nowDate;
         var TempfileName = ""
@@ -490,6 +500,7 @@
       },
 
 
+
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.getList();