Skip to content

S
SuperMan
Commit 98613988 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 702e1f21 1738b3ab
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 65 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 98613988
...@@ -667,8 +667,7 @@ ...@@ -667,8 +667,7 @@
</div> </div>
</el-popover> </el-popover>
</p> </p>
<p <p v-if="(item.LineID==14 ||item.LineID==118) && item.BusOrderList && item.BusOrderList.length>0 ">
v-if="(item.LineID==14 ||item.LineID==118) && item.BusOrderList && item.BusOrderList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum" <commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum"
:TCNUM="item.TCNUM"> :TCNUM="item.TCNUM">
...@@ -2144,6 +2143,7 @@ ...@@ -2144,6 +2143,7 @@
msg, msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log("admin_get_BranchGetList",res.data.data);
this.queryCommonData.BranchList = res.data.data; this.queryCommonData.BranchList = res.data.data;
this.queryCommonData.BranchList.forEach(x => { this.queryCommonData.BranchList.forEach(x => {
x.isShow = false; x.isShow = false;
...@@ -2325,7 +2325,6 @@ ...@@ -2325,7 +2325,6 @@
if (item.IsUnion == 1 && item.UnionTypeStr == 2) { if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId; cityId = item.UnionCityId;
} }
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
name: 'confirmationOrderDownLoadNew', name: 'confirmationOrderDownLoadNew',
query: { query: {
...@@ -2419,7 +2418,6 @@ ...@@ -2419,7 +2418,6 @@
}); });
} }
}, },
//当团修改 //当团修改
goTonowTeam(path, configId, tcid, TCNUM, item) { goTonowTeam(path, configId, tcid, TCNUM, item) {
if (configId > 0) { if (configId > 0) {
...@@ -2480,6 +2478,7 @@ ...@@ -2480,6 +2478,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.companyList = res.data.data; this.queryCommonData.companyList = res.data.data;
console.log("sellorder_post_GetBranchList",res.data.data);
} }
}, },
err => {} err => {}
...@@ -2824,61 +2823,108 @@ ...@@ -2824,61 +2823,108 @@
}, },
//权限验证 //权限验证
checkAuth() { checkAuth() {
var actionCode = this.$AuthCode.TeamShouZhi;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) { this.apipost('userauth_get_CheckUserAuthNewService', '', res => {
this.TeamShouZhi = true; if (res.data.resultCode == 1) {
var tempData = res.data.data;
if (tempData && tempData.length > 0) {
if (tempData.includes(this.$AuthCode.TeamShouZhi)) {
this.TeamShouZhi = true;
}
if (tempData.includes(this.$AuthCode.OutHotel)) {
this.OutHotel = true;
}
if (tempData.includes(this.$AuthCode.FenXiaoLianYun)) {
this.FenXiaoLianYun = true;
}
if (tempData.includes(this.$AuthCode.ShangChuanFenFangbiao)) {
this.ShangChuanFenFangbiao = true;
}
if (tempData.includes(this.$AuthCode.ChaKanGuest)) {
this.ChaKanGuest = true;
}
if (tempData.includes(this.$AuthCode.FenFangBiaoXiaZai)) {
this.FenFangBiaoXiaZai = true;
}
if (tempData.includes(this.$AuthCode.LookOPCommission)) {
this.LookOPCommission = true;
}
if (tempData.includes(this.$AuthCode.IsSanKeTicket)) {
this.IsSanKeTicket = true;
}
if (this.IsModifyTravelControl == 0 && tempData.includes('T_EditTravelControl')) {
this.IsModifyTravelControl = 1;
}
}
} }
}); });
// else {
// //检查分公司是否有权限
// this.CheckUserAuth("T_EditTravelControl", res => {
// if (res.data.resultCode == 1 && res.data.data == 1) {
// this.IsModifyTravelControl = 1;
// }
// });
// }
//团队收支
// var actionCode = this.$AuthCode.TeamShouZhi;
// this.CheckUserAuth(actionCode, res => {
// if (res.data.resultCode == 1 && res.data.data == 1) {
// this.TeamShouZhi = true;
// }
// });
//酒店下架 //酒店下架
var OutHotel_Code = this.$AuthCode.OutHotel; // var OutHotel_Code = this.$AuthCode.OutHotel;
this.CheckUserAuth(OutHotel_Code, res => { // this.CheckUserAuth(OutHotel_Code, res => {
if (res.data.resultCode == 1 && res.data.data == 1) { // if (res.data.resultCode == 1 && res.data.data == 1) {
this.OutHotel = true; // this.OutHotel = true;
} // }
}); // });
//分销联运 //分销联运
var FenXiaoLianYun_Code = this.$AuthCode.FenXiaoLianYun; // var FenXiaoLianYun_Code = this.$AuthCode.FenXiaoLianYun;
this.CheckUserAuth(FenXiaoLianYun_Code, res => { // this.CheckUserAuth(FenXiaoLianYun_Code, res => {
if (res.data.resultCode == 1 && res.data.data == 1) { // if (res.data.resultCode == 1 && res.data.data == 1) {
this.FenXiaoLianYun = true; // this.FenXiaoLianYun = true;
} // }
}); // });
//上传分房表 //上传分房表
var ShangChuanFenFangbiao_Code = this.$AuthCode.ShangChuanFenFangbiao; // var ShangChuanFenFangbiao_Code = this.$AuthCode.ShangChuanFenFangbiao;
this.CheckUserAuth(ShangChuanFenFangbiao_Code, res => { // this.CheckUserAuth(ShangChuanFenFangbiao_Code, res => {
if (res.data.resultCode == 1 && res.data.data == 1) { // if (res.data.resultCode == 1 && res.data.data == 1) {
this.ShangChuanFenFangbiao = true; // this.ShangChuanFenFangbiao = true;
} // }
}); // });
//查看旅客调查 //查看旅客调查
var ChaKanGuest_Code = this.$AuthCode.ChaKanGuest; // var ChaKanGuest_Code = this.$AuthCode.ChaKanGuest;
this.CheckUserAuth(ChaKanGuest_Code, res => { // this.CheckUserAuth(ChaKanGuest_Code, res => {
if (res.data.resultCode == 1 && res.data.data == 1) { // if (res.data.resultCode == 1 && res.data.data == 1) {
this.ChaKanGuest = true; // this.ChaKanGuest = true;
} // }
}); // });
//分房表下载 //分房表下载
var FenFangBiaoXiaZai_Code = this.$AuthCode.FenFangBiaoXiaZai; // var FenFangBiaoXiaZai_Code = this.$AuthCode.FenFangBiaoXiaZai;
this.CheckUserAuth(FenFangBiaoXiaZai_Code, res => { // this.CheckUserAuth(FenFangBiaoXiaZai_Code, res => {
if (res.data.resultCode == 1 && res.data.data == 1) { // if (res.data.resultCode == 1 && res.data.data == 1) {
this.FenFangBiaoXiaZai = true; // this.FenFangBiaoXiaZai = true;
} // }
}); // });
//查看OP提成 //查看OP提成
var LookOPCommission_Code = this.$AuthCode.LookOPCommission; // var LookOPCommission_Code = this.$AuthCode.LookOPCommission;
this.CheckUserAuth(LookOPCommission_Code, res => { // this.CheckUserAuth(LookOPCommission_Code, res => {
if (res.data.resultCode == 1 && res.data.data == 1) { // if (res.data.resultCode == 1 && res.data.data == 1) {
this.LookOPCommission = true; // this.LookOPCommission = true;
} // }
}); // });
//是否有散客票权限 //是否有散客票权限
var IsSanKeTicket_Code = this.$AuthCode.IsSanKeTicket; // var IsSanKeTicket_Code = this.$AuthCode.IsSanKeTicket;
this.CheckUserAuth(IsSanKeTicket_Code, res => { // this.CheckUserAuth(IsSanKeTicket_Code, res => {
if (res.data.resultCode == 1 && res.data.data == 1) { // if (res.data.resultCode == 1 && res.data.data == 1) {
this.IsSanKeTicket = true; // this.IsSanKeTicket = true;
} // }
}); // });
}, },
}, },
filters: { filters: {
...@@ -2903,14 +2949,6 @@ ...@@ -2903,14 +2949,6 @@
} }
}, },
mounted() { mounted() {
this.checkAuth();
//销售公司
this.getSellorCompany();
this.getCompanyList();
this.getLineList();
this.getAirlineList();
this.getEmployeeList();
this.getCountryCity();
this.IsModifyTravelControl = 0; this.IsModifyTravelControl = 0;
if ( if (
this.CurrentUserInfo.RB_Branch_id == 0 || this.CurrentUserInfo.RB_Branch_id == 0 ||
...@@ -2921,14 +2959,16 @@ ...@@ -2921,14 +2959,16 @@
this.CurrentUserInfo.RB_Branch_id == 1252 this.CurrentUserInfo.RB_Branch_id == 1252
) { ) {
this.IsModifyTravelControl = 1; this.IsModifyTravelControl = 1;
} else {
//检查分公司是否有权限
this.CheckUserAuth("T_EditTravelControl", res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.IsModifyTravelControl = 1;
}
});
} }
this.checkAuth();
//销售公司
this.getSellorCompany();
this.getCompanyList();
this.getLineList();
this.getAirlineList();
this.getEmployeeList();
this.getCountryCity();
}, },
created() { created() {
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
......
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