feat: 完成产线与仓储系统多模块迭代升级
本次迭代覆盖MES与WMS核心业务: 1. 新增接驳台托盘传感器读取与AGV对接能力 2. 完善工单排产、备料流程与权限体系拆分 3. 优化看板接口与前端路由、样式 4. 新增操作日志、库存盘点与角色保护逻辑 5. 修复代理地址、BOM保存等已知问题
This commit is contained in:
@@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import {
|
||||
HomeFilled, Download, Upload, Search, CircleCheck, List,
|
||||
Box, Tickets, Monitor, EditPen, Fold, Expand, Location, Goods, Key
|
||||
Box, Tickets, Monitor, EditPen, Fold, Expand, Location, Goods, Key, Operation, Van
|
||||
} from '@element-plus/icons-vue'
|
||||
import { getUser, getToken, logout, setSession } from '../utils/auth'
|
||||
import request from '../utils/request'
|
||||
@@ -66,26 +66,68 @@ onMounted(() => {
|
||||
})
|
||||
onBeforeUnmount(() => window.removeEventListener('resize', onScreenChange))
|
||||
|
||||
const defaultMenus = [
|
||||
{ path: '/', title: '工作台', icon: HomeFilled, code: 'dashboard:view' },
|
||||
{ path: '/inbound', title: '入库管理', icon: Download, code: 'inbound:view' },
|
||||
{ path: '/outbound', title: '出库管理', icon: Upload, code: 'outbound:view' },
|
||||
{ path: '/inventory', title: '库存查询', icon: Search, code: 'inventory:view' },
|
||||
{ path: '/inspection', title: '质量检验', icon: CircleCheck, code: 'inspection:view' },
|
||||
{ path: '/stocktake', title: '库存盘点', icon: List, code: 'stocktake:view' },
|
||||
{ path: '/semi', title: '半成品/成品', icon: Box, code: 'semi:view' },
|
||||
{ path: '/ledger', title: '备料台账', icon: Tickets, code: 'ledger:view' },
|
||||
{ path: '/zone', title: '区域维护', icon: Location, code: 'zone:view' },
|
||||
{ path: '/material', title: '物料档案', icon: Goods, code: 'material:view' },
|
||||
{ path: '/users', title: '账号管理', icon: EditPen, code: 'user:manage' },
|
||||
{ path: '/roles', title: '角色管理', icon: Key, code: 'role:manage' }
|
||||
// 侧栏菜单:按业务域分组。分组无权限码,子项各自带 code(无 code 的常驻),
|
||||
// 组内子项全部被过滤掉则整组隐藏。
|
||||
const topMenu = { path: '/', title: '工作台', icon: HomeFilled, code: 'dashboard:view' }
|
||||
|
||||
const menuGroups = [
|
||||
{
|
||||
title: '库存管理', icon: Box, children: [
|
||||
{ path: '/inventory', title: '库存查询', icon: Search, code: 'inventory:view' },
|
||||
{ path: '/stocktake', title: '库存盘点', icon: List, code: 'stocktake:view' },
|
||||
{ path: '/semi', title: '半成品管理', icon: Box, code: 'semi:view' },
|
||||
{ path: '/ledger', title: '工单备料台账', icon: Tickets, code: 'ledger:view' },
|
||||
{ path: '/agv', title: 'AGV配送', icon: Van, code: 'agv:manage' }
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '仓储作业', icon: Operation, children: [
|
||||
{ path: '/inbound', title: '入库管理', icon: Download, code: 'inbound:view' },
|
||||
{ path: '/outbound', title: '出库管理', icon: Upload, code: 'outbound:view' },
|
||||
{ path: '/inspection', title: '质量检验', icon: CircleCheck, code: 'inspection:view' }
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '基础资料', icon: Goods, children: [
|
||||
{ path: '/material', title: '物料档案', icon: Goods, code: 'material:view' },
|
||||
{ path: '/zone', title: '区域维护', icon: Location, code: 'zone:view' }
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '系统管理', icon: Key, children: [
|
||||
{ path: '/users', title: '账号管理', icon: EditPen, code: 'user:manage' },
|
||||
{ path: '/roles', title: '角色管理', icon: Key, code: 'role:manage' },
|
||||
{ path: '/event-log', title: '操作日志', icon: Clock, code: 'eventlog:manage' }
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
// 按当前用户权限码过滤菜单(无 code 的常驻;user:manage 仅管理员可见)
|
||||
// 按当前用户权限码过滤(无 code 常驻;user:manage 仅管理员可见)
|
||||
const showTopMenu = computed(() => !topMenu.code || permissionCodes.value.includes(topMenu.code))
|
||||
const menus = computed(() =>
|
||||
defaultMenus.filter((m) => !m.code || permissionCodes.value.includes(m.code))
|
||||
menuGroups
|
||||
.map((g) => ({
|
||||
...g,
|
||||
children: g.children.filter((m) => !m.code || permissionCodes.value.includes(m.code))
|
||||
}))
|
||||
.filter((g) => g.children.length > 0)
|
||||
)
|
||||
|
||||
// 默认展开的分组:除「系统管理」外全部展开(用户偏好:一进系统即可见全部菜单)
|
||||
const defaultOpeneds = computed(() =>
|
||||
menus.value
|
||||
.filter((g) => g.title !== '系统管理')
|
||||
.map((g) => 'group:' + g.title)
|
||||
)
|
||||
|
||||
// 折叠 → 展开时重挂载菜单,使 default-openeds 重新生效。
|
||||
// Element Plus 折叠时会清空内部 openedMenus 且展开时不恢复(menu 源码 watch(collapse) 只做清空),
|
||||
// 而 default-openeds 仅在菜单实例初始化时读取一次——故用 key 变化强制重建实例,必达默认展开态。
|
||||
const menuKey = ref(0)
|
||||
watch(isCollapse, (collapsed) => {
|
||||
if (!collapsed) menuKey.value++
|
||||
})
|
||||
|
||||
// keep-alive 缓存列表页组件:从路由 meta.keepAlive 收集组件名
|
||||
// (返回列表页时保留筛选/页码/已加载数据,避免重复请求)
|
||||
const cachedNames = computed(() => {
|
||||
@@ -127,13 +169,23 @@ function onLogout() {
|
||||
<el-icon :size="22"><Box /></el-icon>
|
||||
<span v-show="!isCollapse">库房客户端</span>
|
||||
</div>
|
||||
<el-menu :default-active="route.path" class="menu" background-color="#001529"
|
||||
text-color="#c2cad8" active-text-color="#ffffff" router
|
||||
<el-menu :key="menuKey" :default-active="route.path" :default-openeds="defaultOpeneds" class="menu"
|
||||
background-color="#001529" text-color="#c2cad8" active-text-color="#ffffff" router
|
||||
:collapse="isCollapse && !isMobile">
|
||||
<el-menu-item v-for="m in menus" :key="m.path" :index="m.path">
|
||||
<el-icon><component :is="m.icon" /></el-icon>
|
||||
<span>{{ m.title }}</span>
|
||||
<el-menu-item v-if="showTopMenu" :index="topMenu.path">
|
||||
<el-icon><component :is="topMenu.icon" /></el-icon>
|
||||
<span>{{ topMenu.title }}</span>
|
||||
</el-menu-item>
|
||||
<el-sub-menu v-for="g in menus" :key="g.title" :index="'group:' + g.title">
|
||||
<template #title>
|
||||
<el-icon><component :is="g.icon" /></el-icon>
|
||||
<span>{{ g.title }}</span>
|
||||
</template>
|
||||
<el-menu-item v-for="m in g.children" :key="m.path" :index="m.path">
|
||||
<el-icon><component :is="m.icon" /></el-icon>
|
||||
<span>{{ m.title }}</span>
|
||||
</el-menu-item>
|
||||
</el-sub-menu>
|
||||
</el-menu>
|
||||
</el-aside>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user