Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
ybf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
xulili
ybf
Commits
67b0e249
Commit
67b0e249
authored
Feb 04, 2020
by
xd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
移动修改完毕
parent
5e5020bf
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
120 additions
and
71 deletions
+120
-71
mail.js
ybf_admin/src/api/in/mail.js
+17
-1
move.vue
ybf_admin/src/pages/in/contact/components/move.vue
+16
-1
mail.vue
ybf_admin/src/pages/in/contact/mail.vue
+87
-69
No files found.
ybf_admin/src/api/in/mail.js
View file @
67b0e249
...
@@ -18,7 +18,14 @@ export function getNoGroupMember(data) {
...
@@ -18,7 +18,14 @@ export function getNoGroupMember(data) {
params
:
data
params
:
data
})
})
}
}
// 获取柜组用户
export
function
getGroupById
(
data
)
{
return
request
({
url
:
'/admin/auth/addressbook/getUserByShopId'
,
method
:
'get'
,
params
:
data
})
}
// 根据部门id获取人员
// 根据部门id获取人员
export
function
getMemberById
(
data
)
{
export
function
getMemberById
(
data
)
{
return
request
({
return
request
({
...
@@ -66,3 +73,12 @@ export function getHistoryList(data) {
...
@@ -66,3 +73,12 @@ export function getHistoryList(data) {
data
data
})
})
}
}
// 移动人员
export
function
moveMember
(
data
)
{
return
request
({
url
:
'admin/auth/addressbook/updateStallClerkByUserId'
,
method
:
'put'
,
params
:
data
})
}
\ No newline at end of file
ybf_admin/src/pages/in/contact/components/move.vue
View file @
67b0e249
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
{
getGroup
}
from
"@/api/in/mail"
;
import
{
getGroup
,
moveMember
}
from
"@/api/in/mail"
;
import
{
log
}
from
"util"
;
import
{
log
}
from
"util"
;
export
default
{
export
default
{
...
@@ -85,6 +85,10 @@ export default {
...
@@ -85,6 +85,10 @@ export default {
moveDialog
:
{
moveDialog
:
{
type
:
Boolean
,
type
:
Boolean
,
default
:
false
default
:
false
},
idList
:
{
type
:
Array
,
default
:
()
=>
[]
}
}
},
},
data
()
{
data
()
{
...
@@ -105,6 +109,17 @@ export default {
...
@@ -105,6 +109,17 @@ export default {
this
.
$emit
(
"handleCancel"
);
this
.
$emit
(
"handleCancel"
);
},
},
handleFinish
()
{
handleFinish
()
{
let
groupId
=
this
.
$refs
.
tree
.
getCheckedKeys
()[
0
]
let
data
=
{
/* stallIds: groupId*1,
userId: this.idList[0]*1 */
stallIds
:
groupId
,
userId
:
this
.
idList
[
0
]
}
moveMember
(
data
).
then
(
res
=>
{
console
.
log
(
res
,
"???"
);
})
this
.
$emit
(
"handleFinish"
,
false
);
this
.
$emit
(
"handleFinish"
,
false
);
},
},
/* handleChange() {},
/* handleChange() {},
...
...
ybf_admin/src/pages/in/contact/mail.vue
View file @
67b0e249
...
@@ -24,9 +24,9 @@
...
@@ -24,9 +24,9 @@
:expand-on-click-node=
"false"
:expand-on-click-node=
"false"
@
node-click=
"handleTreeClick"
@
node-click=
"handleTreeClick"
>
>
<span
class=
"custom-tree-node"
slot-scope=
"
{ node, data }">
<!--
<span
class=
"custom-tree-node"
slot-scope=
"
{ node, data }">
<span>
{{
node
.
label
}}
</span>
<span>
{{
node
.
label
}}
</span>
</span>
</span>
-->
</el-tree>
</el-tree>
</div>
</div>
</div>
</div>
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
<div
class=
"top"
>
三号柜组(共18人)
</div>
<div
class=
"top"
>
三号柜组(共18人)
</div>
<div
class=
"searchs"
>
<div
class=
"searchs"
>
<div
class=
"buttons"
>
<div
class=
"buttons"
>
<el-button
class=
"button buttondark"
size=
"small"
@
click=
"handleMove"
<el-button
class=
"button buttondark"
size=
"small"
@
click=
"handleMove"
:disabled=
"idList.length>0? false:true "
>
移动
</el-button
>
移动
</el-button
>
>
<el-button
<el-button
...
@@ -76,6 +76,7 @@
...
@@ -76,6 +76,7 @@
tooltip-effect=
"dark"
tooltip-effect=
"dark"
style=
"width: 100%"
style=
"width: 100%"
height=
"calc(100% - 140px)"
height=
"calc(100% - 140px)"
@
selection-change=
"handleMemberChange"
>
>
<el-table-column
type=
"selection"
width=
"60"
></el-table-column>
<el-table-column
type=
"selection"
width=
"60"
></el-table-column>
<el-table-column
<el-table-column
...
@@ -93,11 +94,7 @@
...
@@ -93,11 +94,7 @@
label=
"部门"
label=
"部门"
align=
"center"
align=
"center"
></el-table-column>
></el-table-column>
<el-table-column
<el-table-column
prop=
"role"
label=
"角色"
align=
"center"
>
prop=
"role"
label=
"角色"
align=
"center"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.managerType == 0"
>
店员
</span>
<span
v-if=
"scope.row.managerType == 0"
>
店员
</span>
<span
v-if=
"scope.row.managerType == 1"
>
店长
</span>
<span
v-if=
"scope.row.managerType == 1"
>
店长
</span>
...
@@ -132,6 +129,7 @@
...
@@ -132,6 +129,7 @@
:moveDialog=
"moveDialogShow"
:moveDialog=
"moveDialogShow"
@
handleCancel=
"moveDialogShow = false"
@
handleCancel=
"moveDialogShow = false"
@
handleFinish=
"removeFinish"
@
handleFinish=
"removeFinish"
:idList=
"idList"
></move-dialog>
></move-dialog>
<!-- <el-dialog title="提示" v-if="nameDialog" :visible.sync="nameDialog" width="30%" >
<!-- <el-dialog title="提示" v-if="nameDialog" :visible.sync="nameDialog" width="30%" >
<div class="changeName">
<div class="changeName">
...
@@ -148,7 +146,14 @@
...
@@ -148,7 +146,14 @@
<
script
>
<
script
>
import
MoveDialog
from
"./components/move"
;
import
MoveDialog
from
"./components/move"
;
import
{
getOrgTree
,
getAllMemberList
,
getNoGroupMember
,
getMemberById
,
storeNameChange
}
from
"@/api/in/mail"
;
import
{
getOrgTree
,
getAllMemberList
,
getNoGroupMember
,
getMemberById
,
storeNameChange
,
getGroupById
}
from
"@/api/in/mail"
;
export
default
{
export
default
{
data
()
{
data
()
{
const
data1
=
[
const
data1
=
[
...
@@ -556,14 +561,13 @@ export default {
...
@@ -556,14 +561,13 @@ export default {
id
:
"id"
id
:
"id"
},
},
type
:
1
,
type
:
1
,
store
:
{
idList
:
[],
name
:
""
,
storeId
:
""
,
id
:
""
groupId
:
""
}
};
};
},
},
components
:
{
components
:
{
MoveDialog
,
MoveDialog
},
},
created
()
{
created
()
{
this
.
getOrgTree
();
this
.
getOrgTree
();
...
@@ -571,42 +575,43 @@ export default {
...
@@ -571,42 +575,43 @@ export default {
},
},
methods
:
{
methods
:
{
getOrgTree
()
{
getOrgTree
()
{
getOrgTree
().
then
(
res
=>
{
getOrgTree
().
then
(
res
=>
{
let
data
=
res
.
data
let
data
=
res
.
data
;
this
.
allNumber
=
data
[
'用户的总数'
]
this
.
allNumber
=
data
[
"用户的总数"
];
this
.
wNumber
=
data
[
'未分组用户的总数'
]
this
.
wNumber
=
data
[
"未分组用户的总数"
];
this
.
data1
=
data
[
'所有的柜组'
]
this
.
data1
=
data
[
"所有的柜组"
];
})
})
;
},
},
handleTreeClick
(
data
)
{
handleTreeClick
(
data
)
{
/* switch (data.id) {
if
(
data
.
type
){
case 1:
this
.
storeId
=
data
.
id
this.list1.main4 = this.list1.main6;
this
.
getStoreMember
(
1
)
break;
}
else
{
case 5:
this
.
groupId
=
data
.
id
this.list1.main4 = this.list1.main1;
this
.
getGroupMember
(
1
)
break;
case 6:
this.list1.main4 = this.list1.main2;
break;
case 7:
this.list1.main4 = this.list1.main3;
break;
case 2:
this.list1.main4 = this.list1.main5;
break;
default:
this.list1.main4 = this.list1.main3;
break;
} */
let
params
=
{
pageNum
:
1
,
stallId
:
data
.
id
}
}
},
getGroupMember
(
page
)
{
this
.
type
=
3
let
params
=
{
pageNum
:
page
,
shopId
:
this
.
groupId
};
getGroupById
(
params
).
then
(
res
=>
{
this
.
tableData
=
res
.
data
.
list
;
this
.
page
.
total
=
Number
(
res
.
data
.
total
);
});
},
getStoreMember
(
page
)
{
this
.
type
=
4
let
params
=
{
pageNum
:
page
,
stallId
:
this
.
storeId
};
getMemberById
(
params
).
then
(
res
=>
{
getMemberById
(
params
).
then
(
res
=>
{
this
.
tableData
=
res
.
data
.
list
this
.
tableData
=
res
.
data
.
list
;
this
.
page
.
total
=
Number
(
res
.
data
.
total
)
this
.
page
.
total
=
Number
(
res
.
data
.
total
)
;
})
})
;
},
},
listPick
()
{},
listPick
()
{},
testButtonClick
()
{},
testButtonClick
()
{},
...
@@ -623,37 +628,50 @@ export default {
...
@@ -623,37 +628,50 @@ export default {
this
.
moveDialogShow
=
false
;
this
.
moveDialogShow
=
false
;
},
},
handleCurrentChange
(
val
)
{
handleCurrentChange
(
val
)
{
console
.
log
(
val
,
"每页"
);
console
.
log
(
val
,
"每页"
);
if
(
this
.
type
==
1
)
{
this
.
getMailList
(
val
)
}
else
if
(
this
.
type
==
2
)
{
this
.
getNoGroupMember
(
val
)
}
else
if
(
this
.
type
==
3
)
{
this
.
getGroupMember
(
val
)
}
else
{
this
.
getStoreMember
(
val
)
}
},
},
/* addCounter() {
this.$refs.addCounter.counterDialog = true;
}, */
/* addStore() {
this.$refs.addStore.addStoreDialog = true;
}, */
getMailList
(
page
)
{
getMailList
(
page
)
{
this
.
type
=
1
this
.
type
=
1
;
let
params
=
{
let
params
=
{
pageNum
:
page
pageNum
:
page
}
}
;
getAllMemberList
(
params
).
then
(
res
=>
{
getAllMemberList
(
params
).
then
(
res
=>
{
console
.
log
(
res
,
"res"
);
console
.
log
(
res
,
"res"
);
this
.
tableData
=
res
.
data
.
list
this
.
tableData
=
res
.
data
.
list
;
this
.
page
.
total
=
Number
(
res
.
data
.
total
)
this
.
page
.
total
=
Number
(
res
.
data
.
total
)
;
})
})
;
},
},
handleShopowner
()
{},
handleShopowner
()
{},
getNoGroupMember
(
page
)
{
getNoGroupMember
(
page
)
{
this
.
type
=
2
this
.
type
=
2
;
let
params
=
{
let
params
=
{
pageNum
:
page
pageNum
:
page
}
}
;
getNoGroupMember
(
params
).
then
(
res
=>
{
getNoGroupMember
(
params
).
then
(
res
=>
{
this
.
tableData
=
res
.
data
.
list
this
.
tableData
=
res
.
data
.
list
;
this
.
page
.
total
=
Number
(
res
.
data
.
total
)
this
.
page
.
total
=
Number
(
res
.
data
.
total
);
})
});
},
handleMemberChange
(
val
)
{
console
.
log
(
val
,
"val"
);
let
ids
=
[]
val
.
map
(
function
(
item
)
{
ids
.
push
(
item
.
id
)
});
this
.
idList
=
ids
console
.
log
(
this
.
idList
,
","
);
}
}
}
}
};
};
...
...
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