diff --git a/src/api/user.js b/src/api/user.js index 1b9e094da..ca6689f86 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -23,16 +23,23 @@ export function getUserList(data) { params: data }) } -export function getUserGroupList(data) { +export function getUserGroupList(params) { return request({ url: '/api/v1/users/groups/', method: 'get', - params: data + params: params }) } -export function getUserGroup(data) { +export function getUserGroupDetail(id) { return request({ - url: '/api/v1/users/groups/' + data + '/', + url: `/api/v1/users/groups/${id}/`, + method: 'get' + }) +} + +export function getUserGroupMembers(id) { + return request({ + url: `/api/v1/users/users-groups-relations/?usergroup=${id}`, method: 'get' }) } diff --git a/src/components/Select2/index.vue b/src/components/Select2/index.vue index 933acb3dd..c1a59bda5 100644 --- a/src/components/Select2/index.vue +++ b/src/components/Select2/index.vue @@ -106,6 +106,9 @@ export default { }, defaultProcessSelected: data => { return data.map(item => { + if (item.label && item.value) { + return item + } return { label: item.name, value: item.id } }) }, @@ -135,7 +138,7 @@ export default { } }, watch: { - initialOptions: (newValue) => { + initialOptions: function(newValue) { const notInclude = newValue.filter(v => { return this.optionsValues.indexOf(v.value) === -1 }) @@ -155,7 +158,6 @@ export default { }, methods: { loadMore() { - console.log('Load more ...', this.params.hasMore) if (!this.params.hasMore) { return } @@ -190,6 +192,7 @@ export default { } }) }).catch(err => { + this.$message.error(err) console.log(err) }).then(() => { this.loading = false diff --git a/src/views/users/UserGroupDetail/index.vue b/src/views/users/UserGroupDetail/index.vue index 40184055a..8dfa51667 100644 --- a/src/views/users/UserGroupDetail/index.vue +++ b/src/views/users/UserGroupDetail/index.vue @@ -22,7 +22,7 @@