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
Expand all 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/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