Skip to content

S
SuperMan
Commit 99caa9fb authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 76983d84 95260125
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2570 additions and 2181 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 99caa9fb
......@@ -127,8 +127,8 @@
<tr>
<td width="70" style="text-align:center;" colspan="2">
<span style="color:green">{{subItem.NewHotelName}}</span>
<el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop"
v-if="subItem.OPState!=1">
<!-- v-if="subItem.OPState!=1" -->
<el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
<comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
:UseDate="item.UseTimeStr">
</comCheckHotel>
......@@ -138,9 +138,9 @@
酒店选择
</el-button>
</el-popover>
<template v-else>
<!-- <template v-else>
<br /> <span class="Hotel_red">OP-指定，不能更换酒店.</span>
</template>
</template> -->
</td>
</tr>
<tr>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 99caa9fb
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/Ticketing/TicketManager.vue
View file @ 99caa9fb
......@@ -1549,19 +1549,6 @@
</div>
</li>
<!--尾款-->
<!-- <li v-if="item.FinalPayment!=''&&item.FirstDeposit==''&&item.SecondDeposit==''&&item.ThirdDeposit==''&&item.FourthDeposit==''">
<div @click="goFinacePage(item,5)" :class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span>
</el-tooltip>
</div>
<div class="FinaDetailContent">
<span v-if="item.FinalAuditList!=null" v-for="childItem in item.FinalAuditList">
<span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span>
</div>
</li> -->
<li v-else-if="item.FinalPayment!=''">
<div @click="goCustomList('PassengerList',item, 5,'旅客名单')"
:class="getClass(item.FinalPaymentStatus)">
......@@ -1947,6 +1934,11 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="行程天数(国际段)" >
<el-input v-model="addMsg.DayNum" placeholder="行程天数" @keyup.native="checkInteger(addMsg,'DayNum')" maxlength="2"></el-input>
</el-form-item>
</el-col>
<div class="top-btn">
<button class="cancelBtn" type="button" @click="addShow=false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}
......@@ -2082,6 +2074,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="行程天数(国际段)" >
<el-input v-model="addMsg.DayNum" placeholder="行程天数" @keyup.native="checkInteger(addMsg,'DayNum')" maxlength="2"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<div class="commandLine">
<span>
......@@ -2257,7 +2254,8 @@
FourthDeposit: "",
FinalPayment: "",
flightList: [],
LineId: 0
LineId: 0,//线路编号
DayNum:0,//行程天数
},
//去程
addGoFlight: {
......@@ -3026,9 +3024,6 @@
undefined) {
this.addMsg.AirLineID = newList.flightList[0].AirLineID;
}
// if (!this.addMsg.AirLineID) {
// this.addMsg.AirLineID = 0;
// }
if (this.isSubmit) {
this.isSubmit = false;
this.apipost(
......@@ -3126,6 +3121,7 @@
this.TicketOrderList = [];
this.openplatString = [];
this.changeAirLineID = "";
this.addMsg.DayNum=0;
},
//弹出框取消 初始化谈框内表单
resetForm(formName) {
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 99caa9fb
......@@ -726,7 +726,8 @@
<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary"
style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}}
</el-button>
<el-dropdown trigger="click" style="margin-bottom:5px;" v-if="CurrentUserInfo.RB_Branch_id==0||CurrentUserInfo.RB_Branch_id==1216||CurrentUserInfo.RB_Branch_id==49">
<!-- v-if="CurrentUserInfo.RB_Branch_id==0||CurrentUserInfo.RB_Branch_id==1216||CurrentUserInfo.RB_Branch_id==49"-->
<el-dropdown trigger="click" style="margin-bottom:5px;">
<span class="el-dropdown-link">{{$t('pub.updateMsg')}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 99caa9fb
......@@ -181,7 +181,7 @@
}
._TravelPricePopover .jiDiv {
width: 650px;
width: 750px;
max-height: 400px;
overflow: auto;
}
......@@ -440,8 +440,8 @@
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">支持儿童出游
</el-checkbox>
<el-checkbox style="display:none;" v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14"
:false-label="UnCheckedVaule">订团
<el-checkbox style="display:none;" v-model="priceData.IsBookTeam" :true-label="CheckedVaule"
v-if="PostConfig.LineId==14" :false-label="UnCheckedVaule">订团
</el-checkbox>
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
:false-label="UnCheckedLessPrice">可少价
......@@ -693,9 +693,11 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="_color_666">选择</td>
<td class="_color_666">机票编号/票务</td>
<td class="_color_666">航班号/航空公司/航段</td>
<td class="_color_666">时间</td>
<td class="_color_666">PNR</td>
<td class="_color_666">行程天数</td>
<td class="_color_666">机票数量/使用数量</td>
<td class="_color_666">绑定机位数</td>
</tr>
......@@ -703,6 +705,9 @@
<td>
<el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>
</td>
<td>
{{fitem.AirticketId}}/{{fitem.TicketByName}}
</td>
<td>
<span class="TP_Airticktid"
@click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> /
......@@ -710,9 +715,10 @@
</td>
<td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
<td>{{fitem.PNR}}</td>
<td>{{fitem.DayNum}}</td>
<td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td>
<td>
<el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)"
<el-input class="w69" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)"
v-model="fitem.BindNum"></el-input>
</td>
</tr>
......@@ -859,10 +865,12 @@
<span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
<span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(subItem)">删除</span>
</span>
<span >
<span>
<el-popover width="700" trigger="click" popper-class="DMC_HotelPop">
<commonPHInfo :name='"comPriceHotelInfo"+subIndex+childIndex' :ref='"comPriceHotelInfo"+subIndex+childIndex' ></commonPHInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;" @click="GetHotelUsePriceList(childItem.HotelId,subItem.UseDay,subIndex,childIndex)">库存情况</span>
<commonPHInfo :name='"comPriceHotelInfo"+subIndex+childIndex'
:ref='"comPriceHotelInfo"+subIndex+childIndex'></commonPHInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;"
@click="GetHotelUsePriceList(childItem.HotelId,subItem.UseDay,subIndex,childIndex)">库存情况</span>
</el-popover>
</span>
</td>
......@@ -1016,8 +1024,7 @@
},
methods: {
//调用子组件方法
GetHotelUsePriceList(HotelId,UseDay,index,hotelSubIndex)
{
GetHotelUsePriceList(HotelId, UseDay, index, hotelSubIndex) {
let str = `comPriceHotelInfo${index}${hotelSubIndex}`;
this.$refs[str][0].getHotelPriceList(HotelId, UseDay);
},
......@@ -1463,6 +1470,12 @@
},
//选中航班选择框
getSelect(item) {
// if (this.PostConfig.LineId == 14 && item.DayNum != this.PostConfig.DayNum) {
// this.Error("团期行程天数和机票的行程天数不一致!请重新选择!");
// return;
// }
item.IsSelected = !item.IsSelected;
this.FinfoList = [];
this.selectFilghtList.forEach(x => {
......@@ -1750,7 +1763,7 @@
},
components: {
TravelPriceFlightList: TravelPriceFlightList,
commonPHInfo:commonPHlInfo
commonPHInfo: commonPHlInfo
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment