Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manage
Overview
Overview
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
vanke
manage
Commits
e6c1a5d3
Commit
e6c1a5d3
authored
Aug 31, 2020
by
wangyalan-git
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
微v导入用户
parent
07868ea4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
326 additions
and
2 deletions
+326
-2
user.js
src/api/user.js
+8
-0
request.js
src/utils/request.js
+1
-1
UserList.vue
src/views/use/UserList.vue
+13
-1
importVMemberModal.vue
src/views/use/modules/importVMemberModal.vue
+304
-0
No files found.
src/api/user.js
View file @
e6c1a5d3
...
@@ -45,3 +45,11 @@ export function updateMember(data) {
...
@@ -45,3 +45,11 @@ export function updateMember(data) {
data
data
})
})
}
}
// 分页获取万科企业所有组织人员
export
function
getAllPersons
(
params
)
{
return
request
({
url
:
'umsMember/getAllPersons'
,
method
:
'get'
,
params
})
}
src/utils/request.js
View file @
e6c1a5d3
...
@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
...
@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
const
service
=
axios
.
create
({
const
service
=
axios
.
create
({
// baseURL: process.env.BASE_API,
// baseURL: process.env.BASE_API,
withCredentials
:
true
,
withCredentials
:
true
,
baseURL
:
'http://192.168.31.11
2
:8201/mall-admin'
,
baseURL
:
'http://192.168.31.11
3
:8201/mall-admin'
,
// baseURL: 'http://hhg.api.jsonpro.cn:8201/mall-admin',
// baseURL: 'http://hhg.api.jsonpro.cn:8201/mall-admin',
timeout
:
60000
// 请求超时时间
timeout
:
60000
// 请求超时时间
})
})
...
...
src/views/use/UserList.vue
View file @
e6c1a5d3
...
@@ -38,6 +38,11 @@
...
@@ -38,6 +38,11 @@
type=
"primary"
type=
"primary"
@
click=
"handleAdd"
>
导入用户
@
click=
"handleAdd"
>
导入用户
</el-button>
</el-button>
<el-button
class=
"btn-add"
size=
"small"
type=
"primary"
@
click=
"addVMember"
>
微V导入
</el-button>
</el-form>
</el-form>
</el-card>
</el-card>
<!-- 表格栏 -->
<!-- 表格栏 -->
...
@@ -107,6 +112,8 @@
...
@@ -107,6 +112,8 @@
@
ok=
"getList"
></add-admin>
@
ok=
"getList"
></add-admin>
<import-member-modal
ref=
"importMember"
<import-member-modal
ref=
"importMember"
@
ok=
"getList"
></import-member-modal>
@
ok=
"getList"
></import-member-modal>
<import-v-member-modal
ref=
"importVMember"
@
ok=
"getList"
></import-v-member-modal>
<!-- end -->
<!-- end -->
</div>
</div>
</template>
</template>
...
@@ -116,6 +123,7 @@ import { getMemberList, getAuditDetail, updateMcht,updateMember } from '@/api/us
...
@@ -116,6 +123,7 @@ import { getMemberList, getAuditDetail, updateMcht,updateMember } from '@/api/us
import
{
getDepartmentList
}
from
'@/api/inventory'
import
{
getDepartmentList
}
from
'@/api/inventory'
import
AddAdmin
from
'./modules/AddAdmin'
import
AddAdmin
from
'./modules/AddAdmin'
import
ImportMemberModal
from
'./modules/importMemberModal'
import
ImportMemberModal
from
'./modules/importMemberModal'
import
ImportVMemberModal
from
'./modules/importVMemberModal'
// 列表查询参数默认值
// 列表查询参数默认值
const
defaultListQuery
=
{
const
defaultListQuery
=
{
pageNum
:
1
,
pageNum
:
1
,
...
@@ -127,7 +135,7 @@ const defaultListQuery = {
...
@@ -127,7 +135,7 @@ const defaultListQuery = {
export
default
{
export
default
{
name
:
'UserList'
,
name
:
'UserList'
,
components
:
{
AddAdmin
,
ImportMemberModal
},
components
:
{
AddAdmin
,
ImportMemberModal
,
ImportVMemberModal
},
data
()
{
data
()
{
return
{
return
{
departmentOptions
:
[],
departmentOptions
:
[],
...
@@ -193,6 +201,10 @@ export default {
...
@@ -193,6 +201,10 @@ export default {
handleAdd
()
{
handleAdd
()
{
this
.
$refs
.
importMember
.
add
()
this
.
$refs
.
importMember
.
add
()
},
},
// 从微V导入用户
addVMember
()
{
this
.
$refs
.
importVMember
.
add
()
},
// 设置为管理员
// 设置为管理员
handleSet
(
row
)
{
handleSet
(
row
)
{
this
.
$refs
.
addAdmin
.
add
(
row
)
this
.
$refs
.
addAdmin
.
add
(
row
)
...
...
src/views/use/modules/importVMemberModal.vue
0 → 100644
View file @
e6c1a5d3
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