Skip to content

S
SuperMan
Commit a6ef05ae authored by zhengke's avatar zhengke
Browse files
Options

增加跳转

parent bfffc042
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 15 deletions
src/assets/css/newTravelManager.css
View file @ a6ef05ae
......@@ -1647,7 +1647,6 @@
}
.TC_Content {
width: 100%;
height:100%;
min-height: 500px;
padding:0 10px;
background-color: #fff;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ a6ef05ae
......@@ -1570,6 +1570,7 @@
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo
this.flagWangYue = this.$route.query.flag
this.$route.query.tcmun = this.$route.query.tcmun
if (this.$route.query.tcmun) {
this.queryMsg.TCNUM = this.$route.query.tcmun
}
......
src/components/busManagement/BusInfo.vue
View file @ a6ef05ae
......@@ -75,12 +75,29 @@
background-color: #e4e7ed;
color: #c0c4cc;
}
.busInfoDetailsDiv span{
display:inline-block;
margin-right: 20px;
}
.busInfoDetailsDiv p{
display:inline-block;
}
.busInfoDetailsDiv p:hover {
text-decoration: underline;
cursor: pointer;
}
</style>
<template>
<div class="flexOne busInfo">
<div class="bus_Notice">注：此处不和任何团队行程做绑定，如需下载车配表，请在车辆绑定团队以后再行下载</div>
<div style="margin-bottom:20px;">{{title}}</div>
<div style="width: 100%; overflow-x: auto;" class="ownScrollbarStyle">
<div class="busInfoDetailsDiv">
<span>进出点：{{InOut}}</span><span>订单人数：{{RealityNum}}</span>
<span>机位总数：{{totalFlySeat}}</span><span>领队：{{LeaderName}}</span><span>导游：{{GuideName}}</span>
<span>团号：<p @click="goUrlT('TravelControlList',TCNUMS,'团控列表')">{{TCNUMS}}</p></span>
</div>
<div style="width: 100%; overflow-x: auto;margin-top:20px;" class="ownScrollbarStyle">
<el-form :model="PostData" :rules="rules" ref="PostData">
<table class="bo_bus" cellspacing="1">
<tr>
......@@ -369,6 +386,16 @@ export default {
},
//团名
title:'',
//团号
TCNUMS:'',
//进出点
InOut:'',
//订单人数
RealityNum:'',
//机位总数
totalFlySeat:'',
LeaderName:'',
GuideName:'',
};
},
methods: {
......@@ -473,7 +500,9 @@ export default {
if (response.data.resultCode == 1) {
this.PlanTableData = response.data.data;
this.PlanTableData.forEach(x=>{
x.BookGroup = this.$route.query.NewCombinationNum;
if(x.BookGroup==''||x.BookGroup==null){
x.BookGroup = this.$route.query.NewCombinationNum;
}
})
}
},
......@@ -622,6 +651,16 @@ export default {
path: path
});
},
goUrlT(path, TCNUMS, title) {
this.$router.push({
name: path,
query: {
tcmun:TCNUMS,
blank: 'y',
tab: title
}
})
},
submitForm(addMsg) {
//提交创建、修改表单
let that = this;
......@@ -653,6 +692,14 @@ export default {
this.GeAccommodationTypeList();
this.BusId = this.$route.query.id;
this.title = this.$route.query.title;
this.TCNUMS = this.$route.query.TCNUMS,
this.InOut = this.$route.query.InOut,
this.RealityNum = this.$route.query.RealityNum,
this.totalFlySeat = this.$route.query.TotalNumber+'/'+this.$route.query.RealityYSeatNum+'/'+
this.$route.query.RealityESeatNum+'/'+this.$route.query.RealityFSeatNum
this.LeaderName = this.$route.query.LeaderName,
this.GuideName = this.$route.query.GuideName
if (this.BusId > 0) {
this.getData();
// this.forbidInput = true;
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ a6ef05ae
......@@ -425,10 +425,18 @@
"TCID": obj.TCIDS,
StartDate: obj.StartDateStr,
DayNum: obj.DayNum,
TotalNumber: obj.TotalSeat,
TotalNumber: obj.TotalSeat, //机位总数
RealityYSeatNum:obj.CommonReport.HouseStatistics.RealityYSeatNum,
RealityESeatNum:obj.CommonReport.HouseStatistics.RealityESeatNum,
RealityFSeatNum:obj.CommonReport.HouseStatistics.RealityFSeatNum,
LeaderName:obj.LeaderName,
GuideName:obj.GuideName,
NewCombinationNum: outItem.NewCombinationNum,
blank: 'y',
title:obj.Titles,
TCNUMS:obj.TCNUMS,
InOut:obj.InOut,
RealityNum:obj.CommonReport.HouseStatistics.RealityNum,
tab: title
}
})
......
src/components/dmc/manager/teamReimbursement.vue
View file @ a6ef05ae
......@@ -557,7 +557,7 @@
name: path,
query: {
"id": obj.TCIDs,
'num': obj.CombinationNum,
NewCombinationNum: obj.TravelPriceList[0].CombinationNum,
isUpdate: true,
blank: 'y',
tab: title
......@@ -618,6 +618,7 @@
this.queryMsg.total = res.data.data.count;
this.queryMsg.noData = !this.queryMsg.total > 0;
this.queryCommonData.dataList = res.data.data.pageData;
console.log(this.queryCommonData.dataList,'datalist');
}
},
err => {}
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ a6ef05ae
......@@ -398,9 +398,9 @@
<div class="TP_noneed">
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule" :false-label="UnCheckedVaule">支持儿童出游
</el-checkbox>
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" :false-label="UnCheckedVaule" style="display:none;">订团
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" :false-label="UnCheckedVaule">订团
</el-checkbox>
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true" style="display:none;" />
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true" />
</div>
<el-form-item prop="B2BMemberPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
......@@ -713,19 +713,28 @@
:AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds" :selectFilghtList="selectFilghtList"></TravelPriceFlightList>
</div>
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<!-- <table class="TphotelTable" border="0" cellspacing='1' v-if="returnPriceList.length>0">
<tr v-if="returnPriceList[0].PriceHotelList" v-for="item in returnPriceList[0].PriceHotelList">
<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}}</td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;【<span style="color:#E95252;">库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;
<el-checkbox v-model="item.CheckList[index].CheckStatus" @change="changeHotelStatus(item,index)"></el-checkbox>
<el-checkbox v-model="item.CheckList[index].CheckStatus" @change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
</div>
</div>
</td>
<td>
<el-select class="w180" v-model="item.NewHotelId" @visible-change="getHotelList(item,$event)" @change="changeHotelList()" filterable>
<el-option :key="0" label="请选择" :value="0"></el-option>
<el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID">
<span style="float: left">{{subItem.Name}}</span>
<span style="float: right; color:red; font-size: 13px">{{ subItem.Inventory }}</span>
</el-option>
</el-select>
</td>
</tr>
</table> -->
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
......@@ -762,8 +771,8 @@
SaleBranchIdArray: []
},
returnPriceList: this.priceList,
//选中的酒店数组
ChooseHotelArray:[],
//酒店列表
HotelList: [],
companyList: [],
offerList: [],
selectFilghtList: [],
......@@ -922,7 +931,9 @@
//是否订团，0-不订，1需要订
IsBookTeam: 0,
//是否重新生成行程数据
IsNew:false,
IsNew: false,
//选中的酒店数组
ChooseHotelArray: [],
};
}
this.returnPriceList.push(objItem);
......@@ -1351,6 +1362,53 @@
subItem.CheckStatus = false;
}
});
},
//获取选择的酒店
changeHotelList() {
this.priceData.ChooseHotelArray = [];
if (this.priceData.PriceHotelList != null && this.priceData.PriceHotelList.length > 0) {
this.priceData.PriceHotelList.forEach(x => {
var obj = {
HotelId: 0,
DayNum: 0
}
if (x.NewHotelId > 0) {
obj.HotelId = x.NewHotelId;
obj.DayNum = x.DayNum;
this.priceData.ChooseHotelArray.push(obj);
} else {
x.CheckList.forEach((y, index) => {
if (y.CheckStatus) {
obj.HotelId = x.SubList[index].HotelId;
obj.DayNum = x.SubList[index].DayNum
this.priceData.ChooseHotelArray.push(obj);
}
})
}
});
if (this.priceData.ChooseHotelArray != null && this.priceData.ChooseHotelArray.length > 0) {
this.priceData.IsNew = true;
}
}
},
//获取酒店信息
getHotelList(item, event) {
if (event) {
var msg = {
Country: 651,
sDate: item.UseDay,
IsMoreThanZero:1
};
this.apipost(
"hotel_post_GetHasStockHotelList", msg,
res => {
if (res.data.resultCode == 1) {
item.HotelList = res.data.data;
}
},
err => {}
);
}
}
},
mounted() {
......@@ -1417,4 +1475,4 @@
}
};
</script>
</script>
\ No newline at end of file
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