From df354b370285ba9bb145dbebf5c4b924f3317eff Mon Sep 17 00:00:00 2001 From: hrx <18603305412@163.com> Date: Tue, 18 Nov 2025 11:44:55 +0800 Subject: [PATCH 1/2] updata --- f/web-kboss/src/router/index.js | 2 +- f/web-kboss/src/store/getters.js | 2 + f/web-kboss/src/store/modules/permission.js | 60 +++++++++++++++------ f/web-kboss/src/store/modules/user.js | 36 ++++++++++--- 4 files changed, 76 insertions(+), 24 deletions(-) diff --git a/f/web-kboss/src/router/index.js b/f/web-kboss/src/router/index.js index 98cffb5..7896471 100644 --- a/f/web-kboss/src/router/index.js +++ b/f/web-kboss/src/router/index.js @@ -1089,7 +1089,7 @@ export const asyncRoutes = [ { path: "pendingPro", component: () => import("@/views/customer/approveMangement/pendingPro.vue"), - name: "pendingPro", + name: "pendingPro", meta: { title: "待审清单", fullPath: "/approveMangement/index" }, }, { diff --git a/f/web-kboss/src/store/getters.js b/f/web-kboss/src/store/getters.js index 0d6cfd8..a919d37 100644 --- a/f/web-kboss/src/store/getters.js +++ b/f/web-kboss/src/store/getters.js @@ -14,5 +14,7 @@ const getters = { permission_routes: state => state.permission.routes, userType: state => state.user.userType || sessionStorage.getItem('userType') || '', orgType: state => state.user.orgType || parseInt(sessionStorage.getItem('orgType')) || 0, + // 新增角色获取 + roles: state => state.user.roles || JSON.parse(sessionStorage.getItem('roles') || '[]'), } export default getters diff --git a/f/web-kboss/src/store/modules/permission.js b/f/web-kboss/src/store/modules/permission.js index 014e8f0..ce82e16 100644 --- a/f/web-kboss/src/store/modules/permission.js +++ b/f/web-kboss/src/store/modules/permission.js @@ -7,8 +7,16 @@ const userAgent = window.navigator.userAgent; const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(userAgent); // 修复：更全面的路由过滤逻辑 -function filterAsyncRoutes(routes, permissions) { +function filterAsyncRoutes(routes, permissions, userRoles = []) { const res = []; + + // 定义需要客户角色才能访问的路由 + const customerOnlyRoutes = [ + "/product", "/overview", "/workOrderManagement", + "/unsubscribeManagement", "/informationPerfect", + "/rechargeManagement", "/invoiceManagement" + ]; + routes.forEach(route => { // 创建路由副本 const tmpRoute = { ...route }; @@ -16,16 +24,21 @@ function filterAsyncRoutes(routes, permissions) { // 检查当前路由是否在权限列表中 const hasPermission = permissions.some(p => p.path === route.meta?.fullPath); - // 特殊处理：确保"全部产品"和"资源概览"这两个一级路由始终显示 - const isCriticalRoute = route.path === "/product" || route.path === "/overview"; + // 检查是否为仅客户可访问的路由 + const isCustomerOnlyRoute = customerOnlyRoutes.includes(route.path); - // 如果当前路由有权限或者是关键路由，则加入结果 - if (hasPermission || isCriticalRoute) { + // 如果路由需要客户角色，但用户不是客户，则跳过 + if (isCustomerOnlyRoute && !userRoles.includes('客户')) { + return; // 跳过当前路由 + } + + // 如果当前路由有权限，则加入结果 + if (hasPermission) { res.push(tmpRoute); } // 如果没有直接权限，但有子路由，递归处理子路由 else if (tmpRoute.children) { - const filteredChildren = filterAsyncRoutes(tmpRoute.children, permissions); + const filteredChildren = filterAsyncRoutes(tmpRoute.children, permissions, userRoles); if (filteredChildren.length > 0) { tmpRoute.children = filteredChildren; res.push(tmpRoute); // 即使父路由本身没有权限，只要有子路由有权限，也要保留父路由 @@ -37,8 +50,8 @@ function filterAsyncRoutes(routes, permissions) { } // 新增：为普通用户添加订单管理和资源管理路由 -function addUserRoutes(routes, userType, orgType) { - console.log("addUserRoutes - userType:", userType, "orgType:", orgType); +function addUserRoutes(routes, userType, orgType, userRoles = []) { + console.log("addUserRoutes - userType:", userType, "orgType:", orgType, "userRoles:", userRoles); const userRoutes = []; @@ -58,14 +71,17 @@ function addUserRoutes(routes, userType, orgType) { } } - // 新增：为所有用户添加五个新的客户菜单 + // 新增：为所有用户添加五个新的客户菜单，但只有客户角色才能看到 const newCustomerRoutes = [ routes.find(route => route.path === "/workOrderManagement"), routes.find(route => route.path === "/unsubscribeManagement"), routes.find(route => route.path === "/informationPerfect"), routes.find(route => route.path === "/rechargeManagement"), routes.find(route => route.path === "/invoiceManagement") - ].filter(route => route); // 过滤掉undefined + ].filter(route => { + // 过滤掉undefined，并且只有客户角色才能看到这些路由 + return route && userRoles.includes('客户'); + }); console.log("添加新的客户菜单路由:", newCustomerRoutes.map(r => r.path)); userRoutes.push(...newCustomerRoutes); @@ -121,7 +137,7 @@ const mutations = { }; const actions = { - generateRoutes({ commit }, params) { + generateRoutes({ commit, rootState }, params) { console.log("ACTION generateRoutes - params:", params); return new Promise((resolve) => { let accessedRoutes; @@ -130,6 +146,10 @@ const actions = { const userType = params.userType || sessionStorage.getItem('userType') || ''; const orgType = params.orgType || parseInt(sessionStorage.getItem('orgType')) || 0; + // 获取用户角色（从store或sessionStorage） + const userRoles = rootState.user.roles || JSON.parse(sessionStorage.getItem('roles') || '[]'); + console.log("用户角色:", userRoles); + console.log("用户类型:", userType, "orgType:", orgType); if (params.user && params.user.includes("admin") && orgType != 2) { @@ -150,8 +170,8 @@ const actions = { // 如果权限列表包含空路径，认为用户有所有权限 accessedRoutes = asyncRoutes || []; } else { - // 使用修复后的过滤函数 - accessedRoutes = filterAsyncRoutes(asyncRoutes, auths); + // 使用修复后的过滤函数，传入用户角色 + accessedRoutes = filterAsyncRoutes(asyncRoutes, auths, userRoles); } } else { // 如果没有权限列表，不显示任何动态路由 @@ -160,10 +180,20 @@ const actions = { // 新增：为普通用户添加订单管理和资源管理路由以及新的五个客户菜单 console.log("为用户添加特定路由"); - const userSpecificRoutes = addUserRoutes(asyncRoutes, userType, orgType); + const userSpecificRoutes = addUserRoutes(asyncRoutes, userType, orgType, userRoles); - // 确保不重复添加路由 + // 确保不重复添加路由，同时检查角色权限 userSpecificRoutes.forEach(route => { + const isCustomerRoute = [ + "/workOrderManagement", "/unsubscribeManagement", "/informationPerfect", + "/rechargeManagement", "/invoiceManagement" + ].includes(route.path); + + // 如果是客户路由但用户不是客户，则不添加 + if (isCustomerRoute && !userRoles.includes('客户')) { + return; + } + if (!accessedRoutes.some(r => r.path === route.path)) { accessedRoutes.push(route); } diff --git a/f/web-kboss/src/store/modules/user.js b/f/web-kboss/src/store/modules/user.js index b356a37..7cf77e2 100644 --- a/f/web-kboss/src/store/modules/user.js +++ b/f/web-kboss/src/store/modules/user.js @@ -14,7 +14,8 @@ const getStoredState = () => { auths: JSON.parse(sessionStorage.getItem('auths')) || [], userType: sessionStorage.getItem('userType') || '', orgType: parseInt(sessionStorage.getItem('orgType')) || '', - mybalance: sessionStorage.getItem('mybalance') || '' + mybalance: sessionStorage.getItem('mybalance') || '', + roles: JSON.parse(sessionStorage.getItem('roles')) || [] }; }; @@ -36,7 +37,9 @@ const state = { // 新增：用户类型（admin/user） userType: storedState.userType, // 新增：组织类型 - orgType: storedState.orgType + orgType: storedState.orgType, + // 新增：用户角色 + roles: storedState.roles }; const mutations = { @@ -76,6 +79,11 @@ const mutations = { SET_ORG_TYPE: (state, orgType) => { state.orgType = orgType; sessionStorage.setItem("orgType", orgType.toString()); + }, + // 新增：设置用户角色 + SET_ROLES: (state, roles) => { + state.roles = roles; + sessionStorage.setItem("roles", JSON.stringify(roles)); } }; @@ -83,7 +91,7 @@ const actions = { //客户获取余额 async getCustmoersMoney({commit}) { let result = await myBalanceAPI() - + if (result.status) { commit('SETMYBANLANCE', result.data) } @@ -105,12 +113,17 @@ const actions = { const {data, org_type} = response; commit("SET_USER", username); - // 新增：根据 org_type 设置用户类型 + // 新增：根据 org_type 设置用户类型和角色 // org_type 为 2 表示客户，其他为管理员 const userType = org_type == 2 ? 'user' : 'admin'; + // 设置用户角色 - 如果是客户，则添加'客户'角色 + const userRoles = org_type == 2 ? ['客户'] : ['管理员']; + commit("SET_USER_TYPE", userType); commit("SET_ORG_TYPE", org_type); - console.log("登录用户类型:", userType, "org_type:", org_type); + commit("SET_ROLES", userRoles); // 新增：设置用户角色 + + console.log("登录用户类型:", userType, "org_type:", org_type, "用户角色:", userRoles); data ? commit("SET_AUTHS", data) : commit("SET_AUTHS", []); const accessRoutes = await store.dispatch( @@ -119,7 +132,8 @@ const actions = { user: username, auths: data, userType: userType, - orgType: org_type + orgType: org_type, + roles: userRoles // 新增：传递角色信息 } ) resetRouter(); @@ -145,6 +159,7 @@ const actions = { const auths = sessionStorage.getItem('auths'); const userType = sessionStorage.getItem('userType'); const orgType = sessionStorage.getItem('orgType'); + const roles = sessionStorage.getItem('roles'); if (user) { commit("SET_USER", user); @@ -158,12 +173,16 @@ const actions = { if (orgType) { commit("SET_ORG_TYPE", parseInt(orgType)); } + if (roles) { + commit("SET_ROLES", JSON.parse(roles)); + } resolve({ user: state.user, auths: state.auths, userType: state.userType, - orgType: state.orgType + orgType: state.orgType, + roles: state.roles }); }); }, @@ -188,6 +207,7 @@ const actions = { sessionStorage.removeItem('userType'); sessionStorage.removeItem('orgType'); sessionStorage.removeItem('mybalance'); + sessionStorage.removeItem('roles'); // 新增：清除角色信息 // reset visited views and cached views // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485 @@ -218,6 +238,7 @@ const actions = { sessionStorage.removeItem('auths'); sessionStorage.removeItem('userType'); sessionStorage.removeItem('orgType'); + sessionStorage.removeItem('roles'); // 新增：清除角色信息 resolve(); }); }, @@ -250,5 +271,4 @@ export default { state, mutations, actions, - }; From 19e4a8276b2f86ed28faf8ead8ed965582e844d1 Mon Sep 17 00:00:00 2001 From: hrx <18603305412@163.com> Date: Tue, 18 Nov 2025 14:18:42 +0800 Subject: [PATCH 2/2] updata --- .../publicCostomerManagement/index.vue | 196 +++++++++++++----- 1 file changed, 144 insertions(+), 52 deletions(-) diff --git a/f/web-kboss/src/views/operation/publicCostomerManagement/index.vue b/f/web-kboss/src/views/operation/publicCostomerManagement/index.vue index e28d308..9fc720a 100644 --- a/f/web-kboss/src/views/operation/publicCostomerManagement/index.vue +++ b/f/web-kboss/src/views/operation/publicCostomerManagement/index.vue @@ -1,13 +1,69 @@