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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -193,7 +193,7 @@
               {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
             </td>
             <td v-if="childIndex==0" :rowspan="6">
-              {{subItem.RealityHouseGuestNum}}/{{subItem.HouseStatistics.NoNeedBed}}
+              {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
             </td>
             <td v-if="childIndex==0" :rowspan="6">
               {{subItem.RealityHouseTypeCount}}

src/components/Ticketing/PassengerList.vue

@@ -286,13 +286,22 @@
         </tbody>
       </table>
       <div slot="footer" class="dialog-footer">
-        <span class="pg_checkModule" v-if="isShowSelect">
+        <!--吉祥航空模板-->
+        <span class="pg_checkModule" v-if="isShowSelect==1">
           选择模板
           <el-select v-model="checkModule" filterable :placeholder="$t('system.ph_buxian')" class="w180">
             <el-option label="代理模板" :value="0"></el-option>
             <el-option label="航空公司B2B模板" :value="1"></el-option>
           </el-select>
         </span>
+       <!--南方航空模板-->
+       <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>
+            <el-option label="南航国际团队" :value="1"></el-option>
+          </el-select>
+        </span>
         <button class="normalBtn" type="primary" @click="getIsSure()">确认航班信息</button> &nbsp;
         <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
       </div>
@@ -339,7 +348,7 @@
         checkedGJzd: false,
         checkedshuijin: false,
         checkedsc: false,
-        isShowSelect:false,
+        isShowSelect:0,
         checkModule:0
       };
     },
@@ -569,9 +578,9 @@
       this.QueryMsg.AirTicketId = this.$route.query.id;
       var alcode = this.$route.query.alcode;
       if(alcode=='HO'){
-        this.isShowSelect = true;
-      }else{
-        this.isShowSelect = false;
+        this.isShowSelect = 1;
+      }else if(alcode=="CZ"){
+        this.isShowSelect = 2;
       }
       this.msg.AirTicketId = this.$route.query.id;
       if (this.$route.query.isFromTk != undefined) {