feat(oa): 完成审批历史页面全链路开发，含前后端接口、菜单配置

ruoyi-ui/src/permission.js

@@ -1,12 +1,12 @@
 import router from './router'
 import store from './store'
-import {Message} from 'element-ui'
+import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import {getToken} from '@/utils/auth'
-import {isRelogin} from '@/utils/request'
+import { getToken } from '@/utils/auth'
+import { isRelogin } from '@/utils/request'
 
-NProgress.configure({showSpinner: false})
+NProgress.configure({ showSpinner: false })
 
 const whiteList = ['/login', '/register']
 
@@ -14,25 +14,32 @@ router.beforeEach((to, from, next) => {
   NProgress.start()
   if (getToken()) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
-    /* has token*/
     if (to.path === '/login') {
-      next({path: '/'})
+      next({ path: '/' })
       NProgress.done()
     } else {
       if (store.getters.roles.length === 0) {
         isRelogin.show = true
-        // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(res => {
           isRelogin.show = false
           store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({...to, replace: true}) // hack方法 确保addRoutes已完成
+
+            const officeMenu = accessRoutes.find(m => m.path === '/oa')
+            if (officeMenu) {
+              const staticOa = router.options.routes.find(r => r.path === '/oa')
+              const historyMenu = staticOa?.children?.find(c => c.name === 'ApprovalHistory')
+              if (historyMenu) {
+                officeMenu.children.push(historyMenu)
+              }
+            }
+
+            router.addRoutes(accessRoutes)
+            next({ ...to, replace: true })
           })
         }).catch(err => {
           store.dispatch('LogOut').then(() => {
             Message.error(err)
-            next({path: '/'})
+            next({ path: '/' })
           })
         })
       } else {
@@ -40,12 +47,10 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
-    // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录白名单，直接进入
       next()
     } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      next(`/login?redirect=${to.fullPath}`)
       NProgress.done()
     }
   }
@@ -53,4 +58,4 @@ router.beforeEach((to, from, next) => {
 
 router.afterEach(() => {
   NProgress.done()
-})
+})