diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js index 0eb14bbc4e..8bdc5387fd 100644 --- a/frontend/src/utils/request.js +++ b/frontend/src/utils/request.js @@ -35,8 +35,8 @@ service.interceptors.request.use( config.headers[LinkTokenKey] = linkToken } - if (store.getters.language) { - config.headers['Accept-Language'] = store.getters.language + if (i18n.locale) { + config.headers['Accept-Language'] = i18n.locale } // 增加loading diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue index 8e8263e1ff..7d67c8e519 100644 --- a/frontend/src/views/system/user/form.vue +++ b/frontend/src/views/system/user/form.vue @@ -28,11 +28,13 @@ @@ -257,6 +259,15 @@ export default { }, backToList() { this.$router.push({ name: '用户管理' }) + }, + filterData(instanceId) { + const results = this.depts.map(node => { + if (node.hasChildren) { + node.children = null + } + return node + }) + this.depts = results } } } diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index bda6a482fe..c155dbe4cf 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -175,7 +175,7 @@ export default { } ], searchConfig: { - useQuickSearch: false, + useQuickSearch: true, quickPlaceholder: '按姓名搜索', components: [ { field: 'nick_name', label: '姓名', component: 'FuComplexInput' },