Skip to content

S
SuperMan
Commit 4d5e2cd3 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents d3fc405a 214c1cde
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 130 deletions
src/components/FinancialModule/OpCommission/OPCommissionDetail.vue
View file @ 4d5e2cd3
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
<th>公司</th> <th>公司</th>
<th>部门</th> <th>部门</th>
<th>员工姓名</th> <th>员工姓名</th>
<th>人数</th> <th>负责团数</th>
<th>额外奖励</th> <th>额外奖励</th>
<th>总提成</th> <th>总提成</th>
<th>出团公司提成</th> <th>出团公司提成</th>
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.PeroidsList = res.data.data; this.PeroidsList = res.data.data;
if(!this.$route.query.PeriodId){ if(!this.$route.query.PeriodId){
this.msg.PeriodId = this.PeroidsList[0].Id this.msg.PeriodsId = this.PeroidsList[0].Id
} }
this.getList() this.getList()
} else { } else {
......
src/components/FinancialModule/OpCommission/OpComPersonDetails.vue
View file @ 4d5e2cd3
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<ul class="opUl"> <ul class="opUl">
<li> <li>
<em>出团公司</em> <em>出团公司</em>
<el-select filterable v-model='msg.OutBranchId' <el-select filterable v-model='msg.RB_Branch_Id'
@change='handleCurrentChange(1)'> @change='handleCurrentChange(1)'>
<el-option label="不限" :value="-1" :key="-1"></el-option> <el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option <el-option
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</li> </li>
<li> <li>
<em>期数</em> <em>期数</em>
<el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)" filterable> <el-select v-model="msg.PeriodsId" size="mini" @change="handleCurrentChange(1)" filterable>
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in PeroidsList" :key="item.index" :label="item.Periods" <el-option v-for="(item,index) in PeroidsList" :key="item.index" :label="item.Periods"
:value="item.ID"></el-option> :value="item.ID"></el-option>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</li> </li>
<li> <li>
<em>所属公司</em> <em>所属公司</em>
<el-select filterable v-model='msg.RB_Branch_Id' <el-select filterable v-model='msg.EmBranchId'
@change='getDepartment();handleCurrentChange(1)' :disabled="disabled"> @change='getDepartment();handleCurrentChange(1)' :disabled="disabled">
<el-option label="不限" :value="-1" :key="-1"></el-option> <el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option <el-option
...@@ -149,6 +149,7 @@ ...@@ -149,6 +149,7 @@
<tr> <tr>
<th style="width: 100px;">出团公司</th> <th style="width: 100px;">出团公司</th>
<th style="width: 80px;">类型</th> <th style="width: 80px;">类型</th>
<th style="width: 150px;">团/订单ID</th>
<th style="width: 150px;">团号</th> <th style="width: 150px;">团号</th>
<th style="width: 100px;">所属公司</th> <th style="width: 100px;">所属公司</th>
...@@ -168,7 +169,11 @@ ...@@ -168,7 +169,11 @@
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<td>{{item.OutBranchName?item.OutBranchName:'-'}}</td> <td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
<td>{{item.OrderTypeName}}</td> <td>{{item.OrderTypeName}}</td>
<td><span class="cursor-p" :style="{'color': !disabled?'#409EFF':''}" v-if="item.TCNUM" @click="!disabled?goTuanDetails(item):''">{{item.TCNUM}}({{item.TCID}})</span></td> <td>
<span class="cursor-p" :style="{'color': !disabled?'#409EFF':''}" @click="clickUrl(item)">{{item.TCID}}</span>
</td>
<td><span class="cursor-p" :style="{'color': !disabled?'#409EFF':''}" v-if="item.TCNUM"
@click="!disabled?goTuanDetails(item):''">{{item.TCNUM}}</span></td>
<td>{{item.BranchName?item.BranchName:'-'}}</td> <td>{{item.BranchName?item.BranchName:'-'}}</td>
<td>{{item.DeptName?item.DeptName:'-'}}</td> <td>{{item.DeptName?item.DeptName:'-'}}</td>
<td>{{item.UserName}}</td> <td>{{item.UserName}}</td>
...@@ -206,14 +211,13 @@ ...@@ -206,14 +211,13 @@
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
EmployeeId: -1, EmployeeId: -1,
PeriodId: -1, PeriodsId: -1,
OrderId:'',
OrderType: -1, OrderType: -1,
Way: -1, Way: -1,
TCNUM: '', TCNUM: '',
RB_Department_Id: -1,//部门ID RB_Department_Id: -1,//部门ID
RB_Branch_Id: -1,//公司ID EmBranchId: -1,//公司ID
OutBranchId: -1,//出团公司ID RB_Branch_Id: -1,//出团公司ID
}, },
loading: false, loading: false,
//数据源 //数据源
...@@ -226,9 +230,9 @@ ...@@ -226,9 +230,9 @@
TotalNum: 0, TotalNum: 0,
disabled: true, disabled: true,
WayTypeList:[ WayTypeList:[
{name:'不限',Id:'-1'}, {Name:'不限',Id:'-1'},
{name:'人头奖励',Id:'1'}, {Name:'人头奖励',Id:'1'},
{name:'利润比例',Id:'2'} {Name:'利润比例',Id:'2'}
], ],
titleList:[ titleList:[
{name:'不限',id:'-1'}, {name:'不限',id:'-1'},
...@@ -281,17 +285,16 @@ ...@@ -281,17 +285,16 @@
} }
} }
this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1 this.msg.PeriodsId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):-1
this.msg.OrderId = this.$route.query.OrderId?this.$route.query.OrderId:'' this.msg.RB_Branch_Id = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1 this.msg.EmBranchId = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):Number(userInfo.RB_Branch_id)
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1
||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1 ||ActionMenuCode.indexOf('S_CheckAllOrder')!=-1
||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限 ||ActionMenuCode.indexOf('F_Query_AllIncomPay')!=-1) {//是否有看所有人的权限
this.disabled = false; this.disabled = false;
this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1 this.msg.RB_Branch_Id = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):-1 this.msg.EmBranchId = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):-1
// this.msg.RB_Department_Id = -1 // this.msg.RB_Department_Id = -1
this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):-1 this.msg.EmployeeId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
}else{ }else{
...@@ -301,7 +304,7 @@ ...@@ -301,7 +304,7 @@
}, },
methods: { methods: {
GetOrderTypeEnumList() { GetOrderTypeEnumList() {
this.apipost("CarSingle_post_GetOrderTypeEnumList", {}, (res) => { this.apipost("opcommission_GetOrderTypeEnumList", {}, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.OrderTypeList = res.data.data; this.OrderTypeList = res.data.data;
} else { } else {
...@@ -325,112 +328,94 @@ ...@@ -325,112 +328,94 @@
},err=>{}) },err=>{})
}, },
goTuanDetails(row) { goTuanDetails(row) {
let name = '' let name = ''
if (row.IsOneDayOrder == 1) { // if (row.IsOneDayOrder == 1) {
name = 'groupTourOrderByTuanOne' // name = 'groupTourOrderByTuanOne'
} else { // } else {
name = 'groupTourOrderByTuan' // name = 'groupTourOrderByTuan'
} // }
this.$router.push({ if (row.TravelType == 0) {//正常团
name: name, name = 'TravelControlList'
query: { }else if (row.TravelType == 2) {//当地团
id: row.TCID, name = 'oneDayTrip'
tcmun: row.TCNUM, } else {//小包团
blank: "y", name = 'TravelControlListSale'
} }
}); this.$router.push({
}, name: name,
clickUrl(row,type){ query: {
let data = [{ id: row.TCID,
path: "", tcmun: row.TCNUM,
OrderId: row.OrderId, blank: "y",
Type: '', }
PeriodId: this.msg.PeriodId });
}] },
let href clickUrl(row){
let url = this.domainManager().crmRoutingUrl;
if (row.OrderType == 1) {
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
data[0].path = 'myCustomerOrderAllType'
} else {
data[0].path = 'customerOrderAllType'
}
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href);
} else {
let name = '' let name = ''
if (row.OrderType == 6) { if (row.OrderType == 5) {//签证
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) { if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
name = 'VisaProductEditOrder'
} else {
name = 'VisaProductEditOrderOP' name = 'VisaProductEditOrderOP'
} else {
name = 'VisaProductEditOrder'
} }
this.$router.push({ this.$router.push({
name: name, name: name,
}); });
} else if (row.OrderType == 2) { //跟团 一日游 } else if (row.OrderType == 1||row.OrderType == 6) { //跟团 一日游 团签
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) { if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
if (row.TravelType == 1) {
name = 'groupTourOrder'
} else {
name = 'groupTourOrderOne'
}
} else {
name = 'enrollTotal' name = 'enrollTotal'
}else{
if (row.TravelType == 0) {//正规团
name = 'TravelControlList'
}else if (row.TravelType == 2) {//当地游
name = 'oneDayTrip'
}else if (row.TravelType == 1) {//小包团
name = 'TravelControlListSale'
}
} }
} else if (row.OrderType == 3) { //酒店 } else if (row.OrderType == 2) { //酒店
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) { if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
name = 'singleProductHotelOrder'
} else {
name = 'singleProductHotelOrderOP' name = 'singleProductHotelOrderOP'
}
} else if (row.OrderType == 4) { //门票
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) {
name = 'SingleticketOrderList'
} else { } else {
name = 'singleProductHotelOrder'
}
} else if (row.OrderType == 3) { //门票
if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
name = 'SingleticketOrderListOP' name = 'SingleticketOrderListOP'
} else {
name = 'SingleticketOrderList'
} }
} else if (row.OrderType == 5) { //包车 } else if (row.OrderType == 4) { //包车
if(row.CarType==''||row.CarType==null){ if(row.CarType==''||row.CarType==null){
this.GetAdminCarOrderPageList(row,url,href,data) this.GetAdminCarOrderPageList(row,url,href,data)
}else{ }else{
if(!this.S_CheckBranchOrder && !this.S_CheckAllOrder){ if(!this.S_CheckBranchOrder || !this.S_CheckAllOrder){
name = 'CharterOrderList' name = 'CharterOrderListOP'
}else{ }else{
name= 'CharterOrderListOP' name= 'CharterOrderList'
} }
data[0].Type = row.CarType==null||!row.CarType?4:row.CarType data[0].Type = row.CarType==null||!row.CarType?4:row.CarType
} }
} else if (row.OrderType == 7) { //jalan酒店
this.$message.info('jalan酒店暂不支持查看')
// if(!this.S_CheckBranchOrder && !this.S_CheckAllOrder){
// name = 'CharterOrderList'
// }else{
// name = 'CharterOrderListOP'
// }
} }
if (name) { if (name) {
this.$router.push({ this.$router.push({
name: name, name: name,
query: { query: {
OrderId: row.OrderId, OrderId: row.TCID,
PeriodId: this.msg.PeriodId, tcmun: row.TCNUM,
PeriodId: this.msg.PeriodsId,
blank: "y", blank: "y",
} }
}); });
} }
}
}, },
GetAdminCarOrderPageList(row, url, href, data) { GetAdminCarOrderPageList(row, url, href, data) {
let msg = { let msg = {
pageIndex: 1, pageIndex: 1,
pageSize: 5, pageSize: 5,
OrderType: '', OrderType: '',
OrderId: row.OrderId, OrderId: row.TCID,
OrderNo: '', OrderNo: '',
SurName: '', SurName: '',
Name: '', Name: '',
...@@ -452,15 +437,15 @@ ...@@ -452,15 +437,15 @@
if (pageData && pageData.length > 0) { if (pageData && pageData.length > 0) {
OrderType = pageData[0].OrderType OrderType = pageData[0].OrderType
} }
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) { if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
name = 'CharterOrderList'
} else {
name = 'CharterOrderListOP' name = 'CharterOrderListOP'
} else {
name = 'CharterOrderList'
} }
this.$router.push({ this.$router.push({
name: name, name: name,
query: { query: {
OrderId: row.OrderId, OrderId: row.TCID,
OrderType: OrderType ? OrderType : 4, OrderType: OrderType ? OrderType : 4,
blank: "y", blank: "y",
} }
...@@ -490,7 +475,7 @@ ...@@ -490,7 +475,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.PeroidsList = res.data.data; this.PeroidsList = res.data.data;
if(!this.$route.query.PeriodId){ if(!this.$route.query.PeriodId){
this.msg.PeriodId = this.PeroidsList[0].Id this.msg.PeriodsId = this.PeroidsList[0].Id
} }
this.getList() this.getList()
} else { } else {
......
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ 4d5e2cd3
...@@ -347,10 +347,10 @@ ...@@ -347,10 +347,10 @@
if (row.OrderType == 1) { if (row.OrderType == 1) {
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) { if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
data[0].path = 'myCustomerOrderAllType'
} else {
data[0].path = 'customerOrderAllType' data[0].path = 'customerOrderAllType'
} else {
data[0].path = 'myCustomerOrderAllType'
} }
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data) href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href); window.open(href);
...@@ -358,50 +358,50 @@ ...@@ -358,50 +358,50 @@
} else { } else {
let name = '' let name = ''
if (row.OrderType == 6) { if (row.OrderType == 6) {
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) { if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
name = 'VisaProductEditOrder'
} else {
name = 'VisaProductEditOrderOP' name = 'VisaProductEditOrderOP'
} else {
name = 'VisaProductEditOrder'
} }
this.$router.push({ this.$router.push({
name: name, name: name,
}); });
} else if (row.OrderType == 2) { //跟团 一日游 } else if (row.OrderType == 2) { //跟团 一日游
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) { if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
name = 'enrollTotal'
} else {
if (row.TravelType == 1) { if (row.TravelType == 1) {
name = 'groupTourOrder' name = 'groupTourOrder'
} else { } else {
name = 'groupTourOrderOne' name = 'groupTourOrderOne'
} }
} else {
name = 'enrollTotal'
} }
} else if (row.OrderType == 3) { //酒店 } else if (row.OrderType == 3) { //酒店
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) { if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
name = 'singleProductHotelOrder'
} else {
name = 'singleProductHotelOrderOP' name = 'singleProductHotelOrderOP'
} else {
name = 'singleProductHotelOrder'
} }
} else if (row.OrderType == 4) { //门票 } else if (row.OrderType == 4) { //门票
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) { if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
name = 'SingleticketOrderList'
} else {
name = 'SingleticketOrderListOP' name = 'SingleticketOrderListOP'
} else {
name = 'SingleticketOrderList'
} }
} else if (row.OrderType == 5) { //包车 } else if (row.OrderType == 5) { //包车
if(row.CarType==''||row.CarType==null){ if(row.CarType==''||row.CarType==null){
this.GetAdminCarOrderPageList(row,url,href,data) this.GetAdminCarOrderPageList(row,url,href,data)
}else{ }else{
if(!this.S_CheckBranchOrder && !this.S_CheckAllOrder){ if(!this.S_CheckBranchOrder || !this.S_CheckAllOrder){
name = 'CharterOrderList' name = 'CharterOrderListOP'
}else{ }else{
name= 'CharterOrderListOP' name= 'CharterOrderList'
} }
data[0].Type = row.CarType==null||!row.CarType?4:row.CarType data[0].Type = row.CarType==null||!row.CarType?4:row.CarType
} }
} else if (row.OrderType == 7) { //jalan酒店 } else if (row.OrderType == 7) { //jalan酒店
this.$message.info('jalan酒店暂不支持查看') this.$message.info('jalan酒店暂不支持查看')
// if(!this.S_CheckBranchOrder && !this.S_CheckAllOrder){ // if(!this.S_CheckBranchOrder || !this.S_CheckAllOrder){
// name = 'CharterOrderList' // name = 'CharterOrderList'
// }else{ // }else{
// name = 'CharterOrderListOP' // name = 'CharterOrderListOP'
...@@ -447,10 +447,10 @@ ...@@ -447,10 +447,10 @@
if (pageData && pageData.length > 0) { if (pageData && pageData.length > 0) {
OrderType = pageData[0].OrderType OrderType = pageData[0].OrderType
} }
if (!this.S_CheckBranchOrder && !this.S_CheckAllOrder) { if (!this.S_CheckBranchOrder || !this.S_CheckAllOrder) {
name = 'CharterOrderList'
} else {
name = 'CharterOrderListOP' name = 'CharterOrderListOP'
} else {
name = 'CharterOrderList'
} }
this.$router.push({ this.$router.push({
name: name, name: name,
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ 4d5e2cd3
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
if (row.OrderType == 1) { if (row.OrderType == 1) {
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
data[0].path = 'myCustomerOrderAllType' data[0].path = 'myCustomerOrderAllType'
} else { } else {
data[0].path = 'customerOrderAllType' data[0].path = 'customerOrderAllType'
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
} else { } else {
let name = '' let name = ''
if (row.OrderType == 6) { if (row.OrderType == 6) {
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
name = 'VisaProductEditOrder' name = 'VisaProductEditOrder'
} else { } else {
name = 'VisaProductEditOrderOP' name = 'VisaProductEditOrderOP'
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
name: name, name: name,
}); });
} else if (row.OrderType == 2) { //跟团 一日游 } else if (row.OrderType == 2) { //跟团 一日游
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
if (row.TravelType == 1) { if (row.TravelType == 1) {
name = 'groupTourOrder' name = 'groupTourOrder'
} else { } else {
...@@ -278,13 +278,13 @@ ...@@ -278,13 +278,13 @@
name = 'enrollTotal' name = 'enrollTotal'
} }
} else if (row.OrderType == 3) { //酒店 } else if (row.OrderType == 3) { //酒店
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
name = 'singleProductHotelOrder' name = 'singleProductHotelOrder'
} else { } else {
name = 'singleProductHotelOrderOP' name = 'singleProductHotelOrderOP'
} }
} else if (row.OrderType == 4) { //门票 } else if (row.OrderType == 4) { //门票
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
name = 'SingleticketOrderList' name = 'SingleticketOrderList'
} else { } else {
name = 'SingleticketOrderListOP' name = 'SingleticketOrderListOP'
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
if (pageData && pageData.length > 0) { if (pageData && pageData.length > 0) {
OrderType = pageData[0].OrderType OrderType = pageData[0].OrderType
} }
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
name = 'CharterOrderList' name = 'CharterOrderList'
} else { } else {
name = 'CharterOrderListOP' name = 'CharterOrderListOP'
......
src/components/rank/OrderList.vue
View file @ 4d5e2cd3
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
if (row.OrderType == 1) { if (row.OrderType == 1) {
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
data[0].path = 'myCustomerOrderAllType' data[0].path = 'myCustomerOrderAllType'
} else { } else {
data[0].path = 'customerOrderAllType' data[0].path = 'customerOrderAllType'
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
} else { } else {
let name = '' let name = ''
if (row.OrderType == 6) { if (row.OrderType == 6) {
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
name = 'VisaProductEditOrder' name = 'VisaProductEditOrder'
} else { } else {
name = 'VisaProductEditOrderOP' name = 'VisaProductEditOrderOP'
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
name: name, name: name,
}); });
} else if (row.OrderType == 2) { //跟团 一日游 } else if (row.OrderType == 2) { //跟团 一日游
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
if (row.TravelType == 1) { if (row.TravelType == 1) {
name = 'groupTourOrder' name = 'groupTourOrder'
} else { } else {
...@@ -274,13 +274,13 @@ ...@@ -274,13 +274,13 @@
name = 'enrollTotal' name = 'enrollTotal'
} }
} else if (row.OrderType == 3) { //酒店 } else if (row.OrderType == 3) { //酒店
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
name = 'singleProductHotelOrder' name = 'singleProductHotelOrder'
} else { } else {
name = 'singleProductHotelOrderOP' name = 'singleProductHotelOrderOP'
} }
} else if (row.OrderType == 4) { //门票 } else if (row.OrderType == 4) { //门票
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
name = 'SingleticketOrderList' name = 'SingleticketOrderList'
} else { } else {
name = 'SingleticketOrderListOP' name = 'SingleticketOrderListOP'
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
if (pageData && pageData.length > 0) { if (pageData && pageData.length > 0) {
OrderType = pageData[0].OrderType OrderType = pageData[0].OrderType
} }
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) { if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder || !this.S_CheckAllOrder)) {
name = 'CharterOrderList' name = 'CharterOrderList'
} else { } else {
name = 'CharterOrderListOP' name = 'CharterOrderListOP'
......
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