Skip to content

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

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

parents bad9c450 91cce487
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 26 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ ddf0358d
......@@ -38,6 +38,7 @@
top: 0;
z-index: 10;
}
</style>
<template>
......@@ -67,7 +68,7 @@
&nbsp;&nbsp;{{$t('leader.leader_Guide')}}: {{GuideName}} </th>
<th class="fz14" style="border:none;">
<el-tooltip class="item" effect="dark" :content="$t('objFill.piliangscsps')" placement="top-start"
style="float:left;margin-left:20px;">
style="float:left;margin-left:20px;display:none;">
<el-popover placement="bottom" popper-class="piliangPop" width="500" trigger="click"
v-model="isShowPiliangPop">
<table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0">
......@@ -102,7 +103,7 @@
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('ground.plxgai')" placement="top-start"
style="float:left;margin-left:20px;">
style="float:left;margin-left:20px;display:none;">
<el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click"
v-model="IsShowMoreUpdate">
<table class="dmcSetTable roomReserSet roomResetTable" border="0" cellspacing="0" cellpadding="0">
......@@ -328,25 +329,30 @@
:disabled="IsEditHotelPeople==0?true:false">
</el-input>
</td>
<!-- 尚差房间数 -->
<!-- <td>
<p class="pHouseStyle"
:class="{colorRed:childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount<0}">
{{childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount}}
</p>
</td> -->
<!-- 单价/每人 -->
<td>
<template v-if="childIndex==1">
<template v-if="EditBtn||LineId==90">
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
<template v-if="(subItem.LineId==14||subItem.LineId==118)&&subItem.HotelBookType==2">
<template v-if="subItem.IsHaveHotelStock==1">
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
</template>
<template v-else>
<el-popover placement="right" width="540" trigger="click"
:ref="'elPopoverEditHotelPrice'+index+subIndex+''">
<set-hotel-stock :ref="'comSetHotelPrice'+index+subIndex+''" :UseDate="item.UseTimeStr"
:HotelId="subItem.NewHotelId" :HotelName="subItem.NewHotelName" @success="GetNewHotelPrice">
</set-hotel-stock>
<el-button size="small" type="danger" :data-index="'comSetHotelPrice'+index+subIndex+''"
slot="reference" @click="subItem.isShowHStock=true">
添加报价
</el-button>
</el-popover>
</template>
</template>
<template v-else>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
:disabled="(IsEditHotel==0||childItem.IsHaveStockPrice==1)?true:false">
</el-input>
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
</template>
</template>
<template v-else>
......@@ -642,13 +648,14 @@
<p>{{$t('active.ld_noData')}}</p>
</div>
</div>
</div>
</template>
<script>
import moment from 'moment'
import comCheckHotel from "../commonPage/comCheckHotel.vue";
import commonHotelLog from "../commonPage/commonHotelLog.vue";
import commonPHlInfo from "../commonPage/commonPriceHotelInfo.vue";
import setHotelStock from "../commonPage/setHotelStock.vue";
export default {
data() {
return {
......@@ -742,7 +749,7 @@
components: {
comCheckHotel,
commonHotelLog,
commonPHInfo: commonPHlInfo
setHotelStock,
},
methods: {
//批量修改房间数和房间人
......@@ -858,6 +865,10 @@
}
}, err => {})
},
GetNewHotelPrice(newHPObj) {
console.log("newHPObj", newHPObj);
this.getList();
},
//点击酒店选择
getChildHotel(index, subIndex) {
this.findex = index;
......@@ -1000,7 +1011,7 @@
}
}
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
console.log("dmcstatistics_get_GetHotelStaticsDetail_V2",res.data);
console.log("dmcstatistics_get_GetHotelStaticsDetail_V2", res.data);
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
if (this.IsEditHotel == 0) {
......@@ -1036,6 +1047,7 @@
subItem.ReserveNo = this.$route.query.NewCombinationNum;
}
subItem.isShowPop = false;
subItem.isShowHStock = false;
subItem.ckedHotelName = "";
//遍历手配
this.SupplierList.forEach(x => {
......@@ -1300,6 +1312,7 @@
this.getList();
}
}
</script>
<style>
.roomReservationsDetailsTalbe {
......@@ -1371,4 +1384,5 @@
.roomReservationsDetailsTalbe .hotelTable tr td {
border: none;
}
</style>
\ No newline at end of file
</style>
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ ddf0358d
......@@ -670,7 +670,7 @@
</p>
<p class="travelnowrap">
<span>{{ $t("Airticket.Air_StartTime") }}</span>
<span class="go_date">{{ item.StartDate }}</span>
<span class="go_date">{{ item.StartDate }}(<font style="color:red;">{{item.StartDateWeekStr}}</font>)</span>
<template v-if="item.RelationPriceList && item.RelationPriceList.length > 0">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop">
......
src/components/commonPage/setHotelStock.vue 0 → 100644
View file @ ddf0358d
<style>
.setHotelStock .setHotelStock {
width: 100%;
height: 150px;
overflow: auto
}
.setHotelStock .comCk_list {
padding: 0 20px;
margin: 0 15px 5px 0;
}
.setHotelStock .cm_Inventory {
margin-left: 20px;
color: red;
display: inline-block;
}
.setHotelStock .cm_hotelTitle {
width: 100%;
text-align: center;
margin-bottom: 20px;
border-bottom: 1px solid #d1d1d1;
padding: 0 20px 10px 20px;
}
.setHotelStock .com_SaveBtn {
margin: 10px 20px 0 45%;
}
.setHotelStock .ckedList {
background-color: #E95252;
color: #fff;
}
.setHotelStock .Ck_hotelInfo {
width: 100%;
height: 40px;
background-color: #F6F8FB;
text-align: center;
line-height: 40px;
margin-bottom: 10px;
}
.setHotelStock .ck_goUrl {
color: blue;
cursor: pointer;
margin-left: 10px;
}
</style>
<template>
<div class="setHotelStock">
<div class="Ck_hotelInfo">
<span style="color:red">{{HotelName}} {{UseDate}}</span> {{$t('objFill.jdkcxx')}}
</div>
<div class="cm_hotelTitle clearfix">
<el-row :gutter="24">
<el-col :span="12">
<el-input v-model="postMsg.Inventory">
<template slot="prepend">{{$t('hotel.hotel_Inventory')}}</template>
</el-input>
</el-col>
<el-col :span="12">
<el-input v-model="postMsg.CostPrice">
<template slot="prepend">{{$t('ground.biaozhunjiancb')}}</template>
</el-input>
</el-col>
</el-row>
</div>
<input type="button" class="normalBtn com_SaveBtn" @click="saveHotelStock()" :value="$t('pub.saveBtn')" />
</div>
</template>
<script>
export default {
props: ["UseDate", "HotelId", "HotelName"],
data() {
return {
postMsg: {
DayType: '4', //添加类型
Hotel: 0,
HotelName: "",
DateList: [], //选择的日期数组
Inventory: '', //库存
CostPrice: '', //成本价格(标准间)
CurrencyId: 3, //币种
}
};
},
methods: {
//保存酒店价格
saveHotelStock() {
this.apipost('dict_post_HotelOffer_SetNewHotelPrice', this.postMsg, res => {
this.saveLoading = false;
if (res.data.resultCode === 1) {
this.Success(this.$t('ground.bianjichenggong'))
this.$emit("success",this.postMsg);
} else {
this.Error(res.data.message)
}
})
},
clearMsg() {
this.postMsg.Hotel = 0;
this.postMsg.HotelName = '';
this.postMsg.DateList = [];
this.postMsg.CostPrice = "";
this.postMsg.Inventory = "";
}
},
created() {
this.clearMsg();
},
mounted() {
this.postMsg.Hotel = this.HotelId;
this.postMsg.HotelName = this.HotelName;
this.postMsg.DateList.push(this.UseDate);
}
};
</script>
src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue
View file @ ddf0358d
......@@ -158,12 +158,14 @@
<td valign="middle" colspan="5">
<!--日本线酒店-->
<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>
<template v-if="hotelArray&&hotelArray.length>0">
<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>
</template>
<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
......
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