用户信息获取变动，出库功能变动

store/getters.js

@@ -2,6 +2,8 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  nickName: state => state.user.nickName,
+  deptName: state => state.user.deptName,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions
 }

store/modules/user.js

@@ -20,7 +20,9 @@ const user = {
 		name: storage.get(constant.name),
 		avatar: storage.get(constant.avatar),
 		roles: storage.get(constant.roles),
-		permissions: storage.get(constant.permissions)
+		permissions: storage.get(constant.permissions),
+		nickName: storage.get(constant.nickName),
+		deptName: storage.get(constant.deptName)
 	},
 
 	mutations: {
@@ -42,7 +44,15 @@ const user = {
 		SET_PERMISSIONS: (state, permissions) => {
 			state.permissions = permissions
 			storage.set(constant.permissions, permissions)
-		}
+		},
+		SET_NICKNAME: (state, nickName) => {
+			state.nickName = nickName
+			storage.set(constant.nickName, nickName)
+		},
+		SET_DEPTNAME: (state, deptName) => {
+			state.deptName = deptName
+			storage.set(constant.deptName, deptName)
+		},
 	},
 
 	actions: {
@@ -72,18 +82,23 @@ const user = {
 		}) {
 			return new Promise((resolve, reject) => {
 				getInfo().then(res => {
-					const user = res.user
+					const user = res.data.user
 					const avatar = (user == null || user.avatar == "" || user.avatar == null) ?
 						require("@/static/images/profile.jpg") : baseUrl + user.avatar
 					const username = (user == null || user.userName == "" || user.userName ==
 						null) ? "" : user.userName
-					if (res.roles && res.roles.length > 0) {
-						commit('SET_ROLES', res.roles)
-						commit('SET_PERMISSIONS', res.permissions)
+					const nickName = (user == null || user.nickName == "" || user.nickName ==
+						null) ? "" : user.nickName
+					const deptName = (user == null || user.deptName == "" || user.deptName ==
+						null) ? "" : user.deptName
+					if (user.roles && user.roles.length > 0) {
+						commit('SET_ROLES', user.roles)
+						commit('SET_PERMISSIONS', res.roleIds)
 					} else {
 						commit('SET_ROLES', ['ROLE_DEFAULT'])
 					}
-					console.log(res);
+					commit('SET_NICKNAME', user.nickName)
+					commit('SET_DEPTNAME', user.deptName)
 					commit('SET_NAME', username)
 					commit('SET_AVATAR', avatar)
 					resolve(res)