Skip to content

S
SuperMan
Commit 6daee18f authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents b2259b4a 9eb5e3f2
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 46 deletions
src/components/TravelManager/Ticket/TravelMyTicket.vue
View file @ 6daee18f
...@@ -656,6 +656,16 @@ ...@@ -656,6 +656,16 @@
<div class="flexOne TravelMyTicket"> <div class="flexOne TravelMyTicket">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li>
<span class="hotel_name">
<em>航空公司</em>
<el-select v-model="Query.AirLineID" filterable :placeholder="$t('system.ph_in')" class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
<el-option v-for="item in AirLineList" :label='item.AlName' :value='item.AirLineId' :key='item.AirLineId'>
</el-option>
</el-select>
</span>
</li>
<li> <li>
<span class="hotel_name"> <span class="hotel_name">
<em>起飞时间</em> <em>起飞时间</em>
...@@ -667,10 +677,38 @@ ...@@ -667,10 +677,38 @@
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
<li>
<span class="hotel_name">
<em>航班号</em>
<el-input v-model="Query.Flight_number" type="text" @keyup.native.enter="getList" placeholder="请输入航班号">
</el-input>
</span>
</li>
<li> <li>
<span> <span>
<em>机票编号</em> <em>机票编号</em>
<el-input v-model="Query.AirticketId" placeholder="机票编号" @keyup.native="checkInteger(Query,'AirticketId')"></el-input> <el-input v-model="Query.AirticketId" placeholder="机票编号" @keyup.native="checkInteger(Query,'AirticketId')">
</el-input>
</span>
</li>
<li>
<span>
<em>票务</em>
<el-select v-model="Query.TicketCreateBy" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>是否绑定</em>
<el-select v-model="Query.IsBind" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
<el-option label="已绑定" :value="1" :key="1"></el-option>
<el-option label="未绑定" :value="2" :key="2"></el-option>
</el-select>
</span> </span>
</li> </li>
<li> <li>
...@@ -884,7 +922,15 @@ ...@@ -884,7 +922,15 @@
StartNum: "", StartNum: "",
EndNum: "", EndNum: "",
//机票编号 //机票编号
AirticketId: "" AirticketId: "",
//票务
TicketCreateBy: 0,
//航空公司编号
AirLineID: 0,
//航班号
Flight_number: "",
//是否绑定团期
IsBind: 0,
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -919,8 +965,8 @@ ...@@ -919,8 +965,8 @@
dataList: [], dataList: [],
//航班详情 //航班详情
tripDetails: [], tripDetails: [],
//城市列表 //航空公司
CityList: [], AirLineList: [],
//隐藏显示转让机位数div //隐藏显示转让机位数div
isShowSet: false, isShowSet: false,
//员工列表 //员工列表
...@@ -966,19 +1012,7 @@ ...@@ -966,19 +1012,7 @@
this.Query.pageIndex = 1; this.Query.pageIndex = 1;
this.currentPage = 1; this.currentPage = 1;
}, },
//初始化城市
initCity() {
this.apipost(
"dict_post_Destination_GetCityList",
this.Query,
res => {
if (res.data.resultCode == 1) {
this.CityList = res.data.data;
}
},
err => {}
);
},
//转出按钮点击事件 //转出按钮点击事件
outBtn(item) { outBtn(item) {
this.isShowSet = true; this.isShowSet = true;
...@@ -1048,7 +1082,19 @@ ...@@ -1048,7 +1082,19 @@
}, },
err => {} err => {}
); );
} },
//初始化航空公司下拉
initAirline() {
this.apipost(
"airline_post_GetList", {},
res => {
if (res.data.resultCode == 1) {
this.AirLineList = res.data.data;
}
},
err => {}
);
},
}, },
mounted() { mounted() {
let myDate = new Date(); let myDate = new Date();
...@@ -1058,8 +1104,8 @@ ...@@ -1058,8 +1104,8 @@
parseInt(myDate.getMonth() + 1) + parseInt(myDate.getMonth() + 1) +
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.Query.QFlightDateStart=nowDate; this.Query.QFlightDateStart = nowDate;
this.initCity(); this.initAirline();
this.getList(); this.getList();
this.getEmployeeList(); this.getEmployeeList();
} }
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 6daee18f
...@@ -673,6 +673,16 @@ ...@@ -673,6 +673,16 @@
<el-input v-model="Query.ID" placeholder="机票编号" @keyup.native="checkInteger(Query,'ID')"></el-input> <el-input v-model="Query.ID" placeholder="机票编号" @keyup.native="checkInteger(Query,'ID')"></el-input>
</span> </span>
</li> </li>
<li>
<span>
<em>操作人</em>
<el-select v-model="Query.CreateBy" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li> <li>
<button class="hollowFixedBtn" type="button" <button class="hollowFixedBtn" type="button"
@click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button> @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
...@@ -905,7 +915,9 @@ ...@@ -905,7 +915,9 @@
//机票编号 //机票编号
ID: "", ID: "",
//PNR //PNR
PNR:"" PNR: "",
//票务人员
CreateBy: 0,
}, },
//线路列表 //线路列表
LineList: [], LineList: [],
...@@ -931,6 +943,8 @@ ...@@ -931,6 +943,8 @@
AirticketId: 0, AirticketId: 0,
TotalNum: 0 TotalNum: 0
}, },
//员工列表
EmployeeList: [],
//绑定框提示 //绑定框提示
UseNum_placeholder: "", UseNum_placeholder: "",
pickerBeginDateBefore: { pickerBeginDateBefore: {
...@@ -1048,9 +1062,30 @@ ...@@ -1048,9 +1062,30 @@
err => {} err => {}
); );
} }
} },
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
IsLeave: '0'
}
this.apipost(
'admin_get_EmployeeGetList', {},
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data
}
},
err => {}
)
},
}, },
mounted() { mounted() {
this.getEmployeeList();
this.GetLineList(); this.GetLineList();
this.initAirline(); this.initAirline();
this.getList(); this.getList();
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 6daee18f
...@@ -373,7 +373,10 @@ ...@@ -373,7 +373,10 @@
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}"> :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent TC_teamName"> <div class="TC_remarkContent TC_teamName">
<div class="clearfix"> <div class="clearfix">
<div class="TCL_remarkTitle" style="width:105px;"><span style="font-weight: 100;cursor:pointer;" v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span> {{$t('Operation.Op_TeamName')}}：</div> <div class="TCL_remarkTitle" style="width:105px;"><span style="font-weight: 100;cursor:pointer;"
v-if="item.ScoreNum >= 0"
@click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span>
{{$t('Operation.Op_TeamName')}}：</div>
<div class="TCL_Content" style="width:90%">{{item.Title}}</div> <div class="TCL_Content" style="width:90%">{{item.Title}}</div>
</div> </div>
</div> </div>
...@@ -491,11 +494,9 @@ ...@@ -491,11 +494,9 @@
</p> </p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM" @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<span slot="reference" class="price" <span slot="reference" class="price"
style="cursor:pointer;text-decoration:underline;">酒店预订状况</span> style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover> </el-popover>
...@@ -726,8 +727,7 @@ ...@@ -726,8 +727,7 @@
<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary" <el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary"
style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}} style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}}
</el-button> </el-button>
<!-- v-if="CurrentUserInfo.RB_Branch_id==0||CurrentUserInfo.RB_Branch_id==1216||CurrentUserInfo.RB_Branch_id==49"--> <el-dropdown trigger="click" style="margin-bottom:5px;" v-if="IsModifyTravelControl==1">
<el-dropdown trigger="click" style="margin-bottom:5px;">
<span class="el-dropdown-link">{{$t('pub.updateMsg')}} <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
...@@ -792,10 +792,11 @@ ...@@ -792,10 +792,11 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native='ShowUploadWord(item)'>{{$t('Operation.Op_wordTrip')}} <el-dropdown-item @click.native='ShowUploadWord(item)'>{{$t('Operation.Op_wordTrip')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item > <el-dropdown-item>
<div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>查看旅客调查</div> <div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>查看旅客调查
</div>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -1066,14 +1067,15 @@ ...@@ -1066,14 +1067,15 @@
], ],
//当前登录用户信息 //当前登录用户信息
CurrentUserInfo: {}, CurrentUserInfo: {},
showHotelObj:{ showHotelObj: {
showPrice:true, showPrice: true,
showPay:true, showPay: true,
showZhan:true, showZhan: true,
showBtnList: true, showBtnList: true,
showCaozuoTime: true, showCaozuoTime: true,
isFromTCList:true isFromTCList: true
}, },
IsModifyTravelControl: 0, //分公司是否有修改团控权限
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
if (this.queryMsg.EndGroupDate == null) { if (this.queryMsg.EndGroupDate == null) {
...@@ -1108,14 +1110,12 @@ ...@@ -1108,14 +1110,12 @@
}); });
}, },
//更新手配书状态 //更新手配书状态
SetShouPeiShu(TCID,ShouPeiStatus) SetShouPeiShu(TCID, ShouPeiStatus) {
{ var msg = {
var msg= TCID: TCID,
{ ShouPeiStatus: (ShouPeiStatus == 0 ? 1 : 0)
TCID:TCID,
ShouPeiStatus:(ShouPeiStatus==0?1:0)
}; };
this.apipost('dmcstatistics_post_SetPriceShouPeiShuService', msg, res => { this.apipost('dmcstatistics_post_SetPriceShouPeiShuService', msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message); this.$message.success(res.data.message);
this.getList(); this.getList();
...@@ -1869,6 +1869,18 @@ ...@@ -1869,6 +1869,18 @@
if (this.$route.query.IsUnionCked) { if (this.$route.query.IsUnionCked) {
this.queryMsg.IsShowUnion = this.$route.query.IsUnionCked; this.queryMsg.IsShowUnion = this.$route.query.IsUnionCked;
} }
if (this.CurrentUserInfo.RB_Branch_id == 0 || this.CurrentUserInfo.RB_Branch_id == 1216 || this.CurrentUserInfo
.RB_Branch_id == 49) {
this.IsModifyTravelControl = 1;
} else {
//检查分公司是否有权限
if (("," + this.CurrentUserInfo.ActionMenuCode + ",").indexOf("T_EditTravelControl") > -1) {
this.IsModifyTravelControl = 1;
} else {
this.IsModifyTravelControl = 0;
}
}
if (this.CurrentUserInfo.IsParentCompany == undefined) { if (this.CurrentUserInfo.IsParentCompany == undefined) {
this.queryCommonData.IsParentCompany = 2 this.queryCommonData.IsParentCompany = 2
...@@ -1890,7 +1902,7 @@ ...@@ -1890,7 +1902,7 @@
if (!this.$route.query.tcmun) { if (!this.$route.query.tcmun) {
this.queryMsg.StartGroupDate = nowDate this.queryMsg.StartGroupDate = nowDate
} }
if (this.queryCommonData.IsParentCompany != 1 && this.CurrentUserInfo.RB_Branch_id!=49) { if (this.queryCommonData.IsParentCompany != 1 && this.CurrentUserInfo.RB_Branch_id != 49) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id) this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
} }
this.getControlList(); this.getControlList();
......
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