Skip to content

S
SuperMan
Commit 02074bb8 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 0279beeb a6c93c59
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 60 deletions
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 02074bb8
......@@ -427,6 +427,25 @@
<span>{{$t('Airticket.Air_StartTime')}}</span>
{{item.StartDate}}
</p>
<p class="travelnowrap flex" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
<span>报价单</span>
<span class="go_date">
<template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
<a :key="subIndex" style="margin-left:20px;color:blue;cursor:pointer;" :href="subItem.Url"
v-if="subItem.Url" target="_blank" :download="subItem.Name">{{subItem.Name}}</a>
<template v-if="item.OfferUrlExtArray.length>1 && subIndex<item.OfferUrlExtArray.length">
<br :key="subIndex+1000" />
</template>
</template>
</span>
</p>
<p class="travelnowrap flex" v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
<span>报价单</span>
<span class="go_date">
<a style="margin-left:20px;color:blue;cursor:pointer;" :href="item.PriceOfferUrl"
v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
</span>
</p>
<p class="travelnowrap">
<span>{{$t('Operation.Op_teamNotice')}}</span>
{{item.OutNotice==1?"OK":"暂定"}}
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 02074bb8
......@@ -456,7 +456,7 @@
</el-checkbox>
<template v-if="CurrentUserInfo.RB_Group_id==2">
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
v-if="(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</template>
<template v-else>
<input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 02074bb8
<style>
@import "../../../assets/css/newTravelManager.css";
.choosed span {
background-color: #1bc594 !important;
}
......@@ -103,6 +104,7 @@
.TravelPrice .days .checked1 {
border: 1px solid #2aa872 !important;
}
.TravelPrice .days .checked2 {
border: 1px solid #e95252 !important;
}
......@@ -294,9 +296,11 @@
background-color: #e95252 !important;
color: white;
}
.TpricehasTicket{
color:#47BF8C!important;
.TpricehasTicket {
color: #47BF8C !important;
}
</style>
<template>
......@@ -342,7 +346,8 @@
</ul>
<!-- 日期 -->
<ul class="days">
<li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode" :class="{'TpricehasTicket':dayobject.Tip}" :title="dayobject.Tip?'当天有机票':''">
<li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode"
:class="{'TpricehasTicket':dayobject.Tip}" :title="dayobject.Tip?'当天有机票':''">
<template v-if="dayobject.click">
<span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
@click="clickedDay(dayobject)">{{dayobject.day.getDate()}}
......@@ -410,7 +415,7 @@
</template>
<tr>
<td>{{$t('active.cl_jipiao')}}</td>
<td colspan="2" align="center">666</td>
<td colspan="2" align="center"></td>
</tr>
<tr>
<td>{{$t('fnc.a_heji')}}</td>
......@@ -420,7 +425,8 @@
<p class="fl dijiebaojia_table_btn" v-if="!dijiebaojiaShow&&queryPriceList.length>0"
@click="dijiebaojiaShow=true">{{$t('sm.xianshidijie')}}</p>
<p class="fl dijiebaojia_table_btn dijiebaojia_table_btn_hide"
v-if="dijiebaojiaShow&&queryPriceList.length>0" @click="dijiebaojiaShow=false">{{$t('sm.yuincangdijie')}}</p>
v-if="dijiebaojiaShow&&queryPriceList.length>0" @click="dijiebaojiaShow=false">
{{$t('sm.yuincangdijie')}}</p>
</div>
<div class="clearfix">
<div class="leftSetInfo">
......@@ -429,8 +435,8 @@
</div>
<div class="TPright">
<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>
......@@ -441,8 +447,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>
......@@ -459,8 +465,8 @@
</el-input>
</el-form-item>
<el-form-item>
<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('sm.dandijie')}}</template>
</el-input>
</el-form-item>
......@@ -473,20 +479,20 @@
</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>
......@@ -497,8 +503,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>
......@@ -523,7 +529,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>
......@@ -537,14 +544,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>
......@@ -556,8 +563,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>
......@@ -574,8 +581,8 @@
</div>
<div class="TPright clearfix">
<el-form-item prop="ClearOrderHour" v-if="TeamType==1">
<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>
......@@ -587,13 +594,14 @@
</el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
<el-select class="w180" v-model="priceData.OutBranchId" :disabled="TeamType==1" @change="getstandardCurrencyName">
<el-select class="w180" v-model="priceData.OutBranchId" :disabled="TeamType==1"
@change="getstandardCurrencyName">
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<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>
......@@ -667,12 +675,22 @@
</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>
</div>
<div class="TPright clearfix">
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">报价单地址</span>
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="primary">上传</el-button>
</el-upload>
<a style="margin-left:20px;color:blue;" :href="priceData.PriceOfferUrl"
v-if="priceData.PriceOfferUrl" target="_blank">预览</a>
</el-form-item>
</div>
<div class="clearfix">
<div class="leftSetInfo">
......@@ -775,9 +793,14 @@
SaleBranchIdArray: [],
OutGroupType: 0
},
OutGroupTypeList: [
{Name: '常规', Id: 0},
{Name: '落地团', Id: 1},
OutGroupTypeList: [{
Name: '常规',
Id: 0
},
{
Name: '落地团',
Id: 1
},
],
returnPriceList: this.priceList,
companyList: [],
......@@ -930,16 +953,16 @@
JSON.stringify(this.PostConfig.FlightList)
),
//非中国大陆护照报价
ForeignPassportPrice:0,
SupplierId:0,//供应商编号
ForeignPassportPrice: 0,
SupplierId: 0, //供应商编号
PriceOfferUrl: "",
};
}
this.queryFlightAirListData.forEach(subItem=>{
if(subItem.FlightDate==objItem.StartDate)
{
objItem.AirTicketId=subItem.AirLineTicketId
}
});
this.queryFlightAirListData.forEach(subItem => {
if (subItem.FlightDate == objItem.StartDate) {
objItem.AirTicketId = subItem.AirLineTicketId
}
});
this.returnPriceList.push(objItem);
this.initDatePickerCheched();
this.returnPriceList.sort(
......@@ -1017,7 +1040,7 @@
EstartcityId: 0,
EendcityId: 0,
};
if (TrafficList.TrafficList!=null&&TrafficList.TrafficList.length >= 2) {
if (TrafficList.TrafficList != null && TrafficList.TrafficList.length >= 2) {
if (TrafficList.TrafficList[0].SubTraffic[0].ArrivalCityId === 0) return;
if (TrafficList.TrafficList[0].SubTraffic[0].StartCityId === 0) return;
msg.FstartcityId = TrafficList.TrafficList[0].SubTraffic[0].StartCityId;
......@@ -1035,8 +1058,8 @@
msg.EstartcityId = TrafficList.TrafficList[TrafficList.TrafficList.length - 1].SubTraffic[0].StartCityId;
msg.EendcityId = TrafficList.TrafficList[TrafficList.TrafficList.length - 1].SubTraffic[0].ArrivalCityId;
}
this.queryFlightAirList(msg);
}
this.queryFlightAirList(msg);
}
},
// 获取飞机票2
queryFlightAirList(msg) {
......@@ -1058,9 +1081,9 @@
for (let k in this.days) {
this.days[k].click = true;
if (this.queryFlightAirDateList[i].day == new Date(this.days[k].day).Format("yyyy-MM-dd")) {
this.days[k].Tip=true;
//HK 2020-02-03注释
//this.days[k].click = true;
this.days[k].Tip = true;
//HK 2020-02-03注释
//this.days[k].click = true;
}
}
}
......@@ -1182,7 +1205,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) ||
......@@ -1237,6 +1260,17 @@
}
});
},
uploadFileBtn(file) { //上传
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
this.priceData.PriceOfferUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.priceData.PriceOfferName = x.data.SourceFileName;
this.Success(this.$t('tips.scchenggong'))
});
},
//删除团期
deletePrice(StartDateStr) {
this.days.forEach(dayItem => {
......@@ -1315,15 +1349,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 = ''
}
},
......@@ -1415,7 +1449,7 @@
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupTyp);
this.$emit("headCallBack", this.returnPriceList, this.priceData.OutGroupTyp);
},
deep: true
},
......@@ -1423,7 +1457,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
},
......@@ -1451,4 +1485,5 @@
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