## 多租户公司数据隔离 - 新增 get_current_company_filter() 工具函数 (decorators.py) SUPER_ADMIN: 可传company_name参数过滤或传ALL看全量 其他角色: 强制隔离到JWT中的company_name - 重构 base_service.py / buy_service.py: 用集中式函数替换内联公司过滤 - SysRolePermission 表新增 company_name 字段,支持同角色不同公司权限 - get_user_permissions() 新增 company_name 参数,查公司定制+全局模板权限 - permission.py API 新增 @permission_required 拦截 + 公司过滤 - 19个API/service文件传递 company_name 到权限查询 ## 主管系统管理权限 - delete_user() 允许SUPERVISOR删除同公司用户 (原仅SUPER_ADMIN) - get_all_users() 新增 company_name 参数过滤 - 用户列表/权限分配 API 应用 get_current_company_filter() - 前端 UserCreate.vue: 超管可见公司下拉框,主管隐藏部门字段 ## 前端多租户适配 - material/list.vue / buy.vue: 公司下拉框仅超管可见,默认ALL - UserCreate.vue: 新增搜索栏公司筛选,部门字段按角色显隐 - auth.ts: getUserList() 支持 params 参数 ## Bug修复: 含税单价字段补齐 - buy.vue: 表格列/高级筛选/排序/权限映射新增 post_tax_unit_price - buy_service.py: allowed_fields/sort_field_map 新增 post_tax_unit_price
194 lines
6.8 KiB
Python
194 lines
6.8 KiB
Python
# inventory-backend/app/models/system.py
|
||
from app.extensions import db, beijing_time
|
||
from werkzeug.security import generate_password_hash, check_password_hash
|
||
from datetime import datetime
|
||
|
||
|
||
# ==========================================
|
||
# 1. 系统用户表
|
||
# ==========================================
|
||
class SysUser(db.Model):
|
||
"""
|
||
系统用户表
|
||
对应数据库: sys_user
|
||
username 字段存储格式约定: "真实姓名/登录账号" (例如: 张三/zhangsan01)
|
||
"""
|
||
__tablename__ = 'sys_user'
|
||
|
||
id = db.Column(db.Integer, primary_key=True)
|
||
username = db.Column(db.String(100), nullable=False) # 存储 "张三/zhangsan"
|
||
email = db.Column(db.String(100), unique=True)
|
||
department = db.Column(db.String(100))
|
||
role = db.Column(db.String(50))
|
||
status = db.Column(db.String(20), default='active')
|
||
password_hash = db.Column(db.Text)
|
||
created_at = db.Column(db.DateTime, default=beijing_time)
|
||
|
||
def set_password(self, password):
|
||
"""生成加密密码"""
|
||
self.password_hash = generate_password_hash(password)
|
||
|
||
def check_password(self, password):
|
||
"""验证密码"""
|
||
return check_password_hash(self.password_hash, password)
|
||
|
||
def to_dict(self):
|
||
"""
|
||
序列化为字典
|
||
数据库存的是 '张三/zhangsan'
|
||
前端需要的是 '张三(zhangsan)'
|
||
"""
|
||
raw_name = self.username
|
||
real_name = ''
|
||
account_id = raw_name
|
||
|
||
# 解析存储格式: Name/ID
|
||
if '/' in raw_name:
|
||
parts = raw_name.split('/')
|
||
real_name = parts[0]
|
||
acc_id = parts[1]
|
||
# 格式化为前端展示格式: 张三(zhangsan01)
|
||
display_name = f"{real_name}({acc_id})"
|
||
# 单独提取账号ID (如果前端需要单独用)
|
||
account_id = acc_id
|
||
else:
|
||
display_name = raw_name
|
||
|
||
return {
|
||
'id': self.id,
|
||
'username': display_name, # 列表显示: 张三(zhangsan01)
|
||
'raw_username': self.username, # 原始数据
|
||
'real_name': real_name, # 真实姓名: 张三
|
||
'display_name': display_name, # 显示名: 张三(zhangsan01)
|
||
'account_id': account_id, # 纯账号ID: zhangsan01
|
||
'email': self.email,
|
||
'department': self.department,
|
||
'role': self.role,
|
||
'status': self.status,
|
||
'created_at': self.created_at.isoformat() if self.created_at else None
|
||
}
|
||
|
||
|
||
# ==========================================
|
||
# 2. 系统日志表
|
||
# ==========================================
|
||
class SysLog(db.Model):
|
||
"""
|
||
系统操作日志表
|
||
对应数据库表: sys_log
|
||
"""
|
||
__tablename__ = 'sys_log'
|
||
|
||
id = db.Column(db.Integer, primary_key=True)
|
||
op_time = db.Column(db.DateTime, default=beijing_time)
|
||
op_user_name = db.Column(db.String(100))
|
||
op_user_id = db.Column(db.String(50))
|
||
module_name = db.Column(db.String(100))
|
||
action_type = db.Column(db.String(50))
|
||
target_table = db.Column(db.String(100))
|
||
target_id = db.Column(db.Integer)
|
||
description = db.Column(db.Text)
|
||
ip_address = db.Column(db.String(50))
|
||
|
||
def to_dict(self):
|
||
return {
|
||
'id': self.id,
|
||
'op_time': self.op_time.isoformat() if self.op_time else None,
|
||
'op_user_name': self.op_user_name,
|
||
'module_name': self.module_name,
|
||
'action_type': self.action_type,
|
||
'description': self.description
|
||
}
|
||
|
||
|
||
# ==========================================
|
||
# 3. 权限管理模型 (RBAC) - [新增]
|
||
# ==========================================
|
||
|
||
class SysMenu(db.Model):
|
||
"""系统菜单/页面表"""
|
||
__tablename__ = 'sys_menu'
|
||
id = db.Column(db.Integer, primary_key=True)
|
||
parent_id = db.Column(db.Integer, default=0)
|
||
name = db.Column(db.String(50), nullable=False)
|
||
code = db.Column(db.String(100), unique=True, nullable=False)
|
||
path = db.Column(db.String(200))
|
||
sort_order = db.Column(db.Integer, default=0)
|
||
is_visible = db.Column(db.Boolean, default=True)
|
||
|
||
def to_dict(self):
|
||
return {
|
||
'id': self.id,
|
||
'name': self.name,
|
||
'code': self.code,
|
||
'path': self.path,
|
||
'type': 'menu' # 前端树形控件图标判断用
|
||
}
|
||
|
||
|
||
class SysElement(db.Model):
|
||
"""页面元素/列定义表"""
|
||
__tablename__ = 'sys_element'
|
||
id = db.Column(db.Integer, primary_key=True)
|
||
menu_code = db.Column(db.String(100), db.ForeignKey('sys_menu.code'))
|
||
name = db.Column(db.String(100), nullable=False)
|
||
code = db.Column(db.String(100), nullable=False) # 如: unit_price
|
||
element_type = db.Column(db.String(20), default='column')
|
||
|
||
def to_dict(self):
|
||
return {
|
||
'id': self.id,
|
||
'name': self.name,
|
||
'code': self.code,
|
||
'menu_code': self.menu_code,
|
||
'type': 'element',
|
||
'element_type': self.element_type
|
||
}
|
||
|
||
|
||
class SysRolePermission(db.Model):
|
||
"""角色权限关联表(支持公司级别隔离)"""
|
||
__tablename__ = 'sys_role_permission'
|
||
id = db.Column(db.Integer, primary_key=True)
|
||
role_code = db.Column(db.String(50), nullable=False)
|
||
target_code = db.Column(db.String(100), nullable=False) # menu_code 或 element_code
|
||
type = db.Column(db.String(20), nullable=False) # 'menu' 或 'element'
|
||
company_name = db.Column(db.String(255), comment='所属公司(NULL/空/System=全局模板,具体值=公司定制)')
|
||
|
||
|
||
# ==========================================
|
||
# 4. 库位管理模型
|
||
# ==========================================
|
||
class SysWarehouseLocation(db.Model):
|
||
"""
|
||
库位字典表(支持无限层级树形结构)
|
||
对应数据库: sys_warehouse_location
|
||
"""
|
||
__tablename__ = 'sys_warehouse_location'
|
||
|
||
id = db.Column(db.Integer, primary_key=True)
|
||
parent_id = db.Column(db.Integer, db.ForeignKey('sys_warehouse_location.id'), nullable=True)
|
||
name = db.Column(db.String(100), nullable=False)
|
||
full_path = db.Column(db.String(500)) # 完整路径,如 "A区/货架1/第3层"
|
||
level = db.Column(db.Integer, default=0) # 层级深度,顶级为0
|
||
is_enabled = db.Column(db.Boolean, default=True)
|
||
created_at = db.Column(db.DateTime, default=beijing_time)
|
||
# 注意:数据库表中没有 updated_at 字段,不要添加!
|
||
|
||
# 自关联 - 使用 backref 定义父节点的反向引用
|
||
children = db.relationship(
|
||
'SysWarehouseLocation',
|
||
backref=db.backref('parent', remote_side=[id]),
|
||
lazy='dynamic'
|
||
)
|
||
|
||
def to_dict(self):
|
||
return {
|
||
'id': self.id,
|
||
'parent_id': self.parent_id,
|
||
'name': self.name,
|
||
'full_path': self.full_path,
|
||
'level': self.level,
|
||
'is_enabled': self.is_enabled,
|
||
'created_at': self.created_at.isoformat() if self.created_at else None
|
||
} |