Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-05-07 74ed0e73c78c8f6332bbdc29b541437acb07b8f7

 north-glass-erp/northglass-erp/src/router/index.js

@@ -21,6 +21,42 @@
      name: 'main',
      component: () => import('../layout/MainErpView.vue'),
      children:[
          //user模块
        {
          path:'user',
          name: 'user',
          component: () => import('../views/system/user/User.vue'),
          children:[
            {
              path: 'userList',
              name: 'userList',
              component: () => import('../views/system/user/UserList.vue')
            },
            {
              name:'user',
              path: '',
              redirect:'/main/user/userList'
            }
          ]
        },
        {
          path:'role',
          name: 'role',
          component: () => import('../views/system/role/Role.vue'),
          children:[
            {
              path: 'roleList',
              name: 'roleList',
              component: () => import('../views/system/role/RoleList.vue')
            },
            {
              name:'role',
              path: '',
              redirect:'/main/role/roleList'
            }
          ]
        },

          //sd模块
        {
          path:'orderBasicData',
@@ -108,7 +144,7 @@
            },
            {
              path: '',
              redirect:'/main/order/SelectOrder'
              redirect:'/main/order/selectOrder'
            }
          ]
        },