diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 92f6f3b3cc..824aaec8cc 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -25,7 +25,10 @@ export default {
'create_time': 'Created Time',
'update_time': 'Updated Time',
'add': 'Add',
- 'member': 'Member'
+ 'member': 'Member',
+ 'email': 'Email',
+ 'phone': 'Phone',
+ 'role': 'Role',
},
workspace: {
'create': 'Create Workspace',
@@ -55,7 +58,13 @@ export default {
'input_name': 'Please enter a workspace name',
},
member: {
- 'create': 'Create'
+ 'create': 'Create',
+ 'modify': 'Modify',
+ 'delete_confirm': 'Are you sure you want to delete this Member?',
+ 'please_choose_member': 'Please Choose Member',
+ },
+ role: {
+ 'please_choose_role': 'Please Choose Role',
},
load_test: {
'recent': 'Recent Tests',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index c335e62eed..7643425dd0 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -25,7 +25,10 @@ export default {
'create_time': '创建时间',
'update_time': '更新时间',
'add': '添加',
- 'member': '成员'
+ 'member': '成员',
+ 'email': '邮箱',
+ 'phone': '电话',
+ 'role': '角色',
},
workspace: {
'create': '创建工作空间',
@@ -55,7 +58,13 @@ export default {
'input_name': '请输入项目名称',
},
member: {
- 'create': '添加成员'
+ 'create': '添加成员',
+ 'modify': '修改成员',
+ 'delete_confirm': '这个用户确定要删除吗?',
+ 'please_choose_member': '请选择成员',
+ },
+ role: {
+ 'please_choose_role': '请选择角色',
},
load_test: {
'recent': '最近的测试',
diff --git a/frontend/src/performance/components/settings/Organization.vue b/frontend/src/performance/components/settings/Organization.vue
index 93df39b3b4..cdcd5c42fd 100644
--- a/frontend/src/performance/components/settings/Organization.vue
+++ b/frontend/src/performance/components/settings/Organization.vue
@@ -13,6 +13,7 @@
+
@@ -29,7 +30,6 @@
-
@@ -48,21 +48,24 @@
-
+
- 成员
-
-
+ {{$t('commons.member')}}
+
+
-
+
-
-
-
+
+
+
@@ -96,6 +99,7 @@
+
@@ -110,6 +114,7 @@
+
@@ -124,10 +129,11 @@
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -233,6 +240,14 @@
description: [
{ max: 50, message: this.$t('commons.input_limit', [0, 50]), trigger: 'blur'}
]
+ },
+ orgMemberRule: {
+ userIds: [
+ {required: true, message: '请选择成员', trigger: ['blur']}
+ ],
+ roleIds: [
+ {required: true, message: '请选择角色', trigger: ['blur']}
+ ]
}
}
},
@@ -254,7 +269,6 @@
})
},
edit(row) {
- // this.loading = true;
this.updateVisible = true;
this.form = row;
},
@@ -269,6 +283,7 @@
this.$set(this.memberForm, 'roleIds', roleIds);
},
cellClick(row){
+ // 保存当前点击的组织信息到currentRow
this.currentRow = row;
this.memberVisible = true;
let param = {
@@ -310,22 +325,22 @@
});
},
delMember(row) {
- this.$confirm('是否删除用户 ' + row.name + ' ?', '', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm(this.$t('member.delete_confirm'), '', {
+ confirmButtonText: this.$t('commons.confirm'),
+ cancelButtonText: this.$t('commons.cancel'),
type: 'warning'
}).then(() => {
this.result = this.$get('/user/orgmember/delete/' + this.currentRow.id + '/' + row.id, () => {
this.$message({
type: 'success',
- message: '删除成功!'
+ message: this.$t('commons.delete_success')
});
this.cellClick(this.currentRow);
});
}).catch(() => {
this.$message({
type: 'info',
- message: '已取消删除'
+ message: this.$t('commons.delete_cancel')
});
});
},
@@ -397,7 +412,6 @@
this.currentPage = current;
this.initTableData();
},
- //
handleMemberSizeChange(size) {
this.pageMemberSize = size;
this.cellClick(this.currentRow);
@@ -438,7 +452,7 @@
this.result = this.$post("/organization/member/update", param,() => {
this.$message({
type: 'success',
- message: '修改成功!'
+ message: this.$t('commons.modify_success')
});
this.updateMemberVisible = false;
this.cellClick(this.currentRow);