Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
SuperMan
Commits
fc005aad
Commit
fc005aad
authored
5 years ago
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限修改
parent
06fd36ca
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
203 additions
and
248 deletions
+203
-248
tripUtils.js
src/assets/utils/tripUtils.js
+14
-1
HotelContract.vue
src/components/Hotel/HotelContract.vue
+1
-4
roomReservationsDetails.vue
src/components/Hotel/roomReservationsDetails.vue
+0
-4
bookDinnerStatisticsDetails.vue
src/components/Restaurant/bookDinnerStatisticsDetails.vue
+0
-4
enrollTotalForAirUnion.vue
src/components/SalesModule/enrollTotalForAirUnion.vue
+0
-1
OpTripList.vue
src/components/TravelManager/TravelList/OpTripList.vue
+6
-21
oneDayTrip.vue
src/components/TravelManager/TravelList/oneDayTrip.vue
+2
-8
LocaltourMan.vue
src/components/activity/LocaltourMan.vue
+174
-184
AirticketCommission.vue
src/components/administrative/AirticketCommission.vue
+0
-3
AirticketCommissionDetail.vue
src/components/administrative/AirticketCommissionDetail.vue
+1
-3
DjCommissionsmangment.vue
src/components/administrative/DjCommissionsmangment.vue
+0
-1
ViittoCommission.vue
src/components/administrative/ViittoCommission.vue
+1
-2
TravelManager5.vue
...newTravelmanager/oldTravelGroupControl/TravelManager5.vue
+0
-1
admissionStatistics.vue
src/components/scenicSpot/admissionStatistics.vue
+0
-4
admissionStatisticsDetails.vue
src/components/scenicSpot/admissionStatisticsDetails.vue
+0
-4
lineManagement.vue
src/components/systemManagement/lineManagement.vue
+4
-3
No files found.
src/assets/utils/tripUtils.js
View file @
fc005aad
...
...
@@ -734,6 +734,19 @@ var tripUtils = {
})
}
return
flag
;
}
},
//跳转到B2B一日游页面
GotoB2BOneDayPage
(
B2BDomain
,
ConfigId
,
tcid
)
{
if
(
B2BDomain
)
{
var
url
=
"http://"
+
B2BDomain
;
window
.
open
(
url
+
'/#/OneDayDetailTwo/'
+
encodeURIComponent
(
ConfigId
)
+
'/'
+
tcid
+
'/preview'
,
'_blank'
)
}
},
}
export
default
tripUtils
;
This diff is collapsed.
Click to expand it.
src/components/Hotel/HotelContract.vue
View file @
fc005aad
...
...
@@ -71,8 +71,6 @@
export
default
{
data
()
{
return
{
//当前登录用户
CurrentUserInfo
:
{},
defaultSelectValue
:
0
,
list
:
[],
roomList
:
[],
...
...
@@ -565,8 +563,7 @@
},
mounted
()
{
this
.
getAllCurrency
();
let
userInfo
=
this
.
getLocalStorage
()
this
.
CurrentUserInfo
=
userInfo
;
this
.
TCNUM
=
this
.
$route
.
query
.
TCNUM
;
this
.
NewTCIDs
=
this
.
$route
.
query
.
NewTCIDs
;
this
.
initSupplier
();
...
...
This diff is collapsed.
Click to expand it.
src/components/Hotel/roomReservationsDetails.vue
View file @
fc005aad
...
...
@@ -604,8 +604,6 @@
data
()
{
return
{
EditBtn
:
false
,
//房餐景点修改权限
//当前登录用户
CurrentUserInfo
:
{},
defaultSelectValue
:
0
,
list
:
[],
roomList
:
[],
...
...
@@ -1208,8 +1206,6 @@
mounted
()
{
this
.
GetAuth
();
this
.
getAllCurrency
();
let
userInfo
=
this
.
getLocalStorage
()
this
.
CurrentUserInfo
=
userInfo
;
this
.
LeaderName
=
this
.
$route
.
query
.
LeaderName
;
this
.
GuideName
=
this
.
$route
.
query
.
GuideName
;
this
.
TCNUM
=
this
.
$route
.
query
.
TCNUM
;
...
...
This diff is collapsed.
Click to expand it.
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @
fc005aad
...
...
@@ -240,8 +240,6 @@
GuestNum
:
0
,
loading
:
false
,
IsOperation
:
''
,
//当前登录人信息
CurrentUserInfo
:
{},
//是否禁用按钮
IsDisabled
:
false
,
allCurrencyList
:
[],
...
...
@@ -484,8 +482,6 @@
mounted
()
{
this
.
CheckAuth
();
this
.
GetAuth
();
let
userInfo
=
this
.
getLocalStorage
();
this
.
CurrentUserInfo
=
userInfo
;
this
.
TCNUM
=
this
.
$route
.
query
.
TCNUM
;
this
.
GuestNum
=
this
.
$route
.
query
.
GuestNum
;
this
.
getList
();
...
...
This diff is collapsed.
Click to expand it.
src/components/SalesModule/enrollTotalForAirUnion.vue
View file @
fc005aad
...
...
@@ -557,7 +557,6 @@
this
.
CheckUserAuth
(
actionCode
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
&&
res
.
data
.
data
==
1
)
{
this
.
EditBtn
=
true
;
console
.
log
(
"this.EditBtn"
,
this
.
EditBtn
)
}
});
},
...
...
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelList/OpTripList.vue
View file @
fc005aad
...
...
@@ -125,17 +125,16 @@
</div>
<div
class=
"el-col"
>
<div
class=
"d7"
>
<el-button
@
click=
"goToOpenTravel('TravelManager2',item.ID)"
type=
"primary"
>
<el-button
@
click=
"goToOpenTravel('TravelManager2',item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripUpdate'
)
}}
</el-button>
<el-button
@
click=
"copyTravelInfo(item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripCopy'
)
}}
</el-button>
<el-button
@
click=
"goUrlR('confirmationOrderDownLoad',item)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripDownLoad'
)
}}
</el-button>
<el-button
style=
"display:none;"
@
click=
"goB2B(item.ID, 0)"
type=
"primary"
>
{{
$t
(
'Operation.Op_b2bView'
)
}}
</el-button>
<el-button
v-if=
"item.TCNUMS==''"
@
click=
"delConfig(item.ID)"
type=
"primary"
>
{{
$t
(
'system.table_delete'
)
}}
</el-button>
<el-button
@
click=
"SetTravelConfigShare(item.ID)"
type=
"primary"
>
<el-button
@
click=
"SetTravelConfigShare(item.ID)"
type=
"primary"
>
共享给销售
</el-button>
</div>
</div>
...
...
@@ -197,8 +196,6 @@
EndGroupDate
:
""
,
KeyWords
:
""
,
//关键字
},
//当前登录人员信息
CurrentUserInfo
:
{},
remarkMsg
:
{
TCID
:
0
,
OPRemark
:
""
,
...
...
@@ -393,8 +390,8 @@
//根据当前员工所在部门获取该部门及子部门员工信息
SetTravelConfigShare
(
ID
)
{
let
msg
=
{
ID
:
ID
,
ShareTeamType
:
1
ID
:
ID
,
ShareTeamType
:
1
};
this
.
apipost
(
"travel_post_SetTravelConfigShareService"
,
msg
,
...
...
@@ -407,17 +404,7 @@
err
=>
{}
);
},
goB2B
(
ConfigId
,
tcid
)
{
var
B2BDomain
=
this
.
CurrentUserInfo
.
B2BDomain
;
var
url
=
"http://192.168.2.214:8084"
;
url
=
"http://www.oytour.com"
;
window
.
open
(
url
+
'/#/detailTwo/'
+
encodeURIComponent
(
ConfigId
)
+
'/'
+
tcid
+
'/preview'
,
'_blank'
)
},
goUrlR
(
path
,
item
)
{
var
cityId
=
item
.
StartCityID
if
(
item
.
IsUnion
==
1
&&
item
.
UnionTypeStr
==
2
)
{
...
...
@@ -444,8 +431,6 @@
this
.
getLineList
();
},
created
()
{
let
userInfo
=
this
.
getLocalStorage
()
this
.
CurrentUserInfo
=
userInfo
;
this
.
getControlList
();
},
};
...
...
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @
fc005aad
...
...
@@ -901,7 +901,6 @@
this
.
queryMsg
.
TCID
=
""
;
}
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
"res.data.data.pageData"
,
res
.
data
.
data
.
pageData
);
this
.
queryCommonData
.
dataList
=
res
.
data
.
data
.
pageData
this
.
queryMsg
.
total
=
res
.
data
.
data
.
count
this
.
queryMsg
.
noData
=
!
this
.
queryMsg
.
total
>
0
...
...
@@ -1150,13 +1149,8 @@
})
},
goB2B
(
ConfigId
,
tcid
)
{
var
B2BDomain
=
this
.
CurrentUserInfo
.
B2BDomain
window
.
open
(
'http://www.oytour.com/#/OneDayDetailTwo/'
+
encodeURIComponent
(
ConfigId
)
+
'/'
+
tcid
+
'/preview'
,
'_blank'
)
var
B2BDomain
=
this
.
CurrentUserInfo
.
B2BDomain
;
this
.
$tripUtils
.
GotoB2BOneDayPage
(
B2BDomain
,
ConfigId
,
tcid
);
},
goTeamBalance
(
id
,
OutBranchId
)
{
this
.
$router
.
push
({
...
...
This diff is collapsed.
Click to expand it.
src/components/activity/LocaltourMan.vue
View file @
fc005aad
This diff is collapsed.
Click to expand it.
src/components/administrative/AirticketCommission.vue
View file @
fc005aad
...
...
@@ -61,12 +61,9 @@
currentPage
:
1
,
isDisable
:
false
,
IsAuth
:
0
,
//生成票务提成权限
CurrentUserInfo
:{},
//当前用户对象
}
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
this
.
CurrentUserInfo
=
userInfo
;
this
.
GetAuth
();
this
.
getList
();
},
...
...
This diff is collapsed.
Click to expand it.
src/components/administrative/AirticketCommissionDetail.vue
View file @
fc005aad
...
...
@@ -65,12 +65,10 @@
loading
:
false
,
//数据源
dataList
:
[],
CurrentUserInfo
:
{},
//当前登录对象
}
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
()
this
.
CurrentUserInfo
=
userInfo
;
this
.
msg
.
MainId
=
this
.
$route
.
query
.
ID
;
this
.
getList
();
},
...
...
This diff is collapsed.
Click to expand it.
src/components/administrative/DjCommissionsmangment.vue
View file @
fc005aad
...
...
@@ -82,7 +82,6 @@
CostType
:
112
,
SelectState
:
true
,
}
console
.
log
(
JSON
.
stringify
(
orderObj
))
let
id
=
[
29
,
31
];
this
.
$router
.
push
({
name
:
'ChoiceAddFinancialDocuments'
,
...
...
This diff is collapsed.
Click to expand it.
src/components/administrative/ViittoCommission.vue
View file @
fc005aad
...
...
@@ -61,12 +61,11 @@
currentPage
:
1
,
isDisable
:
false
,
IsAuth
:
0
,
//生成票务提成权限
CurrentUserInfo
:{},
//当前用户对象
}
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
this
.
CurrentUserInfo
=
userInfo
;
this
.
GetAuth
();
this
.
getList
();
},
...
...
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @
fc005aad
...
...
@@ -383,7 +383,6 @@
}
basicData
.
TeamType
=
this
.
TeamType
basicData
.
IsUpdateHotel
=
this
.
PostConfig
.
IsUpdateHotel
console
.
log
(
"basicData"
,
basicData
);
this
.
apipost
(
'travel_post_SetTravelConfigInfo'
,
basicData
,
...
...
This diff is collapsed.
Click to expand it.
src/components/scenicSpot/admissionStatistics.vue
View file @
fc005aad
...
...
@@ -143,8 +143,6 @@
loading
:
false
,
currentPage
:
1
,
total
:
0
,
//当前登录用户
CurrentUserInfo
:
{},
msg
:
{
pageIndex
:
1
,
pageSize
:
5
,
...
...
@@ -266,8 +264,6 @@
},
},
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
()
this
.
CurrentUserInfo
=
userInfo
;
let
myDate
=
new
Date
();
let
nowDate
=
myDate
.
getFullYear
()
+
...
...
This diff is collapsed.
Click to expand it.
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @
fc005aad
...
...
@@ -170,8 +170,6 @@
GuestNum
:
0
,
loading
:
false
,
IsOperation
:
''
,
//当前登录人信息
CurrentUserInfo
:
{},
//是否禁用按钮
IsDisabled
:
false
,
}
...
...
@@ -280,8 +278,6 @@
},
mounted
()
{
this
.
CheckAuth
();
let
userInfo
=
this
.
getLocalStorage
();
this
.
CurrentUserInfo
=
userInfo
;
this
.
TCNUM
=
this
.
$route
.
query
.
TCNUM
;
this
.
flightTotal
=
this
.
$route
.
query
.
flightTotal
;
this
.
GuestNum
=
this
.
$route
.
query
.
GuestNum
;
...
...
This diff is collapsed.
Click to expand it.
src/components/systemManagement/lineManagement.vue
View file @
fc005aad
...
...
@@ -280,7 +280,6 @@
}
.lineManagement
.LM_ul
li
{
/*height: 78px;*/
margin
:
20px
0
0px
0px
;
transition
:
linear
all
0.5s
;
background-color
:
#fff
;
...
...
@@ -444,8 +443,10 @@
</div>
</el-col>
<el-col
:span=
"2"
>
<div
class=
"Linezhicai"
:class=
"
{'redType':item.isDirect=='0'}">
{{
item
.
isDirect
==
"0"
?
$t
(
'op.feizhicai'
):
$t
(
'op.zhicai'
)
}}
</div>
<div
class=
"Linezhicai"
:class=
"
{'redType':item.isShow=='0'}">
{{
item
.
isShow
==
"0"
?
$t
(
'MarketingActi.notShow'
):
$t
(
'system.table_isShows'
)
}}
</div>
<div
class=
"Linezhicai"
:class=
"
{'redType':item.isDirect=='0'}">
{{
item
.
isDirect
==
"0"
?
$t
(
'op.feizhicai'
):
$t
(
'op.zhicai'
)
}}
</div>
<div
class=
"Linezhicai"
:class=
"
{'redType':item.isShow=='0'}">
{{
item
.
isShow
==
"0"
?
$t
(
'MarketingActi.notShow'
):
$t
(
'system.table_isShows'
)
}}
</div>
<div
class=
"Linezhicai"
:class=
"
{'redType':item.is_PacketGroup=='0'}">
{{
item
.
is_PacketGroup
==
"0"
?
$t
(
'op.notxiaobaotuan'
):
$t
(
'Operation.Op_AllowSmallGroup'
)
}}
</div>
</el-col>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment