diff --git a/src/store/getters.js b/src/store/getters.js index 34ffa22..fe3ed06 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -5,6 +5,7 @@ const getters = { name: state => state.user.name, roles: state => state.user.roles, userId: state => state.user.userId, + orgId: state => state.user.userInfo?.orgId, permission_routes: state => state.permission.routes } export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 38c3c16..0ac1ec7 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -6,7 +6,8 @@ const state = { name: '', avatar: '', roles: [], - userId: '' + userId: '', + userInfo: {} } const mutations = { @@ -21,6 +22,9 @@ const mutations = { }, SET_USERId: (state, userId) => { state.userId = userId + }, + SET_USERINFO: (state, userInfo) => { + state.userInfo = userInfo } } @@ -67,6 +71,7 @@ const actions = { commit('SET_NAME', nickname) commit('SET_AVATAR', avatar) commit('SET_USERId', primaryKey) + commit('SET_USERINFO', data) resolve(data) }).catch(error => { reject(error) diff --git a/src/views/forceNotice/force/list.vue b/src/views/forceNotice/force/list.vue index 9812797..525e820 100644 --- a/src/views/forceNotice/force/list.vue +++ b/src/views/forceNotice/force/list.vue @@ -152,7 +152,10 @@ export default { span: 6, tableProps: { width: '200px', - showOverflowTooltip: true + showOverflowTooltip: true, + formatter: (row, column, cellValue, index) => { + return `${row.busName || row.entName}` + } }, showInTable: () => { return this.type === 'history' diff --git a/src/views/forceNotice/inclusion/list.vue b/src/views/forceNotice/inclusion/list.vue index 51c1e42..31bacf3 100644 --- a/src/views/forceNotice/inclusion/list.vue +++ b/src/views/forceNotice/inclusion/list.vue @@ -197,7 +197,7 @@ export default { { type: 'input', label: '主体名称', - prop: 'entname', + prop: 'entName', span: 6, tableProps: { width: '200px',