diff --git a/src/router/index.js b/src/router/index.js index 4e36bcf..76947ab 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -176,6 +176,20 @@ export const dynamicRoutes = [ } ] }, + { + path: '/system/dept', + component: Layout, + hidden: true, + permissions: ['system:dept:list'], + children: [ + { + path: 'index/:owner', + component: () => import('@/views/system/dept'), + name: 'Data', + meta: { title: '运营商列表', activeMenu: '/system/dept' } + } + ] + }, { path: '/system/area-parking', component: Layout, diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 0c25940..ad6b2f5 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -72,7 +72,7 @@ :default-expand-all="isExpandAll" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :default-sort="defaultSort" @sort-change="handleSortChange"> - + @@ -544,6 +544,10 @@ export default { }, created() { console.log("当前用户信息：",this.$store.state.user.id) + const owner = this.$route.params && this.$route.params.owner; + if (owner != null) { + this.queryParams.deptName = owner; + } this.userName = this.$store.state.user.name; let userId = this.$store.state.user.id; getUser(userId).then(response => { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 093012e..8b20250 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -148,7 +148,8 @@ @@ -580,7 +581,7 @@ export default { }); }, appUserNameFormatter(value){ - return value ? value : '去绑定'; + return value ? value.split(',').join('
') : '去绑定'; }, /** 查询用户列表 */ getList() { diff --git a/src/views/system/withdrawAudit/index.vue b/src/views/system/withdrawAudit/index.vue index 3ebecb9..8884b37 100644 --- a/src/views/system/withdrawAudit/index.vue +++ b/src/views/system/withdrawAudit/index.vue @@ -76,9 +76,15 @@ - - - + + + + +