Merge branch 'master' of https://gitee.com/beiwu/cmanager
This commit is contained in:
@@ -1,227 +1,259 @@
|
|||||||
import {setToken, setRefreshToken, removeToken, removeRefreshToken} from '@/util/auth'
|
import {
|
||||||
import {Message} from 'element-ui'
|
setToken,
|
||||||
import {setStore, getStore} from '@/util/store'
|
setRefreshToken,
|
||||||
import {isURL, validatenull} from '@/util/validate'
|
removeToken,
|
||||||
import {deepClone} from '@/util/util'
|
removeRefreshToken,
|
||||||
import website from '@/config/website'
|
} from "@/util/auth";
|
||||||
import {loginByUsername, getUserInfo, logout, refreshToken, getButtons} from '@/api/user'
|
import { Message } from "element-ui";
|
||||||
import {getTopMenu, getRoutes} from '@/api/system/menu'
|
import { setStore, getStore } from "@/util/store";
|
||||||
import md5 from 'js-md5'
|
import { isURL, validatenull } from "@/util/validate";
|
||||||
|
import { deepClone } from "@/util/util";
|
||||||
|
import website from "@/config/website";
|
||||||
|
import {
|
||||||
|
loginByUsername,
|
||||||
|
getUserInfo,
|
||||||
|
logout,
|
||||||
|
refreshToken,
|
||||||
|
getButtons,
|
||||||
|
} from "@/api/user";
|
||||||
|
import { getTopMenu, getRoutes } from "@/api/system/menu";
|
||||||
|
import md5 from "js-md5";
|
||||||
|
|
||||||
function addPath(ele, first) {
|
function addPath(ele, first) {
|
||||||
const menu = website.menu;
|
const menu = website.menu;
|
||||||
const propsConfig = menu.props;
|
const propsConfig = menu.props;
|
||||||
const propsDefault = {
|
const propsDefault = {
|
||||||
label: propsConfig.label || 'name',
|
label: propsConfig.label || "name",
|
||||||
path: propsConfig.path || 'path',
|
path: propsConfig.path || "path",
|
||||||
icon: propsConfig.icon || 'icon',
|
icon: propsConfig.icon || "icon",
|
||||||
children: propsConfig.children || 'children'
|
children: propsConfig.children || "children",
|
||||||
}
|
};
|
||||||
const icon = ele[propsDefault.icon];
|
const icon = ele[propsDefault.icon];
|
||||||
ele[propsDefault.icon] = validatenull(icon) ? menu.iconDefault : icon;
|
ele[propsDefault.icon] = validatenull(icon) ? menu.iconDefault : icon;
|
||||||
const isChild = ele[propsDefault.children] && ele[propsDefault.children].length !== 0;
|
const isChild =
|
||||||
|
ele[propsDefault.children] && ele[propsDefault.children].length !== 0;
|
||||||
if (!isChild) ele[propsDefault.children] = [];
|
if (!isChild) ele[propsDefault.children] = [];
|
||||||
if (!isChild && first && !isURL(ele[propsDefault.path])) {
|
if (!isChild && first && !isURL(ele[propsDefault.path])) {
|
||||||
ele[propsDefault.path] = ele[propsDefault.path] + '/index'
|
ele[propsDefault.path] = ele[propsDefault.path] + "/index";
|
||||||
} else {
|
} else {
|
||||||
ele[propsDefault.children].forEach(child => {
|
ele[propsDefault.children].forEach((child) => {
|
||||||
addPath(child);
|
addPath(child);
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const user = {
|
const user = {
|
||||||
state: {
|
state: {
|
||||||
tenantId: getStore({name: 'tenantId'}) || '',
|
tenantId: getStore({ name: "tenantId" }) || "",
|
||||||
userInfo: getStore({name: 'userInfo'}) || [],
|
userInfo: getStore({ name: "userInfo" }) || [],
|
||||||
permission: getStore({name: 'permission'}) || {},
|
permission: getStore({ name: "permission" }) || {},
|
||||||
roles: [],
|
roles: [],
|
||||||
menu: getStore({name: 'menu'}) || [],
|
menu: getStore({ name: "menu" }) || [],
|
||||||
menuId: getStore({name: 'menuId'}) || [],
|
menuId: getStore({ name: "menuId" }) || [],
|
||||||
menuAll: getStore({name: 'menuAll'}) || [],
|
menuAll: getStore({ name: "menuAll" }) || [],
|
||||||
token: getStore({name: 'token'}) || '',
|
token: getStore({ name: "token" }) || "",
|
||||||
refreshToken: getStore({name: 'refreshToken'}) || '',
|
refreshToken: getStore({ name: "refreshToken" }) || "",
|
||||||
auth: getStore({name: 'auth'}) || '',
|
auth: getStore({ name: "auth" }) || "",
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
//根据用户名登录
|
//根据用户名登录
|
||||||
LoginByUsername({commit}, userInfo) {
|
LoginByUsername({ commit }, userInfo) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
loginByUsername(userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key, userInfo.code,userInfo.loginType).then(res => {
|
loginByUsername(
|
||||||
const data = res.data;
|
userInfo.username,
|
||||||
if (data.error_description) {
|
md5(userInfo.password),
|
||||||
Message({
|
userInfo.type,
|
||||||
message: data.error_description,
|
userInfo.key,
|
||||||
type: 'error'
|
userInfo.code,
|
||||||
})
|
userInfo.loginType
|
||||||
} else {
|
)
|
||||||
// 判断是否为客服
|
.then((res) => {
|
||||||
data.is_admin = data.role_name === 'operate' || data.role_name === 'muser'
|
const data = res.data;
|
||||||
// 判断是否为管理员账号
|
if (data.error_description) {
|
||||||
data.is_master = ['administrator','admin','operate'].includes(data.role_name)
|
Message({
|
||||||
commit('SET_AUTH', data.auth);
|
message: data.error_description,
|
||||||
commit('SET_TOKEN', data.access_token);
|
type: "error",
|
||||||
commit('SET_REFRESH_TOKEN', data.refresh_token);
|
});
|
||||||
commit('SET_TENANT_ID', data.tenant_id);
|
} else {
|
||||||
commit('SET_USER_INFO', data);
|
// 判断是否为客服
|
||||||
commit('DEL_ALL_TAG');
|
data.is_admin =
|
||||||
commit('CLEAR_LOCK');
|
data.role_name === "operate" || data.role_name === "muser";
|
||||||
}
|
// 判断是否为管理员账号
|
||||||
resolve();
|
data.is_master = ["administrator", "admin", "operate"].includes(
|
||||||
}).catch(error => {
|
data.role_name
|
||||||
reject(error);
|
);
|
||||||
})
|
commit("SET_AUTH", data.auth);
|
||||||
})
|
commit("SET_TOKEN", data.access_token);
|
||||||
|
commit("SET_REFRESH_TOKEN", data.refresh_token);
|
||||||
|
commit("SET_TENANT_ID", data.tenant_id);
|
||||||
|
commit("SET_USER_INFO", data);
|
||||||
|
commit("DEL_ALL_TAG");
|
||||||
|
commit("CLEAR_LOCK");
|
||||||
|
}
|
||||||
|
resolve();
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
reject(error);
|
||||||
|
});
|
||||||
|
});
|
||||||
},
|
},
|
||||||
GetButtons({commit}) {
|
GetButtons({ commit }) {
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
getButtons().then(res => {
|
getButtons().then((res) => {
|
||||||
const data = res.data.data;
|
const data = res.data.data;
|
||||||
commit('SET_PERMISSION', data);
|
commit("SET_PERMISSION", data);
|
||||||
resolve();
|
resolve();
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
//根据手机号登录
|
//根据手机号登录
|
||||||
LoginByPhone({commit}, userInfo) {
|
LoginByPhone({ commit }, userInfo) {
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
loginByUsername(userInfo.phone, userInfo.code).then(res => {
|
loginByUsername(userInfo.phone, userInfo.code).then((res) => {
|
||||||
const data = res.data.data;
|
const data = res.data.data;
|
||||||
commit('SET_TOKEN', data);
|
commit("SET_TOKEN", data);
|
||||||
commit('DEL_ALL_TAG');
|
commit("DEL_ALL_TAG");
|
||||||
commit('CLEAR_LOCK');
|
commit("CLEAR_LOCK");
|
||||||
resolve();
|
resolve();
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
GetUserInfo({commit}) {
|
GetUserInfo({ commit }) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
getUserInfo().then((res) => {
|
getUserInfo()
|
||||||
const data = res.data.data;
|
.then((res) => {
|
||||||
commit('SET_ROLES', data.roles);
|
const data = res.data.data;
|
||||||
resolve(data);
|
commit("SET_ROLES", data.roles);
|
||||||
}).catch(err => {
|
resolve(data);
|
||||||
reject(err);
|
})
|
||||||
})
|
.catch((err) => {
|
||||||
})
|
reject(err);
|
||||||
|
});
|
||||||
|
});
|
||||||
},
|
},
|
||||||
//刷新token
|
//刷新token
|
||||||
refreshToken({state, commit}) {
|
refreshToken({ state, commit }) {
|
||||||
window.console.log('handle refresh token')
|
window.console.log("handle refresh token");
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
var authType = state.userInfo.login_type;
|
var authType = state.userInfo.login_type;
|
||||||
refreshToken(state.refreshToken, state.tenantId, authType).then(res => {
|
refreshToken(state.refreshToken, state.tenantId, authType)
|
||||||
const data = res.data;
|
.then((res) => {
|
||||||
commit('SET_TOKEN', data.access_token);
|
const data = res.data;
|
||||||
commit('SET_REFRESH_TOKEN', data.refresh_token);
|
commit("SET_TOKEN", data.access_token);
|
||||||
resolve();
|
commit("SET_REFRESH_TOKEN", data.refresh_token);
|
||||||
}).catch(error => {
|
resolve();
|
||||||
reject(error)
|
})
|
||||||
})
|
.catch((error) => {
|
||||||
})
|
reject(error);
|
||||||
|
});
|
||||||
|
});
|
||||||
},
|
},
|
||||||
// 登出
|
// 登出
|
||||||
LogOut({commit}) {
|
LogOut({ commit }) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
logout().then(() => {
|
logout()
|
||||||
commit('SET_AUTH', '');
|
.then(() => {
|
||||||
commit('SET_TOKEN', '');
|
commit("SET_AUTH", "");
|
||||||
commit('SET_MENU', []);
|
commit("SET_TOKEN", "");
|
||||||
commit('SET_MENU_ID', {});
|
commit("SET_MENU", []);
|
||||||
commit('SET_MENU_ALL', []);
|
commit("SET_MENU_ID", {});
|
||||||
commit('SET_ROLES', []);
|
commit("SET_MENU_ALL", []);
|
||||||
commit('DEL_ALL_TAG');
|
commit("SET_ROLES", []);
|
||||||
commit('CLEAR_LOCK');
|
commit("DEL_ALL_TAG");
|
||||||
commit('RESET_CONFIG');
|
commit("CLEAR_LOCK");
|
||||||
removeToken();
|
commit("RESET_CONFIG");
|
||||||
removeRefreshToken();
|
removeToken();
|
||||||
resolve();
|
removeRefreshToken();
|
||||||
}).catch(error => {
|
resolve();
|
||||||
reject(error)
|
})
|
||||||
})
|
.catch((error) => {
|
||||||
})
|
reject(error);
|
||||||
|
});
|
||||||
|
});
|
||||||
},
|
},
|
||||||
//注销session
|
//注销session
|
||||||
FedLogOut({commit}) {
|
FedLogOut({ commit }) {
|
||||||
return new Promise(resolve => {
|
return new Promise((resolve) => {
|
||||||
commit('SET_TOKEN', '');
|
commit("SET_TOKEN", "");
|
||||||
commit('SET_MENU_ID', {});
|
commit("SET_MENU_ID", {});
|
||||||
commit('SET_MENU_ALL', []);
|
commit("SET_MENU_ALL", []);
|
||||||
commit('SET_MENU', []);
|
commit("SET_MENU", []);
|
||||||
commit('SET_ROLES', []);
|
commit("SET_ROLES", []);
|
||||||
commit('DEL_ALL_TAG');
|
commit("DEL_ALL_TAG");
|
||||||
commit('CLEAR_LOCK');
|
commit("CLEAR_LOCK");
|
||||||
removeToken();
|
removeToken();
|
||||||
removeRefreshToken();
|
removeRefreshToken();
|
||||||
resolve();
|
resolve();
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
//获取顶部菜单
|
//获取顶部菜单
|
||||||
GetTopMenu() {
|
GetTopMenu() {
|
||||||
return new Promise(resolve => {
|
return new Promise((resolve) => {
|
||||||
getTopMenu().then((res) => {
|
getTopMenu().then((res) => {
|
||||||
const data = res.data.data || [];
|
const data = res.data.data || [];
|
||||||
resolve(data)
|
resolve(data);
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
//获取系统菜单
|
//获取系统菜单
|
||||||
GetMenu({commit, dispatch}, topMenuId) {
|
GetMenu({ commit, dispatch }, topMenuId) {
|
||||||
return new Promise(resolve => {
|
return new Promise((resolve) => {
|
||||||
getRoutes(topMenuId).then((res) => {
|
getRoutes(topMenuId).then((res) => {
|
||||||
const data = res.data.data
|
const data = res.data.data;
|
||||||
let menu = deepClone(data);
|
let menu = deepClone(data);
|
||||||
menu.forEach(ele => {
|
menu.forEach((ele) => {
|
||||||
addPath(ele, true);
|
addPath(ele, true);
|
||||||
});
|
});
|
||||||
commit('SET_MENU', menu)
|
commit("SET_MENU", menu);
|
||||||
dispatch('GetButtons');
|
dispatch("GetButtons");
|
||||||
resolve(menu)
|
resolve(menu);
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mutations: {
|
mutations: {
|
||||||
SET_TOKEN: (state, token) => {
|
SET_TOKEN: (state, token) => {
|
||||||
setToken(token);
|
setToken(token);
|
||||||
state.token = token;
|
state.token = token;
|
||||||
setStore({name: 'token', content: state.token, type: 'session'})
|
setStore({ name: "token", content: state.token, type: "session" });
|
||||||
},
|
},
|
||||||
SET_MENU_ID(state, menuId) {
|
SET_MENU_ID(state, menuId) {
|
||||||
state.menuId = menuId;
|
state.menuId = menuId;
|
||||||
setStore({name: 'menuId', content: state.menuId, type: 'session'})
|
setStore({ name: "menuId", content: state.menuId, type: "session" });
|
||||||
},
|
},
|
||||||
SET_MENU_ALL: (state, menuAll) => {
|
SET_MENU_ALL: (state, menuAll) => {
|
||||||
state.menuAll = menuAll
|
state.menuAll = menuAll;
|
||||||
setStore({name: 'menuAll', content: state.menuAll, type: 'session'})
|
setStore({ name: "menuAll", content: state.menuAll, type: "session" });
|
||||||
},
|
},
|
||||||
SET_REFRESH_TOKEN: (state, refreshToken) => {
|
SET_REFRESH_TOKEN: (state, refreshToken) => {
|
||||||
setRefreshToken(refreshToken)
|
setRefreshToken(refreshToken);
|
||||||
state.refreshToken = refreshToken;
|
state.refreshToken = refreshToken;
|
||||||
setStore({name: 'refreshToken', content: state.refreshToken, type: 'session'})
|
setStore({
|
||||||
|
name: "refreshToken",
|
||||||
|
content: state.refreshToken,
|
||||||
|
type: "session",
|
||||||
|
});
|
||||||
},
|
},
|
||||||
SET_TENANT_ID: (state, tenantId) => {
|
SET_TENANT_ID: (state, tenantId) => {
|
||||||
state.tenantId = tenantId;
|
state.tenantId = tenantId;
|
||||||
setStore({name: 'tenantId', content: state.tenantId, type: 'session'})
|
setStore({ name: "tenantId", content: state.tenantId, type: "session" });
|
||||||
},
|
},
|
||||||
SET_USER_INFO: (state, userInfo) => {
|
SET_USER_INFO: (state, userInfo) => {
|
||||||
state.userInfo = userInfo;
|
state.userInfo = userInfo;
|
||||||
setStore({name: 'userInfo', content: state.userInfo})
|
setStore({ name: "userInfo", content: state.userInfo });
|
||||||
},
|
},
|
||||||
SET_MENU: (state, menu) => {
|
SET_MENU: (state, menu) => {
|
||||||
state.menu = menu;
|
state.menu = menu;
|
||||||
let menuAll = state.menuAll;
|
let menuAll = state.menuAll;
|
||||||
if (!validatenull(menu)) {
|
if (!validatenull(menu)) {
|
||||||
const obj = menuAll.filter(ele => ele.path === menu[0].path)[0];
|
const obj = menuAll.filter((ele) => ele.path === menu[0].path)[0];
|
||||||
if (!obj) {
|
if (!obj) {
|
||||||
menuAll = menuAll.concat(menu);
|
menuAll = menuAll.concat(menu);
|
||||||
state.menuAll = menuAll
|
state.menuAll = menuAll;
|
||||||
}
|
}
|
||||||
setStore({name: 'menuAll', content: menuAll, type: 'session'})
|
setStore({ name: "menuAll", content: menuAll, type: "session" });
|
||||||
}
|
}
|
||||||
setStore({name: 'menu', content: state.menu, type: 'session'})
|
setStore({ name: "menu", content: state.menu, type: "session" });
|
||||||
},
|
},
|
||||||
SET_ROLES: (state, roles) => {
|
SET_ROLES: (state, roles) => {
|
||||||
state.roles = roles;
|
state.roles = roles;
|
||||||
@@ -230,31 +262,34 @@ const user = {
|
|||||||
let result = [];
|
let result = [];
|
||||||
|
|
||||||
function getCode(list) {
|
function getCode(list) {
|
||||||
list.forEach(ele => {
|
list.forEach((ele) => {
|
||||||
if (typeof (ele) === 'object') {
|
if (typeof ele === "object") {
|
||||||
const chiildren = ele.children;
|
const chiildren = ele.children;
|
||||||
const code = ele.code;
|
const code = ele.code;
|
||||||
if (chiildren) {
|
if (chiildren) {
|
||||||
getCode(chiildren)
|
getCode(chiildren);
|
||||||
} else {
|
} else {
|
||||||
result.push(code);
|
result.push(code);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
getCode(permission);
|
getCode(permission);
|
||||||
state.permission = {};
|
state.permission = {};
|
||||||
result.forEach(ele => {
|
result.forEach((ele) => {
|
||||||
state.permission[ele] = true;
|
state.permission[ele] = true;
|
||||||
});
|
});
|
||||||
setStore({name: 'permission', content: state.permission, type: 'session'})
|
setStore({
|
||||||
|
name: "permission",
|
||||||
|
content: state.permission,
|
||||||
|
type: "session",
|
||||||
|
});
|
||||||
},
|
},
|
||||||
SET_AUTH(state, auth){
|
SET_AUTH(state, auth) {
|
||||||
state.auth = auth
|
state.auth = auth;
|
||||||
setStore({name: 'auth', content: auth, type: 'session'})
|
setStore({ name: "auth", content: auth, type: "session" });
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
|
};
|
||||||
}
|
export default user;
|
||||||
export default user
|
|
||||||
|
|||||||
@@ -33,9 +33,10 @@
|
|||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</el-tree>
|
</el-tree>
|
||||||
|
<!-- v-show="vaildData(permission.tenant_wage_payroll_view, false)" -->
|
||||||
|
|
||||||
<div class="footer" style="padding-left: 6px">
|
<div class="footer" style="padding-left: 6px">
|
||||||
<el-button type="text" icon="el-icon-plus" @click="updateGroups('add')"
|
<el-button type="text" icon="el-icon-plus" @click="updateGroups('add')">
|
||||||
v-show="vaildData(permission.tenant_wage_payroll_view, false)">
|
|
||||||
新建分组</el-button>
|
新建分组</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-scrollbar>
|
</el-scrollbar>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user