Compare commits
2 Commits
6c20233d45
...
d7df1dea57
| Author | SHA1 | Date | |
|---|---|---|---|
| d7df1dea57 | |||
| b6e3ea76fa |
@ -11,8 +11,8 @@ class PermissionService:
|
|||||||
获取完整的权限树(菜单嵌套菜单 + 菜单包含元素)
|
获取完整的权限树(菜单嵌套菜单 + 菜单包含元素)
|
||||||
供前端权限配置页面展示
|
供前端权限配置页面展示
|
||||||
"""
|
"""
|
||||||
# 1. 获取所有菜单 (按 parent_id 和 sort_order 排序,保证父子处理顺序)
|
# 1. 获取所有可见菜单 (按 parent_id 和 sort_order 排序,保证父子处理顺序)
|
||||||
menus = SysMenu.query.order_by(SysMenu.parent_id, SysMenu.sort_order).all()
|
menus = SysMenu.query.filter(SysMenu.is_visible == True).order_by(SysMenu.parent_id, SysMenu.sort_order).all()
|
||||||
# 2. 获取所有元素
|
# 2. 获取所有元素
|
||||||
elements = SysElement.query.all()
|
elements = SysElement.query.all()
|
||||||
|
|
||||||
@ -64,8 +64,8 @@ class PermissionService:
|
|||||||
try:
|
try:
|
||||||
# === 新增逻辑:超级管理员上帝模式 ===
|
# === 新增逻辑:超级管理员上帝模式 ===
|
||||||
if role_code == 'SUPER_ADMIN':
|
if role_code == 'SUPER_ADMIN':
|
||||||
# 直接获取所有菜单和元素,无视配置表
|
# 直接获取所有可见菜单和元素,无视配置表
|
||||||
all_menus = [m.code for m in SysMenu.query.all()]
|
all_menus = [m.code for m in SysMenu.query.filter(SysMenu.is_visible == True).all()]
|
||||||
all_elements = [e.code for e in SysElement.query.all()]
|
all_elements = [e.code for e in SysElement.query.all()]
|
||||||
return {
|
return {
|
||||||
'menus': all_menus,
|
'menus': all_menus,
|
||||||
|
|||||||
@ -1299,13 +1299,8 @@ watch(() => [form.in_quantity, form.unit_price], () => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// 联动优化:当入库数量变化时,自动同步打印份数(除非用户已手动修改过)
|
// 注意:入库数量和打印份数现在是独立的字段,不再自动同步
|
||||||
watch(() => form.in_quantity, (newQty) => {
|
// 用户可以单独设置打印份数,与入库数量无关
|
||||||
if (dialogStatus.value === 'create' && newQty && newQty > 0) {
|
|
||||||
// 仅在创建模式下自动同步
|
|
||||||
form.print_copies = newQty
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
const fetchData = async () => {
|
const fetchData = async () => {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
|
|||||||
Reference in New Issue
Block a user