Commit cc8f9fc2 authored by 黄奎's avatar 黄奎

页面修改

parent 37efdea3
<style>
@import "../../../assets/css/newTravelManager.css";
.choosed span {
background-color: #1bc594 !important;
}
......@@ -22,12 +23,7 @@
.TPDateContent .currentInput {
background-color: transparent;
}
/* .TPDateContent .month ul li {
font-size: 12px;
position: relative;
float: left;
letter-spacing: 3px;
} */
.TP_tips {
display: inline-block;
padding: 5px;
......@@ -292,7 +288,6 @@
.TphotelTable tr td {
background-color: #fff;
/* padding:8px 0; */
border: 1px solid #d1d1d1;
}
......@@ -334,6 +329,7 @@
cursor: default !important;
box-shadow: none !important;
}
</style>
<template>
......@@ -367,7 +363,8 @@
</li>
<li style="margin:25px 0 0 0;">
<div class="ckAll">
<el-checkbox class="checkBox" v-model='isCheckAll' @change="checkAll">{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox class="checkBox" v-model='isCheckAll' @change="checkAll">{{$t('system.table_chekAll')}}
</el-checkbox>
</div>
</li>
</ul>
......@@ -436,14 +433,16 @@
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">{{$t('op.SupportChild')}}
</el-checkbox>
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14" style="display:none;"
:false-label="UnCheckedVaule">{{$t('op.OrderTeam')}}
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14"
style="display:none;" :false-label="UnCheckedVaule">{{$t('op.OrderTeam')}}
</el-checkbox>
<input type="button" style="display:none;" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true" v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
<input type="button" style="display:none;" class="normalBtn" :value="$t('op.HotelUse')"
@click="outerVisible=true"
v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</div>
<el-form-item prop="B2BMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
@keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template>
</el-input>
</el-form-item>
......@@ -454,8 +453,8 @@
</el-input>
</el-form-item>
<el-form-item prop="B2CMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CMemberPrice"
@keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_directMember')}}</template>
</el-input>
</el-form-item>
......@@ -472,34 +471,34 @@
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SingleDMCPrice"
@keyup.native="checkPrice(priceData,'SingleDMCPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SingleDMCPrice" @keyup.native="checkPrice(priceData,'SingleDMCPrice')">
<template slot="prepend">{{$t('salesModule.SingleJ')}}</template>
</el-input>
</el-form-item>
</div>
</div>
<div class="clearfix" >
<div class="clearfix">
<div class="leftSetInfo">
<span class="TPbaseSet">{{$t('sm.otherbaojia')}}</span>
<span class="TPsecondTitle">{{$t('Operation.Op_Income')}}</span>
</div>
<div class="TPright">
<el-form-item prop="ChildNeedPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.ChildNeedPrice"
@keyup.native="checkInteger(priceData,'ChildNeedPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.ChildNeedPrice" @keyup.native="checkInteger(priceData,'ChildNeedPrice')">
<template slot="prepend">{{$t('Operation.Op_childBed')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="BabyChargePrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.BabyChargePrice"
@keyup.native="checkPrice(priceData,'BabyChargePrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.BabyChargePrice" @keyup.native="checkPrice(priceData,'BabyChargePrice')">
<template slot="prepend">{{$t('Operation.Op_childSurcharge')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="OldManChargePrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.OldManChargePrice"
@keyup.native="checkPrice(priceData,'OldManChargePrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.OldManChargePrice" @keyup.native="checkPrice(priceData,'OldManChargePrice')">
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
......@@ -510,8 +509,8 @@
</el-input>
</el-form-item>
<el-form-item prop="SingleRoomPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SingleRoomPrice"
@keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SingleRoomPrice" @keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<template slot="prepend">{{$t('Operation.Op_singleRoomcha')}}</template>
</el-input>
</el-form-item>
......@@ -536,7 +535,8 @@
</div>
<div class="TPright">
<el-form-item prop="ForeignPassportPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w300 ComSeat" v-model="priceData.ForeignPassportPrice"
<el-input :placeholder="$t('pub.pleaseImport')" class="w300 ComSeat"
v-model="priceData.ForeignPassportPrice"
@keyup.native="checkPrice(priceData,'ForeignPassportPrice')">
<template slot="prepend">非中国大陆护照报价</template>
</el-input>
......@@ -550,14 +550,14 @@
</div>
<div class="TPright">
<el-form-item prop="ChildNoNeedPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.ChildNoNeedPrice"
@keyup.native="checkInteger(priceData,'ChildNoNeedPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.ChildNoNeedPrice" @keyup.native="checkInteger(priceData,'ChildNoNeedPrice')">
<template slot="prepend">{{$t('Operation.Op_childNobed')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="BackVisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.BackVisaPrice"
@keyup.native="checkInteger(priceData,'BackVisaPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.BackVisaPrice" @keyup.native="checkInteger(priceData,'BackVisaPrice')">
<template slot="prepend">{{$t('Operation.Op_visafeeBack')}}</template>
</el-input>
</el-form-item>
......@@ -569,8 +569,8 @@
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.DiscountPrice"
@keyup.native="checkPrice(priceData,'DiscountPrice')">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.DiscountPrice" @keyup.native="checkPrice(priceData,'DiscountPrice')">
<template slot="prepend">{{$t('sm.zaoniaoyouhui')}}</template>
</el-input>
</el-form-item>
......@@ -583,8 +583,8 @@
</div>
<div class="TPright clearfix">
<el-form-item prop="ClearOrderHour">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.ClearOrderHour"
@keyup.native="checkInteger(priceData,'ClearOrderHour')"
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.ClearOrderHour" @keyup.native="checkInteger(priceData,'ClearOrderHour')"
@blur="checkInteger(priceData,'ClearOrderHour')">
<template slot="prepend">{{$t('sm.zidongqingwei')}}</template>
</el-input>
......@@ -601,8 +601,8 @@
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option>
</el-select>
<span class="TC_neibu" style="float: inherit;margin-left: 5px;margin-right: 5px;" v-if="standardCurrencyName"
:class="{'TCneibu':standardCurrencyName=='人民币','TCb2b':standardCurrencyName=='日元',
<span class="TC_neibu" style="float: inherit;margin-left: 5px;margin-right: 5px;"
v-if="standardCurrencyName" :class="{'TCneibu':standardCurrencyName=='人民币','TCb2b':standardCurrencyName=='日元',
'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}结算</span>
</el-form-item>
......@@ -645,8 +645,8 @@
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input :placeholder="$t('op.CanSallTicketNum')" class="w290" v-model="priceData.CanSellTicketNum" maxlength="2"
@keyup.native="checkInteger(priceData,'CanSellTicketNum')"
<el-input :placeholder="$t('op.CanSallTicketNum')" class="w290" v-model="priceData.CanSellTicketNum"
maxlength="2" @keyup.native="checkInteger(priceData,'CanSellTicketNum')"
@change="CheckSellTicketNum(priceData)">
<template slot="prepend">{{$t('op.CanSallTicketNum')}}</template>
</el-input>
......@@ -659,7 +659,8 @@
</el-input>
</el-form-item>
<el-form-item prop="GatherAddress">
<el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat" v-model="priceData.GatherAddress">
<el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat"
v-model="priceData.GatherAddress">
<template slot="prepend">{{$t('sm.jihedidian')}}</template>
</el-input>
</el-form-item>
......@@ -676,7 +677,8 @@
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat" v-model="priceData.AirportService">
<el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat"
v-model="priceData.AirportService">
<template slot="prepend">{{$t('op.AirSupplier')}}</template>
</el-input>
</el-form-item>
......@@ -727,7 +729,8 @@
<td>{{fitem.TicketNum}}</td>
<td>{{fitem.UseAmount}}</td>
<td>
<el-input class="w80" :placeholder="$t('salesModule.AirNum')" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
<el-input class="w80" :placeholder="$t('salesModule.AirNum')"
@keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
</td>
</tr>
</table>
......@@ -814,7 +817,8 @@
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
<tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList">
<td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}&nbsp;({{getDayByDate(item.UseDay)}})</td>
<td style="background-color:#E6E6E6;color:#333;" width="120">
{{item.UseDay}}&nbsp;({{getDayByDate(item.UseDay)}})</td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
......@@ -840,7 +844,8 @@
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="saveHoteluseDetail()"
: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>
</el-dialog>
</div>
......@@ -877,9 +882,14 @@
SaleBranchIdArray: [],
OutGroupType: 0
},
OutGroupTypeList: [
{Name: '常规', Id: 0},
{Name: '落地团', Id: 1},
OutGroupTypeList: [{
Name: '常规',
Id: 0
},
{
Name: '落地团',
Id: 1
},
],
returnPriceList: this.priceList,
//酒店列表
......@@ -1047,7 +1057,7 @@
//选中的酒店数组
ChooseHotelArray: [],
//非中国大陆护照报价
ForeignPassportPrice:0
ForeignPassportPrice: 0
};
}
this.returnPriceList.push(objItem);
......@@ -1059,47 +1069,46 @@
break;
}
},
//日历全选
checkAll() {
this.returnPriceList=[];
if(this.isCheckAll){
this.days.forEach(x=>{
x.checkState='1';
this.returnPriceList = [];
if (this.isCheckAll) {
this.days.forEach(x => {
x.checkState = '1';
let obj = {
AdImage:'',
AirTicketId:0,
AirportService:'',
AirticketBindList:[],
AirticketMoney:0,
B2BMemberPrice:0,
B2BPrice:0,
B2CMemberPrice:0,
B2CPrice:0,
BabyChargePrice:0,
BabyPrice:0,
BackSafeMoney:0,
BackVisaPrice:0,
CSeat:0,
CanSellTicketNum:0,
Checked:false,
ChildNeedPrice:0,
ChildNoNeedPrice:0,
ChooseHotelArray:[],
ClearOrderHour:'',
ContractArray:[],
ContractUrl:'',
DeleteAirticketIds:'',
DiscountPrice:0,
FSeat:0,
GatherAddress:'',
GatherTag:'',
GatherTime:'',
Inventory:0,
IsB2B:0,
IsB2C:0,
IsBookTeam:0,
IsNew:false,
AdImage: '',
AirTicketId: 0,
AirportService: '',
AirticketBindList: [],
AirticketMoney: 0,
B2BMemberPrice: 0,
B2BPrice: 0,
B2CMemberPrice: 0,
B2CPrice: 0,
BabyChargePrice: 0,
BabyPrice: 0,
BackSafeMoney: 0,
BackVisaPrice: 0,
CSeat: 0,
CanSellTicketNum: 0,
Checked: false,
ChildNeedPrice: 0,
ChildNoNeedPrice: 0,
ChooseHotelArray: [],
ClearOrderHour: '',
ContractArray: [],
ContractUrl: '',
DeleteAirticketIds: '',
DiscountPrice: 0,
FSeat: 0,
GatherAddress: '',
GatherTag: '',
GatherTime: '',
Inventory: 0,
IsB2B: 0,
IsB2C: 0,
IsBookTeam: 0,
IsNew: false,
IsOrder: 0,
IsSubstitution: 1,
IsSupportChildren: 1,
......@@ -1126,9 +1135,34 @@
}
this.returnPriceList.push(obj);
})
} else {
// console.log("取消选中");
// var that = this;
// if (this.returnPriceList && this.returnPriceList.length > 0) {
// this.returnPriceList.forEach(item => {
// console.log("item", item)
// if (item.TCID > 0) {
// that.apipost(
// "travel_post_RemoveTravelPrice", {
// TCID: item.TCID
// },
// res => {
// if (res.data.resultCode == 1) {
// } else {
// that.Info(res.data.message);
// }
// },
// null
// );
// }
// })
// }
//取消选中
this.days.forEach(x => {
x.checkState = '2';
});
}
},
//单团期修改重置日历选中
initDatePickerCheched() {
......@@ -1198,7 +1232,7 @@
if (this.priceData.AirticketBindList.length > 0) {
this.QFlightDateStart = this.priceData.AirticketBindList[0].FlightDate;
this.QFlightDateEnd = this.priceData.AirticketBindList[this.priceData.AirticketBindList.length - 1]
.FlightDate;
.FlightDate;
this.getSelectFilght();
} else {
this.QFlightDateStart = this.daysCalculate(this.priceData.StartDate, -1);
......@@ -1223,7 +1257,7 @@
QFlightDateEnd: this.QFlightDateEnd,
CreateBy: createBy,
AirTicketId: this.priceData.AirTicketId,
TCID:this.priceData.TCID
TCID: this.priceData.TCID
};
let that = this;
......@@ -1307,7 +1341,7 @@
this.isNullOrEmpty(quotationPrice.ChildNoNeedPrice) ||
this.isNullOrEmpty(quotationPrice.OldManChargePrice) ||
this.isNullOrEmpty(quotationPrice.OtherPrice) ||
this.isNullOrEmpty(quotationPrice.ForeignPassportPrice)||
this.isNullOrEmpty(quotationPrice.ForeignPassportPrice) ||
this.isNullOrEmpty(quotationPrice.SingleRoomPrice) ||
this.isNullOrEmpty(quotationPrice.VisaPrice) ||
this.isNullOrEmpty(quotationPrice.SingleDMCPrice) ||
......@@ -1440,15 +1474,15 @@
});
return isExit;
},
getstandardCurrencyName(){
getstandardCurrencyName() {
let isShow = true
this.companyList.forEach(x=>{
if(x.id==this.priceData.OutBranchId&&x.standardCurrencyId>0){
this.companyList.forEach(x => {
if (x.id == this.priceData.OutBranchId && x.standardCurrencyId > 0) {
this.standardCurrencyName = x.standardCurrencyName
isShow = false
}
})
if(isShow){
if (isShow) {
this.standardCurrencyName = ''
}
},
......@@ -1514,11 +1548,10 @@
parseInt(this.priceData.YSeat) +
parseInt(this.priceData.CSeat) +
parseInt(this.priceData.FSeat);
if(Number(fitem.TicketNum)-Number(fitem.OtherTeamUseNum)<Number(fitem.BindNum))
{
fitem.BindNum=0;
this.Error("最多只能绑定"+(Number(fitem.TicketNum)-Number(fitem.OtherTeamUseNum))+"个机位");
}
if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) {
fitem.BindNum = 0;
this.Error("最多只能绑定" + (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum)) + "个机位");
}
this.selectFilghtList.forEach((x, index) => {
if (x.IsSelected) {
this.priceData.AirticketBindList.forEach(y => {
......@@ -1598,13 +1631,13 @@
},
//保存酒店使用情况
saveHoteluseDetail() {
var that=this;
this.Confirm("是否确定提交选中的酒店?",function(){
var that = this;
this.Confirm("是否确定提交选中的酒店?", function () {
if (that.isSaved) {
that.isSaved = false;
that.$emit("saveMsg");
}
that.btnText = '保存中...'
that.isSaved = false;
that.$emit("saveMsg");
}
that.btnText = '保存中...'
});
},
//取消
......@@ -1646,11 +1679,11 @@
}
},
//根据日期返回星期几
getDayByDate(dateString){
if(dateString){
getDayByDate(dateString) {
if (dateString) {
var date;
var dateArray = dateString.split("-");
date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
return "日一二三四五六".charAt(date.getDay());
}
}
......@@ -1701,7 +1734,7 @@
//深度监听,可监听到对象、数组的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
this.$emit("headCallBack", this.returnPriceList, this.priceData.OutGroupType);
},
deep: true
},
......@@ -1709,7 +1742,7 @@
//深度监听,可监听到对象的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
this.$emit("headCallBack", this.returnPriceList, this.priceData.OutGroupType);
},
deep: true
},
......
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