Skip to content

S
SuperMan
Commit 72007ddd authored by 吴春's avatar 吴春
Browse files
Options

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

parents 8bd3e084 f0caac9c
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 48 deletions
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 72007ddd
...@@ -180,11 +180,12 @@ ...@@ -180,11 +180,12 @@
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
} }
._TravelPricePopover .jiDiv{ ._TravelPricePopover .jiDiv {
width:650px; width: 650px;
max-height:400px; max-height: 400px;
overflow: auto; overflow: auto;
} }
._TravelPricePopover table { ._TravelPricePopover table {
padding: 10px 0 0 20px; padding: 10px 0 0 20px;
background-color: #ededed; background-color: #ededed;
...@@ -334,12 +335,14 @@ ...@@ -334,12 +335,14 @@
cursor: default !important; cursor: default !important;
box-shadow: none !important; box-shadow: none !important;
} }
.lessPriceRule{
font-size:14px; .lessPriceRule {
margin-left:40px; font-size: 14px;
margin-left: 40px;
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
</style> </style>
<template> <template>
...@@ -437,13 +440,14 @@ ...@@ -437,13 +440,14 @@
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">支持儿童出游 :false-label="UnCheckedVaule">支持儿童出游
</el-checkbox> </el-checkbox>
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14" <el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14"
:false-label="UnCheckedVaule">订团 :false-label="UnCheckedVaule">订团
</el-checkbox> </el-checkbox>
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">可少价 :false-label="UnCheckedVaule">可少价
</el-checkbox> </el-checkbox>
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true" v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" /> <input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true"
v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</div> </div>
<el-form-item prop="B2BMemberPrice"> <el-form-item prop="B2BMemberPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
...@@ -693,13 +697,16 @@ ...@@ -693,13 +697,16 @@
<el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox> <el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>
</td> </td>
<td> <td>
<span class="TP_Airticktid" @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> / {{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}} <span class="TP_Airticktid"
@click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> /
{{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
</td> </td>
<td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td> <td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
<td>{{fitem.PNR}}</td> <td>{{fitem.PNR}}</td>
<td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td> <td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td>
<td> <td>
<el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input> <el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)"
v-model="fitem.BindNum"></el-input>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -774,9 +781,10 @@ ...@@ -774,9 +781,10 @@
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div class="TPright"> <div class="TPright">
<span v-if="priceData.IsLessPrice==1" @click="getLessPriceInfo(),lessPriceVisible=true" class="lessPriceRule">少价规则</span> <span v-if="priceData.IsLessPrice==1" @click="getLessPriceInfo(),lessPriceVisible=true"
</div> class="lessPriceRule">少价规则</span>
</div>
</div> </div>
</el-form> </el-form>
</div> </div>
...@@ -789,6 +797,12 @@ ...@@ -789,6 +797,12 @@
</div> </div>
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center> <el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0"> <table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
<tr>
<th>日期</th>
<th>酒店</th>
<th>占房时间</th>
<th>更换酒店</th>
</tr>
<tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList"> <tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList">
<td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td> <td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
<td> <td>
...@@ -796,24 +810,35 @@ ...@@ -796,24 +810,35 @@
<div> <div>
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp; {{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;
<span v-if="subItem.UseCount>0 && item.SubList.length==1"> <span v-if="subItem.UseCount>0 && item.SubList.length==1">
<a style="color:green">{{subItem.RemainingInventory>-3?"【OK】":"【暂定】"}}</a> <a style="color:green">{{subItem.RemainingInventory>-3?"【OK】":"【暂定】"}}</a>
【<span style="color:green">本团使用库存：{{subItem.UseCount}} {{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】</span> 【<span style="color:green">本团使用库存：{{subItem.UseCount}}
【<span {{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】
style="color:#E95252;">剩余库存：{{subItem.RemainingInventory}} <template v-if="subItem.CreateDateStr">占房时间:{{subItem.CreateDateStr}}</template> </span>
【<span style="color:#E95252;">剩余库存：{{subItem.RemainingInventory}}
</span>】 </span>】
&nbsp;&nbsp; &nbsp;&nbsp;
<el-checkbox v-if="item.SubList.length>1" v-model="item.CheckList[index].CheckStatus" <el-checkbox v-if="item.SubList.length>1" v-model="item.CheckList[index].CheckStatus"
@change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox> @change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
</div> </div>
</div> </div>
</td> </td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
<span v-if="subItem.UseCount>0 && item.SubList.length==1">
<span style="color:green;white-space:nowrap;">{{subItem.CreateDateStr}}</span>
</span>
</div>
</div>
</td>
<td> <td>
<el-select class="w180" v-model="item.NewHotelId" @visible-change="getHotelList(item,$event)" <el-select class="w180" v-model="item.NewHotelId" @visible-change="getHotelList(item,$event)"
@change="changeHotelList()" filterable> @change="changeHotelList()" filterable>
<el-option :key="0" label="请选择" :value="0"></el-option> <el-option :key="0" label="请选择" :value="0"></el-option>
<el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID"> <el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID">
<span style="float: left">{{subItem.Name}}</span> <span style="float: left">{{subItem.Name}}</span>
<span style="float: right; color:red; font-size: 13px">剩余库存:{{subItem.Inventory}} / 价格:{{subItem.CostPrice}}</span> <span style="float: right; color:red; font-size: 13px">剩余库存:{{subItem.Inventory}} /
价格:{{subItem.CostPrice}}</span>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
...@@ -822,7 +847,8 @@ ...@@ -822,7 +847,8 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="saveHoteluseDetail()" <button class="normalBtn" type="primary" @click="saveHoteluseDetail()"
:class="{'disClick':!isSaved}">{{btnText}}</button> &nbsp; :class="{'disClick':!isSaved}">{{btnText}}</button> &nbsp;
<button class="hollowFixedBtn" :class="{'disClick':!isSaved}" @click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
@click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -835,22 +861,25 @@ ...@@ -835,22 +861,25 @@
</tr> </tr>
<tr v-for="item in lessPriceData"> <tr v-for="item in lessPriceData">
<td> <td>
<span v-if="item.LessMoney!=null" style="margin-right:30px;">{{item.LessMoney}}元</span><span v-if="item.LessPercent!=null">{{item.LessPercent}}%</span> <span v-if="item.LessMoney!=null" style="margin-right:30px;">{{item.LessMoney}}元</span><span
v-if="item.LessPercent!=null">{{item.LessPercent}}%</span>
</td> </td>
<td> <td>
<span v-if="item.DeptLessMoney!=null" style="margin-right:30px;">{{item.DeptLessMoney}}元</span><span v-if="item.DeptLessPercent!=null">{{item.DeptLessPercent}}%</span> <span v-if="item.DeptLessMoney!=null" style="margin-right:30px;">{{item.DeptLessMoney}}元</span><span
v-if="item.DeptLessPercent!=null">{{item.DeptLessPercent}}%</span>
</td> </td>
<td> <td>
<span v-if="item.FilialeLessMoney!=null" style="margin-right:30px;">{{item.FilialeLessMoney}}元</span><span v-if="item.FilialeLessPercent!=null">{{item.FilialeLessPercent}}%</span> <span v-if="item.FilialeLessMoney!=null" style="margin-right:30px;">{{item.FilialeLessMoney}}元</span><span
v-if="item.FilialeLessPercent!=null">{{item.FilialeLessPercent}}%</span>
</td> </td>
</tr> </tr>
</table> </table>
<div class="noData" v-else> <div class="noData" v-else>
{{$t('system.content_noData')}} {{$t('system.content_noData')}}
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="lessPriceVisible=false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="lessPriceVisible=false">{{$t('pub.cancelBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -945,8 +974,8 @@ ...@@ -945,8 +974,8 @@
} }
}, },
//少价规则 //少价规则
lessPriceVisible:false, lessPriceVisible: false,
lessPriceData:[], lessPriceData: [],
}; };
}, },
methods: { methods: {
...@@ -1135,7 +1164,7 @@ ...@@ -1135,7 +1164,7 @@
if (this.priceData.AirticketBindList.length > 0) { if (this.priceData.AirticketBindList.length > 0) {
this.QFlightDateStart = this.priceData.AirticketBindList[0].FlightDate; this.QFlightDateStart = this.priceData.AirticketBindList[0].FlightDate;
this.QFlightDateEnd = this.priceData.AirticketBindList[this.priceData.AirticketBindList.length - 1] this.QFlightDateEnd = this.priceData.AirticketBindList[this.priceData.AirticketBindList.length - 1]
.FlightDate; .FlightDate;
this.getSelectFilght(); this.getSelectFilght();
} else { } else {
this.QFlightDateStart = this.daysCalculate(this.priceData.StartDate, -1); this.QFlightDateStart = this.daysCalculate(this.priceData.StartDate, -1);
...@@ -1160,7 +1189,7 @@ ...@@ -1160,7 +1189,7 @@
QFlightDateEnd: this.QFlightDateEnd, QFlightDateEnd: this.QFlightDateEnd,
CreateBy: createBy, CreateBy: createBy,
AirTicketId: this.priceData.AirTicketId, AirTicketId: this.priceData.AirTicketId,
TCID:this.priceData.TCID TCID: this.priceData.TCID
}; };
let that = this; let that = this;
...@@ -1437,11 +1466,10 @@ ...@@ -1437,11 +1466,10 @@
parseInt(this.priceData.YSeat) + parseInt(this.priceData.YSeat) +
parseInt(this.priceData.CSeat) + parseInt(this.priceData.CSeat) +
parseInt(this.priceData.FSeat); parseInt(this.priceData.FSeat);
if(Number(fitem.TicketNum)-Number(fitem.OtherTeamUseNum)<Number(fitem.BindNum)) if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) {
{ fitem.BindNum = 0;
fitem.BindNum=0; this.Error("最多只能绑定" + (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum)) + "个机位");
this.Error("最多只能绑定"+(Number(fitem.TicketNum)-Number(fitem.OtherTeamUseNum))+"个机位"); }
}
this.selectFilghtList.forEach((x, index) => { this.selectFilghtList.forEach((x, index) => {
if (x.IsSelected) { if (x.IsSelected) {
this.priceData.AirticketBindList.forEach(y => { this.priceData.AirticketBindList.forEach(y => {
...@@ -1522,13 +1550,13 @@ ...@@ -1522,13 +1550,13 @@
}, },
//保存酒店使用情况 //保存酒店使用情况
saveHoteluseDetail() { saveHoteluseDetail() {
var that=this; var that = this;
this.Confirm("是否确定提交选中的酒店?",function(){ this.Confirm("是否确定提交选中的酒店?", function () {
if (that.isSaved) { if (that.isSaved) {
that.isSaved = false; that.isSaved = false;
that.$emit("saveMsg"); that.$emit("saveMsg");
} }
that.btnText = '保存中...' that.btnText = '保存中...'
}); });
}, },
//取消 //取消
...@@ -1570,16 +1598,16 @@ ...@@ -1570,16 +1598,16 @@
} }
}, },
//获取少价信息 //获取少价信息
getLessPriceInfo(){ getLessPriceInfo() {
let msg = { let msg = {
RB_Branch_id:this.priceData.OutBranchId, RB_Branch_id: this.priceData.OutBranchId,
LineID:this.PostConfig.LineId, LineID: this.PostConfig.LineId,
LineTeamId:this.PostConfig.LineteamId LineTeamId: this.PostConfig.LineteamId
} }
this.apipost("sell_get_GetNewTCIDLessprice", msg,res => { this.apipost("sell_get_GetNewTCIDLessprice", msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.lessPriceData = res.data.data; this.lessPriceData = res.data.data;
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
...@@ -1650,4 +1678,5 @@ ...@@ -1650,4 +1678,5 @@
TravelPriceFlightList: TravelPriceFlightList TravelPriceFlightList: TravelPriceFlightList
} }
}; };
</script>
\ No newline at end of file </script>
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