Skip to content

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

酒店变更调整

parent 3dffe7de
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 62 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 0bdcf6a3
......@@ -815,7 +815,7 @@
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID, item.ShouPeiStatus)"></commonHotelInfo>
@SetShouPeiShu="SetShouPeiShu(item.TCID, item.ShouPeiStatus)" @success="getControlList()"></commonHotelInfo>
<span slot="reference"
style="cursor: pointer; text-decoration: underline">{{ $t("salesModule.HotelOrder") }}
<font style="color: #e95252; text-decoration: none">
......@@ -2248,6 +2248,7 @@
showCaozuoTime: true, //操作时间
caiwu: true, //显示财务单据
colspanLength: 6, //跨行
showChange:true,//显示可变更酒店
},
//更新可售机票数量
updateAirticketObj: {
......@@ -3971,6 +3972,8 @@
if (routeName == "TravelControlList2") {
this.queryMsg.TeamType = 0;
}
//测试添加
this.queryMsg.TCNUM='KIX3U07250505C';
this.getControlList();
this.getTeamList();
this.getTravelTeamList();
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 0bdcf6a3
......@@ -552,7 +552,7 @@
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)" @success="getControlList"></commonHotelInfo>
<span slot="reference"
style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}
<font style="color:#e95252;text-decoration:none;">
......@@ -1541,7 +1541,8 @@
ShowRebateRatio: false, //显示返佣比列
ShowSupplier: true, //是否显示供应商
showCaozuoTime: true, //操作时间
colspanLength: 5 //跨行
colspanLength: 6, //跨行
showChange: true, //显示可变更酒店
},
remarkMsg: {
TCID: 0,
......@@ -2787,7 +2788,8 @@
this.queryMsg.StartGroupDate = nowDate;
}
if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 &&
userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253&& userInfo.RB_Branch_id != 1216) {
userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253 && userInfo
.RB_Branch_id != 1216) {
this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
}
//默认查询全部团队状态
......
src/components/commonPage/commonHotelInfo.vue
View file @ 0bdcf6a3
......@@ -43,9 +43,7 @@
<tr>
<th width="120">{{$t('pub.date')}}</th>
<th width="150">{{$t('hotel.hotel')}}</th>
<th width="150">{{$t('salesModule.ChangeHotel')}}</th>
<th width="80" v-if="showHotelObj.showPrice">库存</th>
<th width="120">{{$t('salesModule.HotelStatus')}}</th>
<th width="120">{{$t('salesModule.OPstatus')}}</th>
<th width="120">{{$t('salesModule.DJstatus')}}</th>
......@@ -54,9 +52,9 @@
<th width="120" v-if="showHotelObj.showPay">
{{$t('fnc.fkfangshi')}}<br />{{$t('restaurant.res_commissionColumn')}}</th>
<th width="130" v-if="showHotelObj.showZhan">{{$t('salesModule.UseRoomTime')}}</th>
<th width="90" v-if="showHotelObj.showZhan">库存</th>
<th width="100" v-if="showHotelObj.showZhan">{{$t('salesModule.SureTime')}}</th>
<th width="100" v-if="showHotelObj.ShowSupplier">{{$t('hotel.hotel_Supplier')}}</th>
<!-- <th width="80" v-if="showHotelObj.caiwu">{{$t('pub.yes')}}{{$t('pub.no')}}<br />{{$t('fnc.fukuan')}}</th>-->
<th width="70" v-if="showHotelObj.showPrice">
{{$t('fnc.rizhi')}}
</th>
......@@ -64,43 +62,64 @@
<template v-for="(hotelItem,index) in HotelObj">
<tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList" :key="`h_`+index+`_h_`+hotelSubIndex">
<td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length" style="white-space:nowrap; ">
<!-- <template v-if="showHotelObj.showPrice">
<el-popover placement="right" width="320" trigger="click">
<table>
<tr>
<td>
更换酒店:
</td>
<td>
<el-select filterable remote
:remote-method="(query) => remoteSearchAdGroup(query, hotelSubItem)"
v-model='hotelSubItem.HotelId' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading"
@change="getHotel(hotelSubItem,hotelSubItem.HotelId)">
<el-option v-for="(x) in HotelList" :key="x.ID" :label="x.Name" :value='x.ID'>
<template v-if="x.Inventory>0||x.CostPrice>0">
<span style="float: left">{{ x.Name }}</span>
<span style="float: right; font-size: 13px">
<font style="color:blue">库存:{{ x.Inventory }}</font>
&nbsp;<font style="color:#67C23A">价格:{{x.CostPrice}}</font>
</span>
</template>
</el-option>
</el-select>
</td>
</tr>
<tr>
<td colspan="2" style="text-align:center;">
<el-button type="primary" size="small">保存</el-button>
</td>
</tr>
</table>
<span slot="reference"> {{hotelItem.UseDay}}&nbsp;({{getDayByDate(hotelItem.UseDay)}})</span>
</el-popover>
<template v-if="showHotelObj&&showHotelObj.showChange">
<el-tooltip class="item" effect="dark" content="点击可修改酒店信息" placement="top-start">
<el-popover placement="bottom" width="320" trigger="click">
<table>
<tr>
<td>
变更类型：
</td>
<td>
<el-select v-model="postMsg.ChangeType">
<el-option :key="1" label="同步酒店" :value='1'></el-option>
<el-option :key="2" label="下架酒店库存" :value='2'></el-option>
<el-option :key="3" label="变更酒店" :value='3'></el-option>
</el-select>
</td>
</tr>
<tr v-if="postMsg.ChangeType==1||postMsg.ChangeType==3">
<td>
更换酒店：
</td>
<td>
<el-select filterable remote
:remote-method="(query) => remoteSearchAdGroup(query, hotelSubItem)"
v-model='postMsg.NewHotelId' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading">
<el-option v-for="(x) in HotelList" :key="x.ID" :label="x.Name" :value='x.ID'>
<template v-if="x.Inventory>0||x.CostPrice>0">
<span style="float: left">{{ x.Name }}</span>
<span style="float: right; font-size:13px">
<font style="color:blue">库存/剩余:{{ x.Inventory }}&nbsp;/&nbsp;{{x.RemainingInventory}}
</font>
&nbsp;<font style="color:#67C23A">价格:{{x.CostPrice}}</font>
</span>
</template>
</el-option>
</el-select>
</td>
</tr>
<tr>
<td colspan="2">
&nbsp;
</td>
</tr>
<tr>
<td colspan="2" style="text-align:center;">
<el-button type="primary" size="small" @click="SaveHotel(hotelItem)" :loading="saveLoading">保存
</el-button>
</td>
</tr>
</table>
<span slot="reference" @click="InitData()"
style="cursor:pointer; text-decoration: underline;color:blue;">
{{hotelItem.UseDay}}&nbsp;({{getDayByDate(hotelItem.UseDay)}})</span>
</el-popover>
</el-tooltip>
</template>
<template v-else>
{{hotelItem.UseDay}}&nbsp;({{getDayByDate(hotelItem.UseDay)}})
</template> -->
{{hotelItem.UseDay}}&nbsp;({{getDayByDate(hotelItem.UseDay)}})
</template>
</td>
<td style="text-align:left;padding-left:3px;">
<template v-if="hotelSubItem.HotelName!=hotelSubItem.NewHotelName && hotelSubItem.NewHotelName!=''">
......@@ -113,13 +132,13 @@
<td style="text-align:left;padding-left:3px;color:red">
{{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
</td>
<td v-if="showHotelObj.showPrice">
总库存:{{hotelSubItem.Inventory}}
<br />
剩余:{{hotelSubItem.RemainingInventory}}
</td>
<td>
<template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
<template v-if="hotelSubItem.HotelChangeState==2">
<a style="color:#E6A23C;">酒店变更，地接确认中</a>
<el-button v-if="showHotelObj&&showHotelObj.showSureHotel" type="primary" size="small"
@click="sureHotelChange(hotelItem)" :loading="saveLoading">确认</el-button>
</template>
<template v-else-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
<a style="color:green">{{$t('salesModule.BZRZ')}}</a>
</template>
</td>
......@@ -163,15 +182,30 @@
{{hotelSubItem.CreateDateStr}}
</template>
</td>
<td v-if="showHotelObj.showPrice">
库存：{{hotelSubItem.Inventory}}
<br />
<el-popover placement="right" width="460" trigger="click">
<el-table :data="hotelSubItem.UseList">
<el-table-column width="160" property="CreateTime" label="占房时间"></el-table-column>
<el-table-column width="80" property="UseNum" label="使用数量"></el-table-column>
<el-table-column width="210" property="TCNUM" label="使用团号">
<template slot-scope="scope">
{{scope.row.TCNUM}}({{scope.row.TCID}})
<br/>
{{scope.row.DMCNum}}
</template>
</el-table-column>
</el-table>
<font slot="reference" style="color:blue;cursor:pointer;"> 剩余：{{hotelSubItem.RemainingInventory}}</font>
</el-popover>
</td>
<td v-if="showHotelObj.showZhan">
{{hotelSubItem.SureTimeStr}}
</td>
<td v-if="showHotelObj.ShowSupplier">
{{hotelSubItem.SupplierName}}
</td>
<!-- <td v-if="showHotelObj.caiwu">
{{hotelSubItem.IsPay==1?$t('pub.yes'):$t('pub.no')}}
</td> -->
<td v-if="showHotelObj.showPrice">
<el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
<commonHotelLog :ref="'comHotelLog'+index+hotelSubIndex+''"> </commonHotelLog>
......@@ -254,6 +288,13 @@
return {
loading: false,
HotelList: [],
postMsg: {
TCID: 0, //团队编号
DayNum: 0, //天数
ChangeType: 1, //变更类型(1-同步酒店，2-下架酒店库存,3-变更酒店)
NewHotelId: "", //新酒店ID
},
saveLoading: false,
};
},
components: {
......@@ -261,6 +302,73 @@
commonHotelLog
},
methods: {
//初始化参数
InitData() {
this.HotelList = [];
this.postMsg.TCID = 0;
this.postMsg.DayNum = 0;
this.postMsg.ChangeType = 1;
this.postMsg.NewHotelId = "";
},
SaveHotel(item) {
var paramObj = {
TCID: this.TCID,
DayNum: item.DayNum, //天数
ChangeType: this.postMsg.ChangeType, //变更类型(1-同步酒店，2-酒店下架，3-变更酒店)
NewHotelId: this.postMsg.NewHotelId, //新酒店ID
};
if ((paramObj.ChangeType == 1 || paramObj.ChangeType == 3) && paramObj.NewHotelId == 0) {
this.Error("请选择酒店!");
return;
}
var tipMsg = "是否要";
if (paramObj.ChangeType == 1) {
tipMsg += "【同步】";
}
if (paramObj.ChangeType == 2) {
tipMsg += "【下架】";
}
if (paramObj.ChangeType == 3) {
tipMsg += "【变更】";
}
tipMsg += "【" + item.UseDay + "】的酒店信息?";
var that = this;
that.Confirm(tipMsg, function () {
that.saveLoading = true;
that.apipost("travel_post_SetTravelHotel", paramObj, res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.InitData();
that.$emit("success");
} else {
that.Error(res.data.message);
}
that.saveLoading = false;
})
});
},
sureHotelChange(item) {
var paramObj = {
TCID: this.TCID,
DayNum: item.DayNum, //天数
};
var tipMsg = "是否要确认";
tipMsg += "【" + item.UseDay + "】的酒店变更?";
var that = this;
that.Confirm(tipMsg, function () {
that.saveLoading = true;
that.apipost("travel_post_SureTravelHotelChange", paramObj, res => {
that.saveLoading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.InitData();
that.$emit("success");
} else {
that.Error(res.data.message);
}
})
});
},
remoteSearchAdGroup(query, subItem) {
if (query !== '') {
this.loading = true;
......@@ -288,16 +396,6 @@
null
);
},
// 获取酒店名称
getHotel(subItem, HotelId) {
subItem.HotelList.forEach(x => {
if (x.ID == HotelId) {
subItem.HotelName = x.Name;
subItem.HotelCostPrice = x.CostPrice;
}
})
this.$forceUpdate()
},
//调用子组件获取日志方法
GetHotelLog(subItem, index, hotelSubIndex) {
let str = `comHotelLog${index}${hotelSubIndex}`
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 0bdcf6a3
......@@ -378,7 +378,7 @@
<el-popover width="1100" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)" @success="getList"></commonHotelInfo>
<span slot="reference" class="price"
style="cursor:pointer;text-decoration:underline;">{{$t('ground.jiudianxinxi')}}</span>
</el-popover>
......@@ -706,7 +706,8 @@
ShowSupplier: false, //是否显示供应商
caiwu: true, //操作时间
showCaozuoTime: true, //操作时间
colspanLength: 6 //跨行
colspanLength: 6, //跨行
showSureHotel:true,
},
pickerBeginDateBefore: {
disabledDate: time => {
......
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