diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index bd9076a37b..8a60c83bc8 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -432,7 +432,12 @@ export default { org_member: 'Organization Member', add: 'Add Role', delete: 'Delete Role', - modify: 'Modify Role' + modify: 'Modify Role', + tips: 'Tips', + confirm_delete: 'Confirm delete role ', + role_name: 'Role Name ', + search_by_name: 'Search by name', + pls_input_name: 'please input name' }, menu: { parent_category: 'Parent Category', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index f71a45c863..9cab0b15c5 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -432,7 +432,12 @@ export default { org_member: '組織成員', add: '添加角色', delete: '删除角色', - modify: '修改角色' + modify: '修改角色', + tips: '提示', + confirm_delete: '確認删除角色 ', + role_name: '角色名稱', + search_by_name: '按名稱搜索', + pls_input_name: '請輸入名稱' }, menu: { parent_category: '上級目錄', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 5a78e62623..0de9c6c665 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -432,7 +432,12 @@ export default { org_member: '组织成员', add: '添加角色', delete: '删除角色', - modify: '修改角色' + modify: '修改角色', + tips: '提示', + confirm_delete: '确认删除角色 ', + role_name: '角色名称', + search_by_name: '按名称搜索', + pls_input_name: '请输入名称' }, menu: { parent_category: '上级目录', diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue index 1e7d7b182e..c71ba930b8 100644 --- a/frontend/src/views/system/role/index.vue +++ b/frontend/src/views/system/role/index.vue @@ -104,7 +104,7 @@ export default { form: {}, rule: { name: [ - { required: true, message: '请输入名称', trigger: 'blur' } + { required: true, message: this.$t('role.pls_input_name'), trigger: 'blur' } ], code: [{ required: true, message: '请输入代码', trigger: 'blur' }] }, @@ -125,13 +125,9 @@ export default { ], searchConfig: { useQuickSearch: false, - quickPlaceholder: '按名称搜索', + quickPlaceholder: this.$t('role.search_by_name'), components: [ - // { field: 'name', label: '姓名', component: 'FuComplexInput', defaultOperator: 'eq' }, - { field: 'name', label: '角色名称', component: 'FuComplexInput' }, - - { field: 'code', label: '角色代码', component: 'FuComplexInput', defaultOperator: 'eq' } - // { field: 'deptId', label: '组织', component: conditionTable } + { field: 'name', label: this.$t('role.role_name'), component: 'FuComplexInput' } ] }, paginationConfig: { @@ -151,11 +147,6 @@ export default { handleClick(tab, event) { console.log(tab, event) }, - // create() { - // this.form = {} - // this.formType = 'add' - // this.dialogVisible = true - // }, create() { this.$router.push({ name: '角色表单' }) }, @@ -168,12 +159,6 @@ export default { this.tableData = data.listObject }) }, - - // edit(row) { - // this.formType = 'modify' - // this.dialogVisible = true - // this.form = Object.assign({}, row) - // }, edit(row) { this.$router.push({ name: '角色表单', params: row }) }, @@ -266,9 +251,9 @@ export default { this.$refs.menu.setCheckedKeys(this.menuIds) }, handleDelete(row) { - this.$confirm('确认删除角色[' + row.name + ']?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm( this.$t('commons.confirm_delete') + ": " + row.name + '?', this.$t('role.tips'), { + confirmButtonText: this.$t('commons.confirm'), + cancelButtonText: this.$t('commons.cancel'), type: 'warning' }).then(() => { delRole(row.roleId).then(res => {