Skip to content

S
SuperMan
Commit d836e08d authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent 1b2c1a36
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 32 deletions
src/assets/utils/tripUtils.js
View file @ d836e08d
......@@ -449,6 +449,7 @@ var tripUtils = {
HotelType: 0,
MD5Sign: "",
TimeStr: "", //时间字符串备注
HotelBookType:0,//1-自定，2-PIC预定
};
},
//行程-餐饮对象
......
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ d836e08d
......@@ -1354,7 +1354,7 @@
}
//车
if (type == 2) {
xiaoJi += Number(item.BusCostPrice) * Number(currencyRate);
xiaoJi += (Number(item.BusCostPrice)+Number(item.PassFee)) * Number(currencyRate);
}
//景点
if (type == 3) {
......@@ -1372,10 +1372,10 @@
if (type == 6) {
xiaoJi += Number(item.DinnerCostPrice) * Number(currencyRate);
}
//过路费
if (type == 7) {
xiaoJi += Number(item.PassFee) * Number(currencyRate);
}
// //过路费
// if (type == 7) {
// xiaoJi += Number(item.PassFee) * Number(currencyRate);
// }
//回佣
if (type == 8) {
xiaoJi += Number(item.RebatePrice) * Number(currencyRate);
......
src/components/commonPage/changeOffer.vue
View file @ d836e08d
......@@ -108,6 +108,24 @@
};
},
methods: {
getDiJiePrice(item) {
// var postMsg = {
// OfferId: this.qMsg.OfferId,
// ChangeType: item.ChangeType,
// DayNum: this.qMsg.DayNum,
// };
// this.apipost(
// "dmcstatistics_post_GetGroupDayUserMoney", postMsg,
// res => {
// // if (res.data.resultCode == 1) {
// // that.Success(that.$t('objFill.v101.hote.shanchucg'));
// // that.getOfferChange();
// // } else {
// // that.Error(that.$t('objFill.v101.hote.shanchusb'));
// // }
// }
// );
},
AddOfferObj() {
var obj = {
ChangeId: 0,
......
src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue
View file @ d836e08d
......@@ -97,7 +97,8 @@
</td>
<td valign="middle">
<template v-if="PostConfig.LineId==14||PostConfig.LineId==118">
<el-input :placeholder="$t('objFill.v101.myOrdersAllType.qingshurctmc')" v-model="dayObj.DinnerArray[1].DinnerName" class="Ht_hotelSelect">
<el-input :placeholder="$t('objFill.v101.myOrdersAllType.qingshurctmc')"
v-model="dayObj.DinnerArray[1].DinnerName" class="Ht_hotelSelect">
<el-button slot="append" icon="el-icon-search" @click="showDiningDig(dayObj.DinnerArray[1],2)">
</el-button>
</el-input>
......@@ -126,7 +127,8 @@
</td>
<td valign="middle">
<template v-if="PostConfig.LineId==14||PostConfig.LineId==118">
<el-input :placeholder="$t('objFill.v101.myOrdersAllType.qingshurctmc')" v-model="dayObj.DinnerArray[2].DinnerName" class="Ht_hotelSelect">
<el-input :placeholder="$t('objFill.v101.myOrdersAllType.qingshurctmc')"
v-model="dayObj.DinnerArray[2].DinnerName" class="Ht_hotelSelect">
<el-button slot="append" icon="el-icon-search" @click="showDiningDig(dayObj.DinnerArray[2],3)">
</el-button>
</el-input>
......@@ -142,7 +144,6 @@
</el-option>
</el-select>
</template>
<el-input type="text" v-model="dayObj.DinnerArray[2].DinnerName" class="" v-if="!dayObj.isRead&&IsDirect==0"
@change="noDirectDinnerChange(2)"></el-input>
<span class="TC-hotelName" v-if="dayObj.isRead">
......@@ -155,16 +156,36 @@
<img crossorigin="Anonymous" src="../../../assets/img/daily_hotel-1.png">
</td>
<td valign="middle" colspan="5">
<!--酒店-->
<el-select v-if="!dayObj.isRead &&IsDirect==1&&TeamType!=2" class="Ht_hotelSelect" size="mini"
v-model="HotelChooseArray" multiple :multiple-limit="(TeamType==0||TeamType==3)?3:1"
@visible-change="getHotelList($event)" @change="changeHotelList()" filterable
:placeholder="$t('pub.pleaseSel')" :disabled="IsOpenHotel==1?true:false">
<el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">
<span style="float: left">{{ getHotelItemLabel(item) }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
</el-option>
</el-select>
<!--日本线酒店-->
<template v-if="PostConfig.LineId==14||PostConfig.LineId==118">
<el-select placeholder="预定方式" v-model="hotelArray[0].HotelBookType" @change="ChangeHotelBookType"
style="width:100px;display:none;">
<el-option :value="0" :key="0" label="请选择"></el-option>
<el-option :value="1" :key="1" label="自订"></el-option>
<el-option :value="2" :key="2" label="PIC预订"></el-option>
</el-select>
<el-select v-if="!dayObj.isRead &&IsDirect==1&&TeamType!=2" class="Ht_hotelSelect" style="width:290px;"
size="mini" v-model="HotelChooseArray" multiple :multiple-limit="(TeamType==0||TeamType==3)?3:1"
@visible-change="getHotelList($event)" @change="changeHotelList()" filterable
:placeholder="$t('pub.pleaseSel')" :disabled="IsOpenHotel==1?true:false">
<el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">
<span style="float: left">{{ getHotelItemLabel(item) }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
</el-option>
</el-select>
</template>
<template v-else>
<!--酒店-->
<el-select v-if="!dayObj.isRead &&IsDirect==1&&TeamType!=2" class="Ht_hotelSelect" size="mini"
v-model="HotelChooseArray" multiple :multiple-limit="(TeamType==0||TeamType==3)?3:1"
@visible-change="getHotelList($event)" @change="changeHotelList()" filterable
:placeholder="$t('pub.pleaseSel')" :disabled="IsOpenHotel==1?true:false">
<el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">
<span style="float: left">{{ getHotelItemLabel(item) }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
</el-option>
</el-select>
</template>
<span style="color:red;font-weight:bold;" v-if="IsOpenHotel==1">※ {{$t('op.DJyiguanbi')}}</span>
<span v-if="dayObj.isRead&&IsDirect==1">
<span v-for="(item,index) in hotelArray" :key="`h_`+index">
......@@ -286,6 +307,17 @@
});
}
},
//酒店预定方式切换
ChangeHotelBookType() {
if (this.hotelArray && this.hotelArray.length > 0) {
let tempHotelBookType = this.hotelArray[0].HotelBookType;
console.log("tempHotelBookType", tempHotelBookType);
this.hotelArray.forEach(item => {
item.HotelBookType = tempHotelBookType;
});
}
console.log("this.hotelArray", this.hotelArray);
},
//酒店选择改变
changeHotelList() {
let newHotelArray = [];
......@@ -371,7 +403,7 @@
}
return returnName;
},
//判断获取的酒店会否函温泉酒店
//判断获取的酒店会否温泉酒店
getHaveHotSpringHotel() {
let isExist = false;
this.HotelChooseArray.forEach(x => {
......@@ -387,7 +419,7 @@
},
//早餐切换
changeBreakfastList(breakfastObj) {
if (breakfastObj&&breakfastObj.BreakfastUseType != 0) {
if (breakfastObj && breakfastObj.BreakfastUseType != 0) {
//获取当前选中的对象
let obj = {};
obj = this.breakFirstList.find(item => {
......@@ -594,7 +626,6 @@
value.UseDinnerType = index + 1;
});
}
},
//根据ID遍历早餐酒店名
getBreakfirst(Id) {
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @ d836e08d
......@@ -180,15 +180,6 @@
</el-select>
</el-form-item>
</span>
<!-- <span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('op.IsUpdateXCTS')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="ReturnArriveCityId">
<el-select class="w90" :placeholder="$t('pub.pleaseSel')" v-model="subConfig.IsUpdateTrip">
<el-option :label="$t('op.notUpdate')" :value="0"></el-option>
<el-option :label="$t('op.Update')" :value="1"></el-option>
</el-select>
</el-form-item>
</span> -->
<template v-if="true">
<span class="TDTextspan"
:class="{'showOther':TeamType==3}">{{$t('objFill.v101.myOrdersAllType.banxing')}}</span>
......@@ -202,7 +193,6 @@
</el-form-item>
</span>
</template>
</div>
<div class="newTravelDayContent TravelDayContentThree clearfix" style="padding-left: 0;">
<div class="vertical-line" style="left: 23px;"></div>
......@@ -245,7 +235,6 @@
@change="handlerChangeDateList" :TeamType="TeamType" :IsOpenHotel="IsOpenHotel"></travelDaysTrip>
</div>
</div>
</div>
</div>
</div>
......
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