Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
ka-op-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QA
ka-op-ui
Commits
1af68b92
Commit
1af68b92
authored
Mar 12, 2020
by
智勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加operator
parent
cac682b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
+5
-7
user.js
src/store/modules/user.js
+4
-2
index.vue
src/views/order/index.vue
+1
-1
manager.vue
src/views/user/manager.vue
+0
-2
roleManager.vue
src/views/user/roleManager.vue
+0
-2
No files found.
src/store/modules/user.js
View file @
1af68b92
...
@@ -37,8 +37,10 @@ const user = {
...
@@ -37,8 +37,10 @@ const user = {
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
getInfo
().
then
(
response
=>
{
getInfo
().
then
(
response
=>
{
const
data
=
response
.
data
const
data
=
response
.
data
data
.
roles
=
data
.
roleInfo
.
roleInfos
&&
data
.
roleInfo
.
roleInfos
[
0
]
&&
data
.
roleInfo
.
roleInfos
[
0
].
roleId
===
1
?
[
'
admin
'
]
:
[
'
channel
'
]
data
.
roles
=
data
.
rank
.
indexOf
(
'
CHANNEL
'
)
!==
-
1
?
[
'
channel
'
]
:
[
'
operator
'
]
// data.roles = data.rank.indexOf('CHANNEL') !== -1 ? ['channel'] : ['admin']
if
(
data
.
roleInfo
.
roleInfos
&&
data
.
roleInfo
.
roleInfos
[
0
]
&&
data
.
roleInfo
.
roleInfos
[
0
].
roleId
===
1
)
{
data
.
roles
.
push
(
'
admin
'
)
}
if
(
data
.
roles
&&
data
.
roles
.
length
>
0
)
{
if
(
data
.
roles
&&
data
.
roles
.
length
>
0
)
{
commit
(
'
SET_ROLES
'
,
data
.
roles
)
commit
(
'
SET_ROLES
'
,
data
.
roles
)
}
else
{
}
else
{
...
...
src/views/order/index.vue
View file @
1af68b92
...
@@ -267,7 +267,7 @@ export default {
...
@@ -267,7 +267,7 @@ export default {
created
()
{
created
()
{
this
.
getOrders
()
this
.
getOrders
()
this
.
roles
=
store
.
getters
.
roles
this
.
roles
=
store
.
getters
.
roles
this
.
isShow
=
!
!
this
.
roles
.
includes
(
'
admin
'
)
this
.
isShow
=
!
this
.
roles
.
includes
(
'
channel
'
)
},
},
methods
:
{
methods
:
{
getOrders
()
{
getOrders
()
{
...
...
src/views/user/manager.vue
View file @
1af68b92
...
@@ -157,7 +157,6 @@ export default {
...
@@ -157,7 +157,6 @@ export default {
channels
:
[],
channels
:
[],
roles
:
[],
roles
:
[],
userRank
:
[],
userRank
:
[],
disabled
:
undefined
,
rules
:
{
rules
:
{
username
:
[{
required
:
true
,
message
:
'
请输入
'
,
trigger
:
'
change
'
}],
username
:
[{
required
:
true
,
message
:
'
请输入
'
,
trigger
:
'
change
'
}],
nickname
:
[{
required
:
true
,
message
:
'
请输入
'
,
trigger
:
'
change
'
}],
nickname
:
[{
required
:
true
,
message
:
'
请输入
'
,
trigger
:
'
change
'
}],
...
@@ -177,7 +176,6 @@ export default {
...
@@ -177,7 +176,6 @@ export default {
created
()
{
created
()
{
this
.
fetchUser
()
this
.
fetchUser
()
this
.
getRoles
()
this
.
getRoles
()
this
.
disabled
=
!
this
.
$store
.
getters
.
roles
.
includes
(
'
admin
'
)
},
},
methods
:
{
methods
:
{
fetchUser
()
{
fetchUser
()
{
...
...
src/views/user/roleManager.vue
View file @
1af68b92
...
@@ -113,7 +113,6 @@ export default {
...
@@ -113,7 +113,6 @@ export default {
roles
:
[],
roles
:
[],
roleList
:
[],
roleList
:
[],
permissions
:
[],
permissions
:
[],
disabled
:
undefined
,
rules
:
{
rules
:
{
type
:
[{
required
:
true
,
message
:
'
请选择
'
,
trigger
:
'
change
'
}]
type
:
[{
required
:
true
,
message
:
'
请选择
'
,
trigger
:
'
change
'
}]
},
},
...
@@ -130,7 +129,6 @@ export default {
...
@@ -130,7 +129,6 @@ export default {
this
.
getRoleList
()
this
.
getRoleList
()
this
.
getRoles
()
this
.
getRoles
()
this
.
getPermission
()
this
.
getPermission
()
this
.
disabled
=
!
this
.
$store
.
getters
.
roles
.
includes
(
'
admin
'
)
},
},
methods
:
{
methods
:
{
getRoleList
()
{
getRoleList
()
{
...
...
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