Skip to content

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

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

parents 1c7510c0 5f713436
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 85 deletions
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ d87a823b
......@@ -185,34 +185,10 @@
</el-select>
</span>
</li>
<li v-if="ActionMenuCode.indexOf('ThirdHotelOrder')!=-1">
<span>
<em>{{$t('sm.company')}}</em>
<el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')"
@change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Department_Id = 0,msg.CreateBy = 0">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList' :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li v-if="ActionMenuCode.indexOf('ThirdHotelOrder')!=-1">
<span>
<em>{{$t('admin.admin_Department')}}</em>
<el-select v-model="msg.RB_Department_Id" :placeholder="$t('rule.qxzbmen')"
@change="employeeMsg.DepartmentId = msg.RB_Department_Id,employeeMsg.BranchId=msg.RB_Branch_Id, getEmployee(), msg.CreateBy=0">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList' :label='item.DepartmentName' :value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</span>
</li>
<!--v-if="ActionMenuCode.indexOf('ThirdHotelOrder')!=-1"-->
<li>
<span>
<em>{{$t('active.cl_addPp')}}</em>
<el-select filterable v-model='msg.CreateBy' clearable>
<el-select filterable v-model='msg.CreateBy' clearable :disabled="!isHaveThirdHotelOrderAuth">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:key='item.EmployeeId'>
......@@ -367,7 +343,7 @@
<td>{{item.DiscountMoney}}</td>
<td>{{item.DueinMoney}}</td>
<td>
<span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span>
<span :class="item.OrderStatus==2?'color_red_order':''">{{item.OrderStateStr}}</span>
</td>
<td style="text-align:left;padding:3px;">
{{item.HotelName}}({{item.HotelCode}}) <br />
......@@ -444,8 +420,8 @@
</el-tooltip>
<!--取消道旅订单(Source=4，道旅订单；OrderStatus=1或5 待支付，已支付)-->
<el-tooltip class="item" effect="dark" :content="$t('sm.exitOrder')" placement="top-start">
<el-button v-if="item.Source==4&&(item.OrderStatus==1||item.OrderStatus==5)" type="info"
icon="iconfont icon-quxiao1" @click="cancelDiDaorder(item)"></el-button>
<el-button v-if="checkCancelAuth(item)" type="info" icon="iconfont icon-quxiao1"
@click="cancelDiDaorder(item)"></el-button>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" :content="$t('pub.sureBtn')" placement="top-start">
<el-button type="success" icon="iconfont icon-duigou" v-if="item.IsCanClear == 0"
......@@ -466,10 +442,10 @@
</el-button>
</el-tooltip>
<!--修改成本价-->
<el-tooltip v-if="EmployeeId==380||EmployeeId==46||EmployeeId==1||EmployeeId==5" class="item"
<!-- <el-tooltip v-if="EmployeeId==380||EmployeeId==46||EmployeeId==1||EmployeeId==5" class="item"
effect="dark" :content="$t('op.UpdateCBJ')" placement="top-start">
<el-button type="success" icon="iconfont icon-Edit" @click="getThisMsg(item)"></el-button>
</el-tooltip>
</el-tooltip> -->
</el-button-group>
</el-row>
</td>
......@@ -598,8 +574,6 @@
},
data() {
return {
//当前登录用户功能权限
ActionMenuCode: "",
msg: {
pageIndex: 1,
pageSize: 10,
......@@ -683,17 +657,6 @@
Id: 3
}],
dataList: [],
getCompanyMsg: { // 公司
RB_Group_Id: '0',
Status: '0',
},
getDepartmentMsg: { // 部门
RB_Group_Id: '',
RB_Branch_Id: '',
Status: 0,
ParentId: -1,
Tier: 0,
},
employeeMsg: { // 员工
GroupId: '',
BranchId: -1,
......@@ -701,8 +664,6 @@
PostId: 0,
IsLeave: 0,
},
CompanyList: [],
DepartmentList: [],
EmployeeList: [],
//统计快
TotalMsg: [],
......@@ -711,10 +672,22 @@
loading2: false,
dialogFormVisible: false,
//员工ID
EmployeeId: ''
currentUserInfo: {},
isHaveThirdHotelOrderAuth: false,
};
},
methods: {
//检查取消订单权限
checkCancelAuth(item) {
var logStr = "Source:" + item.Source + " OrderStatus:" + item.OrderStatus + " isHaveThirdHotelOrderAuth:" +
this.isHaveThirdHotelOrderAuth + " CreateBy:" + item.CreateBy + " EmployeeId:" + this.currentUserInfo
.EmployeeId;
var flag = item.Source == 4 && (item.OrderStatus == 1 || item.OrderStatus == 5) && (this
.isHaveThirdHotelOrderAuth ||
item.CreateBy == this.currentUserInfo.EmployeeId)
console.log("checkCancelAuth", logStr, flag);
return flag;
},
GetSupperOrderEditAuth() {
var actionCode = this.$AuthCode.isQueryHistoryData;
this.CheckUserAuth(actionCode, res => {
......@@ -825,9 +798,7 @@
});
},
querenDidaCancelOrder() {
let userInfo = this.getLocalStorage();
let EmployeeId = userInfo.EmployeeId;
this.didaCancelOrderMsg.CancelBy = EmployeeId;
this.didaCancelOrderMsg.CancelBy = this.currentUserInfo.EmployeeId;
this.didaCancelOrderMsg.CancelType = 2;
this.$confirm(this.$t('objFill.v101.querqxdid'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
......@@ -863,8 +834,8 @@
}
})
},
//获取第三方酒店订单列表
getList() {
//获取现有线路列表
this.loading = true;
this.apipost(
"sellorder_post_GetAllJapanHotelOrderList",
......@@ -874,10 +845,9 @@
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
let userInfo = this.getLocalStorage();
let EmployeeId = userInfo.EmployeeId;
let EmployeeId = this.currentUserInfo.EmployeeId;
this.dataList.forEach(x => {
if ((x.CreateBy == EmployeeId || EmployeeId == 1 || EmployeeId == 5) && x.IsCanOrder == 0) {
if ((x.CreateBy == EmployeeId || EmployeeId == 1 || EmployeeId == 5)) {
x.ShowBtn = true;
} else {
x.ShowBtn = false;
......@@ -913,20 +883,7 @@
this.msg.pageIndex = 1;
this.currentPage = 1
},
getCompanyList: function () { //获取公司列表
this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
} else {}
}, err => {})
},
getDepartment: function () { //获取部门列表
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
if (res.data.resultCode == 1) {
this.DepartmentList = res.data.data;
}
}, err => {})
},
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if (res.data.resultCode == 1) {
......@@ -936,11 +893,9 @@
},
//点击取消操作
cancelHTorder(ThirdOrderNo) {
let userInfo = this.getLocalStorage();
let EmployeeId = userInfo.EmployeeId;
let msg = {
bookingNumber: ThirdOrderNo,
CancelBy: EmployeeId,
CancelBy: this.currentUserInfo.EmployeeId,
CancelType: 1
}
this.apipost(
......@@ -959,11 +914,9 @@
},
//点击取消道旅操作
cancelDiDaorder(item) {
let userInfo = this.getLocalStorage();
let EmployeeId = userInfo.EmployeeId;
let msg = {
BookingID: item.ThirdOrderNo,
CancelBy: EmployeeId,
CancelBy: this.currentUserInfo.EmployeeId,
CancelType: 1
}
this.apipost(
......@@ -1022,20 +975,20 @@
if (this.$route.query.teamTCID) {
this.msg.HotelName = this.$route.query.teamTCID;
}
let userInfo = this.getLocalStorage();
this.ActionMenuCode = userInfo.ActionMenuCode;
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.getDepartmentMsg.RB_Branch_Id = userInfo.RB_Branch_id; //公司
this.EmployeeId = userInfo.EmployeeId //员工
if (this.ActionMenuCode.indexOf('ThirdHotelOrder') == -1) {
this.msg.CreateBy = userInfo.EmployeeId;
this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
this.msg.RB_Department_Id = userInfo.RB_Department_Id;
this.currentUserInfo = this.getLocalStorage();
var ActionMenuCode = "ThirdHotelOrder";
if (this.currentUserInfo && this.currentUserInfo.ActionMenu && this.currentUserInfo.ActionMenu.length > 0) {
this.currentUserInfo.ActionMenu.forEach(item => {
if (item.ActionCode == ActionMenuCode) {
this.isHaveThirdHotelOrderAuth = true;
}
})
}
if (!this.isHaveThirdHotelOrderAuth) {
this.msg.CreateBy = this.currentUserInfo.EmployeeId;
}
this.getCompanyList()
this.getThirdOrderSourceEnumEnumList();
this.getDepartment()
this.getEmployee()
this.getEmployee();
this.getList();
this.getTotalCount();
}
......
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