diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue index ebd21fbb6a..7c324240a8 100644 --- a/frontend/src/business/components/settings/organization/OrganizationMember.vue +++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue @@ -48,29 +48,25 @@ :total="total"/> - + :rules="{required: true, message: $t('member.please_choose_member'), trigger: 'blur'}"> + :placeholder="$t('member.please_choose_member')"> @@ -199,6 +195,7 @@ // name: this.$t('user.button.add_user_role_batch'), handleClick: this.addUserRoleBatch // } ], + userList: [] } }, methods: { @@ -313,6 +310,9 @@ } this.form = {}; this.createVisible = true; + this.result = this.$get('/user/list/', response => { + this.userList = response.data; + }); this.result = this.$post('/user/group/list', {type: GROUP_ORGANIZATION, resourceId: orgId}, response => { this.$set(this.form, "groups", response.data); }) @@ -337,20 +337,6 @@ } }); }, - remoteMethod(query) { - query = query.trim(); - if (query !== '') { - this.loading = true; - setTimeout(() => { - this.loading = false; - this.$get("/user/search/" + query, response => { - this.options = response.data; - }) - }, 200); - } else { - this.options = []; - } - }, initWorkspaceBatchProcessDataStruct(isShow){ let organizationId = getCurrentOrganizationId(); this.$get("/user/getWorkspaceDataStruct/"+organizationId, response => { diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue index d642940476..1a7f20bfeb 100644 --- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue +++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue @@ -103,29 +103,31 @@ - - - - + + + + + + { if (valid) { - let userIds = []; - let userId = this.memberForm.userId; - let email = this.memberForm.memberSign; - let member = this.userList.find(user => user.id === email || user.email === email); - if (!member) { - this.$warning(this.$t('member.no_such_user')); - return false; - } else { - userId = member.id; - } - userIds.push(userId); + // let userIds = []; + // let userId = this.memberForm.userId; + // let email = this.memberForm.memberSign; + // let member = this.userList.find(user => user.id === email || user.email === email); + // if (!member) { + // this.$warning(this.$t('member.no_such_user')); + // return false; + // } else { + // userId = member.id; + // } + // userIds.push(userId); let param = { - userIds: userIds, + userIds: this.memberForm.userIds, groupIds: this.memberForm.groupIds, workspaceId: this.currentWorkspaceRow.id }; diff --git a/frontend/src/business/components/settings/project/EditMember.vue b/frontend/src/business/components/settings/project/EditMember.vue index fa486e75e5..e596d17283 100644 --- a/frontend/src/business/components/settings/project/EditMember.vue +++ b/frontend/src/business/components/settings/project/EditMember.vue @@ -1,26 +1,29 @@