cykj/zkxw
1
0 Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

feat(permission): replace OA roles with post-bound roles and assignee posts

Browse Source 
Unify effective roles via post-role bindings, remove dedicated OA role UI, and update OA assignee resolution plus related SQL/docs.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
zlwuandCursor committed 2026-08-04 17:41:04 +08:00
1 parent a3c73d76bb
commit 06db3bc966
66 files changed
+55337 -38647
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

backend/app/api/admin.py
+40
View File
@@ -1046,6 +1046,46 @@ async def update_post_bound_users(
return error_response(400, str(e))
class PostRolesUpdateBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
role_ids: List[str] = Field(default_factory=list, alias="roleIds")
@router.get("/posts/{post_id}/roles")
async def list_post_bound_roles(
post_id: str,
user: dict = Depends(require_menu_code("system:post:list")),
db: Session = Depends(get_db),
):
tenant_no = _get_tenant_no(db, user)
post = post_svc.get_post(db, post_id)
if not post or post.tenant_no != tenant_no:
return error_response(404, "职位不存在")
ids = post_svc.list_role_ids_for_post(db, post_id, tenant_no)
return success_response({"roleIds": ids})
@router.put("/posts/{post_id}/roles")
async def update_post_bound_roles(
post_id: str,
body: PostRolesUpdateBody,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
tenant_no = _get_tenant_no(db, user)
post = post_svc.get_post(db, post_id)
if not post or post.tenant_no != tenant_no:
return error_response(404, "职位不存在")
try:
post_svc.sync_post_role_bindings(
db, post_id, tenant_no, body.role_ids, user.get("user_id")
)
return success_response(None, message="保存成功")
except ValueError as e:
return error_response(400, str(e))
# ---------------------------------------------------------------------------
# 物品单位管理
# ---------------------------------------------------------------------------
backend/app/api/menu.py
-7
View File
@@ -870,13 +870,6 @@ STATIC_MENU_TREE = [
"component": "/oa-approval/apps/index",
"meta": {"title": "审批管理", "keepAlive": True, "menuCode": "oa:apps:list"},
},
{
"id": "OA000000000000000000000000000102",
"name": "OaApprovalRoles",
"path": "roles",
"component": "/oa-approval/roles/index",
"meta": {"title": "工作流角色", "keepAlive": True, "menuCode": "oa:roles:list"},
},
{
"id": "OA000000000000000000000000000103",
"name": "OaApprovalStart",
backend/app/api/oa_approval.py
+23 -150
View File
@@ -28,156 +28,6 @@ def _get_tenant_no(db: Session, user: dict) -> str:
return "zkxw"
# ---------------------------------------------------------------------------
# 工作流角色
# ---------------------------------------------------------------------------
class OaRoleCreateBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
role_name: str = Field(..., alias="roleName")
role_code: str = Field(..., alias="roleCode")
status: Optional[str] = Field("1")
order_num: Optional[int] = Field(None, alias="orderNum")
remark: Optional[str] = None
class OaRoleUpdateBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
role_name: Optional[str] = Field(None, alias="roleName")
status: Optional[str] = None
order_num: Optional[int] = Field(None, alias="orderNum")
remark: Optional[str] = None
class OaRoleUsersBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
user_ids: List[str] = Field(default_factory=list, alias="userIds")
@router.get("/roles")
async def list_oa_roles(
keyword: Optional[str] = None,
status: Optional[str] = None,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
tenant_no = _get_tenant_no(db, user)
items = oa_crud.list_roles(db, tenant_no=tenant_no, keyword=keyword, status=status)
return success_response({"list": items})
@router.post("/roles/ensure-presets")
async def ensure_oa_role_presets(
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
tenant_no = _get_tenant_no(db, user)
created = oa_crud.ensure_presets(db, tenant_no, user_id=user.get("user_id"))
return success_response(
{"createdCount": len(created)},
message="预置角色已就绪",
)
@router.post("/roles")
async def create_oa_role(
body: OaRoleCreateBody,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
obj = oa_crud.create_role(
db,
tenant_no=tenant_no,
role_name=body.role_name,
role_code=body.role_code,
status=body.status or "1",
order_num=body.order_num,
remark=body.remark,
user_id=user.get("user_id"),
)
return success_response(oa_crud._role_to_dict(obj), message="创建成功")
except ValueError as e:
return error_response(400, str(e))
@router.put("/roles/{role_id}")
async def update_oa_role(
role_id: str,
body: OaRoleUpdateBody,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
payload: dict[str, Any] = body.model_dump(exclude_unset=True, by_alias=False)
obj = oa_crud.update_role(
db,
role_id,
tenant_no=tenant_no,
role_name=payload.get("role_name"),
status=payload.get("status"),
order_num=payload.get("order_num"),
remark=payload.get("remark"),
user_id=user.get("user_id"),
)
return success_response(oa_crud._role_to_dict(obj), message="更新成功")
except ValueError as e:
return error_response(400, str(e))
@router.delete("/roles/{role_id}")
async def delete_oa_role(
role_id: str,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
oa_crud.delete_role(db, role_id, tenant_no=tenant_no, user_id=user.get("user_id"))
return success_response(None, message="删除成功")
except ValueError as e:
return error_response(400, str(e))
@router.get("/roles/{role_id}/users")
async def list_oa_role_users(
role_id: str,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
tenant_no = _get_tenant_no(db, user)
if not oa_crud.get_role(db, role_id, tenant_no):
return error_response(404, "角色不存在")
return success_response({"list": oa_crud.list_role_users(db, role_id, tenant_no)})
@router.put("/roles/{role_id}/users")
async def replace_oa_role_users(
role_id: str,
body: OaRoleUsersBody,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
oa_crud.replace_role_users(
db,
role_id,
tenant_no=tenant_no,
user_ids=body.user_ids,
operator_id=user.get("user_id"),
)
return success_response(
{"list": oa_crud.list_role_users(db, role_id, tenant_no)},
message="成员已更新",
)
except ValueError as e:
return error_response(400, str(e))
# ---------------------------------------------------------------------------
# 收款账户
# ---------------------------------------------------------------------------
@@ -495,6 +345,29 @@ async def create_oa_app(
return error_response(400, str(e))
@router.post("/apps/{app_id}/copy")
async def copy_oa_app(
app_id: str,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
obj = oa_crud.copy_app(
db, app_id, tenant_no=tenant_no, user_id=user.get("user_id")
)
group_name = ""
if obj.group_id:
g = oa_crud.get_group(db, obj.group_id, tenant_no)
group_name = g.group_name if g else ""
return success_response(
oa_crud._app_to_dict(obj, group_name=group_name, has_draft=True),
message="复制成功",
)
except ValueError as e:
return error_response(400, str(e))
@router.put("/apps/{app_id}")
async def update_oa_app(
app_id: str,
backend/app/core/data_scope.py
+8 -7
View File
@@ -20,7 +20,6 @@ from app.models.models import (
SysRole,
SysRoleDataScopeDetail,
SysUser,
SysUserRole,
)
@@ -62,17 +61,20 @@ def _get_child_dept_ids(db: Session, dept_id: str, tenant_no: str) -> List[str]:
def _resolve_user_role_scopes(
db: Session, user_id: str, tenant_no: str
) -> List[dict]:
"""获取用户所有角色的数据权限配置。
"""获取用户有效角色的数据权限配置（直接角色 ∪ 职位继承角色）。
返回: [{"data_scope": str, "details": [SysRoleDataScopeDetail, ...]}]
"""
from app.services.web_auth_roles import get_effective_role_ids
role_ids = get_effective_role_ids(db, user_id)
if not role_ids:
return []
roles = (
db.query(SysRole)
.join(SysUserRole, SysUserRole.role_id == SysRole.id)
.filter(
SysUserRole.user_id == user_id,
SysUserRole.del_flag == 0,
SysUserRole.tenant_no == tenant_no,
SysRole.id.in_(role_ids),
SysRole.del_flag == 0,
SysRole.status == "1",
SysRole.tenant_no == tenant_no,
@@ -83,7 +85,6 @@ def _resolve_user_role_scopes(
return []
result: List[dict] = []
role_ids = [r.id for r in roles]
# 批量查所有自定义权限明细
all_details = (
backend/app/crud/oa_approval.py
+80 -320
View File
@@ -1,16 +1,15 @@
"""OA 审批 CRUD（工作流角色、分组、应用、草稿等）"""
"""OA 审批 CRUD（分组、应用、草稿等）"""
from __future__ import annotations
import copy
import json
from datetime import datetime
from typing import Any, Dict, List, Optional, Tuple
from sqlalchemy import and_
from sqlalchemy.orm import Session
from app.core.db_collation import eq_unicode
from app.core.utils import generate_uuid
from app.models.models import OaApp, OaAppGroup, OaAppVersion, OaRole, OaRoleUser, SysUser
from app.models.models import OaApp, OaAppGroup, OaAppVersion
DEFAULT_ADVANCED_SETTINGS: Dict[str, Any] = {
"supervisorFallbackToDeptLeader": True,
@@ -41,322 +40,6 @@ def _loads(text: Optional[str], default: Any = None) -> Any:
except (TypeError, ValueError):
return default
PRESET_ROLES = (
("GM", "总经理"),
("CHAIRMAN", "董事长"),
)
def _role_to_dict(r: OaRole, *, member_count: int = 0) -> Dict[str, Any]:
return {
"id": r.id,
"roleName": r.role_name,
"roleCode": r.role_code,
"roleKind": r.role_kind,
"status": r.status,
"tenantNo": r.tenant_no,
"orderNum": r.order_num if r.order_num is not None else 0,
"remark": r.remark or "",
"memberCount": member_count,
"createTime": r.create_time.strftime("%Y-%m-%d %H:%M:%S") if r.create_time else "",
"updateTime": r.update_time.strftime("%Y-%m-%d %H:%M:%S") if r.update_time else "",
}
def ensure_presets(db: Session, tenant_no: str, user_id: Optional[str] = None) -> List[OaRole]:
"""幂等写入预置角色 GM / CHAIRMAN。"""
now = datetime.now()
created: List[OaRole] = []
for code, name in PRESET_ROLES:
exists = (
db.query(OaRole)
.filter(
OaRole.tenant_no == tenant_no,
OaRole.role_code == code,
OaRole.del_flag == 0,
)
.first()
)
if exists:
continue
obj = OaRole(
id=generate_uuid(),
role_name=name,
role_code=code,
role_kind="preset",
status="1",
tenant_no=tenant_no,
order_num=0 if code == "GM" else 1,
remark="系统预置工作流角色",
create_by=user_id,
create_dept_id="",
create_time=now,
update_by=user_id,
update_time=now,
del_flag=0,
)
db.add(obj)
created.append(obj)
if created:
db.commit()
for obj in created:
db.refresh(obj)
return created
def _member_count_map(db: Session, role_ids: List[str], tenant_no: str) -> Dict[str, int]:
if not role_ids:
return {}
rows = (
db.query(OaRoleUser.oa_role_id, OaRoleUser.id)
.filter(
OaRoleUser.oa_role_id.in_(role_ids),
OaRoleUser.tenant_no == tenant_no,
OaRoleUser.del_flag == 0,
)
.all()
)
counts: Dict[str, int] = {rid: 0 for rid in role_ids}
for rid, _ in rows:
counts[rid] = counts.get(rid, 0) + 1
return counts
def list_roles(
db: Session,
*,
tenant_no: str,
keyword: Optional[str] = None,
status: Optional[str] = None,
) -> List[Dict[str, Any]]:
ensure_presets(db, tenant_no)
q = db.query(OaRole).filter(OaRole.tenant_no == tenant_no, OaRole.del_flag == 0)
kw = (keyword or "").strip()
if kw:
like = f"%{kw}%"
q = q.filter((OaRole.role_name.like(like)) | (OaRole.role_code.like(like)))
if status:
q = q.filter(OaRole.status == status)
rows = q.order_by(OaRole.role_kind.desc(), OaRole.order_num.asc(), OaRole.create_time.desc()).all()
counts = _member_count_map(db, [r.id for r in rows], tenant_no)
return [_role_to_dict(r, member_count=counts.get(r.id, 0)) for r in rows]
def get_role(db: Session, role_id: str, tenant_no: str) -> Optional[OaRole]:
return (
db.query(OaRole)
.filter(OaRole.id == role_id, OaRole.tenant_no == tenant_no, OaRole.del_flag == 0)
.first()
)
def create_role(
db: Session,
*,
tenant_no: str,
role_name: str,
role_code: str,
status: str = "1",
order_num: Optional[int] = None,
remark: Optional[str] = None,
user_id: Optional[str] = None,
) -> OaRole:
name = (role_name or "").strip()
code = (role_code or "").strip().upper()
if not name:
raise ValueError("角色名称不能为空")
if not code:
raise ValueError("角色编码不能为空")
if code in {c for c, _ in PRESET_ROLES}:
raise ValueError("该编码为系统预置，请勿占用")
exists = (
db.query(OaRole)
.filter(OaRole.tenant_no == tenant_no, OaRole.role_code == code, OaRole.del_flag == 0)
.first()
)
if exists:
raise ValueError("角色编码已存在")
now = datetime.now()
obj = OaRole(
id=generate_uuid(),
role_name=name,
role_code=code,
role_kind="custom",
status=status or "1",
tenant_no=tenant_no,
order_num=order_num if order_num is not None else 10,
remark=(remark or "").strip() or None,
create_by=user_id,
create_dept_id="",
create_time=now,
update_by=user_id,
update_time=now,
del_flag=0,
)
db.add(obj)
db.commit()
db.refresh(obj)
return obj
def update_role(
db: Session,
role_id: str,
*,
tenant_no: str,
role_name: Optional[str] = None,
status: Optional[str] = None,
order_num: Optional[int] = None,
remark: Optional[str] = None,
user_id: Optional[str] = None,
) -> OaRole:
obj = get_role(db, role_id, tenant_no)
if not obj:
raise ValueError("角色不存在")
if role_name is not None:
name = (role_name or "").strip()
if not name:
raise ValueError("角色名称不能为空")
obj.role_name = name
if status is not None:
obj.status = status
if order_num is not None:
obj.order_num = order_num
if remark is not None:
obj.remark = (remark or "").strip() or None
obj.update_by = user_id
obj.update_time = datetime.now()
db.add(obj)
db.commit()
db.refresh(obj)
return obj
def delete_role(db: Session, role_id: str, *, tenant_no: str, user_id: Optional[str] = None) -> None:
obj = get_role(db, role_id, tenant_no)
if not obj:
raise ValueError("角色不存在")
if obj.role_kind == "preset":
raise ValueError("预置角色不可删除")
obj.del_flag = 1
obj.update_by = user_id
obj.update_time = datetime.now()
db.add(obj)
db.commit()
def list_role_users(db: Session, role_id: str, tenant_no: str) -> List[Dict[str, Any]]:
rows = (
db.query(OaRoleUser, SysUser)
.outerjoin(
SysUser,
and_(eq_unicode(SysUser.id, OaRoleUser.user_id), SysUser.del_flag == 0),
)
.filter(
OaRoleUser.oa_role_id == role_id,
OaRoleUser.tenant_no == tenant_no,
OaRoleUser.del_flag == 0,
)
.all()
)
out: List[Dict[str, Any]] = []
for ru, u in rows:
out.append(
{
"id": ru.id,
"userId": ru.user_id,
"nickName": (u.nick_name if u else "") or "",
"userNo": (u.user_no if u else "") or "",
}
)
return out
def replace_role_users(
db: Session,
role_id: str,
*,
tenant_no: str,
user_ids: List[str],
operator_id: Optional[str] = None,
) -> None:
obj = get_role(db, role_id, tenant_no)
if not obj:
raise ValueError("角色不存在")
now = datetime.now()
existing = (
db.query(OaRoleUser)
.filter(
OaRoleUser.oa_role_id == role_id,
OaRoleUser.tenant_no == tenant_no,
OaRoleUser.del_flag == 0,
)
.all()
)
for row in existing:
row.del_flag = 1
row.update_by = operator_id
row.update_time = now
db.add(row)
seen = set()
for uid in user_ids or []:
uid = (uid or "").strip()
if not uid or uid in seen:
continue
seen.add(uid)
db.add(
OaRoleUser(
id=generate_uuid(),
oa_role_id=role_id,
user_id=uid,
tenant_no=tenant_no,
order_num=0,
remark=None,
create_by=operator_id,
create_dept_id="",
create_time=now,
update_by=operator_id,
update_time=now,
del_flag=0,
)
)
db.commit()
def list_oa_role_user_ids(db: Session, role_ids: List[str], tenant_no: str) -> List[str]:
if not role_ids:
return []
enabled = {
r.id
for r in db.query(OaRole)
.filter(
OaRole.id.in_(role_ids),
OaRole.tenant_no == tenant_no,
OaRole.del_flag == 0,
OaRole.status == "1",
)
.all()
}
if not enabled:
return []
rows = (
db.query(OaRoleUser.user_id, OaRoleUser.oa_role_id)
.filter(
OaRoleUser.oa_role_id.in_(list(enabled)),
OaRoleUser.tenant_no == tenant_no,
OaRoleUser.del_flag == 0,
)
.all()
)
out: List[str] = []
seen = set()
for uid, rid in rows:
if rid in enabled and uid and uid not in seen:
seen.add(uid)
out.append(uid)
return out
# ---------------------------------------------------------------------------
# 分组 oa_app_group
# ---------------------------------------------------------------------------
@@ -669,6 +352,83 @@ def create_app(
return obj
def _copied_app_name(source_name: str) -> str:
"""原名称 +「复制」；超 50 字时截断前缀并保留后缀。"""
suffix = "复制"
base = (source_name or "").strip()
candidate = f"{base}{suffix}"
if len(candidate) <= 50:
return candidate
max_base = max(0, 50 - len(suffix))
return f"{base[:max_base]}{suffix}"
def copy_app(
db: Session,
source_app_id: str,
*,
tenant_no: str,
user_id: Optional[str] = None,
) -> OaApp:
"""复制应用：基础信息 + 草稿/最新发布版的表单·流程·高级设置，结果为未发布草稿。"""
src = get_app(db, source_app_id, tenant_no)
if not src:
raise ValueError("应用不存在")
source_ver = _find_draft(db, source_app_id, tenant_no) or _find_latest_published(
db, source_app_id, tenant_no
)
if source_ver:
form_schema = copy.deepcopy(_loads(source_ver.form_schema_json, {}) or {})
flow_tree = copy.deepcopy(_loads(source_ver.flow_tree_json, {}) or {})
advanced = copy.deepcopy(
_loads(source_ver.advanced_settings_json, DEFAULT_ADVANCED_SETTINGS)
or DEFAULT_ADVANCED_SETTINGS
)
else:
form_schema = {}
flow_tree = {}
advanced = dict(DEFAULT_ADVANCED_SETTINGS)
now = datetime.now()
obj = OaApp(
id=generate_uuid(),
group_id=src.group_id,
app_name=_copied_app_name(src.app_name),
icon_url=src.icon_url,
description=src.description,
initiator_scope=src.initiator_scope or "all",
initiator_user_ids=src.initiator_user_ids,
admin_scope=src.admin_scope or "all_oa_admin",
admin_user_ids=src.admin_user_ids,
status=src.status or "1",
tenant_no=tenant_no,
order_num=src.order_num if src.order_num is not None else 0,
remark=src.remark,
create_by=user_id,
create_dept_id="",
create_time=now,
update_by=user_id,
update_time=now,
del_flag=0,
)
db.add(obj)
_create_version(
db,
app_id=obj.id,
tenant_no=tenant_no,
version_no=1,
status="draft",
form_schema=form_schema,
flow_tree=flow_tree,
advanced=advanced,
user_id=user_id,
)
db.commit()
db.refresh(obj)
return obj
def update_app(
db: Session,
app_id: str,
backend/app/crud/post.py
+73 -2
View File
@@ -9,7 +9,7 @@ from sqlalchemy import and_, func, or_
from sqlalchemy.orm import Session
from app.core.utils import generate_uuid
from app.models.models import SysPost
from app.models.models import SysPost, SysPostRole, SysRole
def _row_to_dict(p: SysPost) -> Dict[str, Any]:
@@ -154,9 +154,80 @@ def soft_delete_post(db: Session, post_id: str) -> None:
obj = get_post(db, post_id)
if not obj:
raise ValueError("职位不存在")
now = datetime.now()
obj.del_flag = 1
obj.update_time = datetime.now()
obj.update_time = now
db.add(obj)
db.query(SysPostRole).filter(
and_(SysPostRole.post_id == post_id, SysPostRole.del_flag == 0)
).update({"del_flag": 1, "update_time": now}, synchronize_session=False)
db.commit()
def list_role_ids_for_post(db: Session, post_id: str, tenant_no: str) -> List[str]:
rows = (
db.query(SysPostRole.role_id)
.filter(
and_(
SysPostRole.post_id == post_id,
SysPostRole.tenant_no == tenant_no,
SysPostRole.del_flag == 0,
)
)
.all()
)
return [r[0] for r in rows]
def sync_post_role_bindings(
db: Session,
post_id: str,
tenant_no: str,
role_ids: List[str],
updater_id: Optional[str],
) -> None:
"""将本职位绑定的角色集合全量替换为 role_ids。"""
ordered = list(dict.fromkeys([rid for rid in (role_ids or []) if rid]))
for rid in ordered:
role = (
db.query(SysRole)
.filter(
and_(
SysRole.id == rid,
SysRole.del_flag == 0,
SysRole.tenant_no == tenant_no,
)
)
.first()
)
if not role:
raise ValueError("存在无效角色或不属于当前租户")
now = datetime.now()
db.query(SysPostRole).filter(
and_(
SysPostRole.post_id == post_id,
SysPostRole.tenant_no == tenant_no,
SysPostRole.del_flag == 0,
)
).update({"del_flag": 1, "update_time": now, "update_by": updater_id}, synchronize_session=False)
for rid in ordered:
db.add(
SysPostRole(
id=generate_uuid(),
post_id=post_id,
role_id=rid,
tenant_no=tenant_no,
order_num=0,
remark=None,
create_by=updater_id,
create_dept_id="",
create_time=now,
update_by=updater_id,
update_time=now,
del_flag=0,
)
)
db.commit()
backend/app/crud/storage_facility.py
+10 -12
View File
@@ -196,7 +196,6 @@ def batch_create_facilities(
name_suffix = name_suffix or ""
code_prefix = code_prefix or ""
code_suffix = code_suffix or ""
gen_code = bool(code_prefix.strip() or code_suffix.strip())
node_type_val = (node_type or "").strip() or None
remark_val = (remark or "").strip() or None
leaf_val = 1 if int(is_leaf or 0) == 1 else 0
@@ -209,17 +208,16 @@ def batch_create_facilities(
name = f"{name_prefix}{seq}{name_suffix}".strip()
if not name:
raise ValueError("节点名称不能为空，请填写前缀或后缀")
code = ""
if gen_code:
code = validate_node_code(f"{code_prefix}{seq}{code_suffix}")
if not code:
raise ValueError("节点编号不能为空")
if code in seen_codes:
raise ValueError(f"批次内节点编号重复：{code}")
seen_codes.add(code)
assert_sibling_node_code_unique(
db, parent_id=pid, node_code=code, tenant_no=tenant_no
)
# 前缀、后缀都空时，节点编号 = 序号（含补零）
code = validate_node_code(f"{code_prefix}{seq}{code_suffix}")
if not code:
raise ValueError("节点编号不能为空")
if code in seen_codes:
raise ValueError(f"批次内节点编号重复：{code}")
seen_codes.add(code)
assert_sibling_node_code_unique(
db, parent_id=pid, node_code=code, tenant_no=tenant_no
)
planned.append((name, code, num))
objs: List[BizStorageFacility] = []
backend/app/crud/user.py
+42
View File
@@ -179,6 +179,48 @@ def list_user_ids_bound_to_post(db: Session, post_id: str, tenant_no: str) -> Li
return [r[0] for r in rows]
def list_user_ids_bound_to_posts(
db: Session, post_ids: List[str], tenant_no: str
) -> List[str]:
"""多职位展开启用用户 ID（仅启用职位；用户启用过滤留给调用方或本函数后处理）。
返回保序去重的 user_id 列表。仅包含 status=1 的职位下的关联。
"""
from app.models.models import SysPost
ordered = list(dict.fromkeys([pid for pid in (post_ids or []) if pid]))
if not ordered:
return []
rows = (
db.query(SysUserPost.user_id)
.join(
SysPost,
and_(
SysPost.id == SysUserPost.post_id,
SysPost.del_flag == 0,
SysPost.status == "1",
SysPost.tenant_no == tenant_no,
),
)
.filter(
and_(
SysUserPost.post_id.in_(ordered),
SysUserPost.tenant_no == tenant_no,
SysUserPost.del_flag == 0,
)
)
.all()
)
out: List[str] = []
seen = set()
for r in rows:
uid = r[0]
if uid and uid not in seen:
seen.add(uid)
out.append(uid)
return out
def sync_post_user_bindings(
db: Session,
post_id: str,
backend/app/models/models.py
+19 -40
View File
@@ -262,6 +262,25 @@ class SysUserPost(Base):
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
class SysPostRole(Base):
"""职位-角色关联 sys_post_role"""
__tablename__ = "sys_post_role"
id = Column(String(64), primary_key=True, comment="主键ID")
post_id = Column(String(64), nullable=False, comment="职位ID")
role_id = Column(String(64), nullable=False, comment="角色ID")
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
order_num = Column(Integer, nullable=True, comment="排序号")
remark = Column(String(512), nullable=True, comment="备注")
create_by = Column(String(64), nullable=True, comment="创建人id")
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
update_by = Column(String(64), nullable=True, comment="更新人id")
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
class BizItemUnit(Base):
"""物品单位 biz_item_unit"""
@@ -806,46 +825,6 @@ class OaAppVersion(Base):
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
class OaRole(Base):
"""OA工作流角色 oa_role"""
__tablename__ = "oa_role"
id = Column(String(64), primary_key=True, comment="主键ID")
role_name = Column(String(100), nullable=False, comment="角色名称")
role_code = Column(String(64), nullable=False, comment="角色编码")
role_kind = Column(String(16), nullable=False, default="custom", comment="custom/preset")
status = Column(CHAR(1), nullable=False, default="1", comment="1启用 0停用")
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
order_num = Column(Integer, nullable=True, comment="排序号")
remark = Column(String(512), nullable=True, comment="备注")
create_by = Column(String(64), nullable=True, comment="创建人id")
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
update_by = Column(String(64), nullable=True, comment="更新人id")
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
class OaRoleUser(Base):
"""OA工作流角色成员 oa_role_user"""
__tablename__ = "oa_role_user"
id = Column(String(64), primary_key=True, comment="主键ID")
oa_role_id = Column(String(64), nullable=False, comment="工作流角色ID")
user_id = Column(String(64), nullable=False, comment="用户ID")
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
order_num = Column(Integer, nullable=True, comment="排序号")
remark = Column(String(512), nullable=True, comment="备注")
create_by = Column(String(64), nullable=True, comment="创建人id")
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
update_by = Column(String(64), nullable=True, comment="更新人id")
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
class OaReceiveAccount(Base):
"""OA收款账户 oa_receive_account"""
backend/app/services/oa_assignee.py
+9 -26
View File
@@ -1,11 +1,11 @@
"""OA 审批人解析（不读 sys_role）"""
"""OA 审批人解析（不读 sys_role；职位成员走 sys_user_post）"""
from __future__ import annotations
from typing import Any, Dict, List, Optional, Tuple
from sqlalchemy.orm import Session
from app.crud import oa_approval as oa_crud
from app.crud import user as user_crud
from app.models.models import SysDept, SysUser
@@ -16,7 +16,7 @@ class AssigneeResolveError(ValueError):
VALID_ASSIGNEE_TYPES = frozenset(
{
"users",
"oa_roles",
"posts",
"dept_leader",
"direct_supervisor",
"initiator_select",
@@ -183,7 +183,7 @@ def resolve_assignees(
) -> Tuple[List[str], Dict[str, Any]]:
"""
按节点 approverConfig 解析处理人。
assigneeType: users | oa_roles | dept_leader | direct_supervisor | initiator_select
assigneeType: users | posts | dept_leader | direct_supervisor | initiator_select
"""
cfg = assignee_config or {}
assignee_type = (cfg.get("assigneeType") or cfg.get("assignee_type") or "").strip()
@@ -205,26 +205,9 @@ def resolve_assignees(
raise AssigneeResolveError("指定成员为空或均无效")
return out, {"resolve_source": "users"}
if assignee_type == "oa_roles":
role_ids = cfg.get("oaRoleIds") or cfg.get("oa_role_ids") or []
# 也支持按编码
codes = cfg.get("oaRoleCodes") or cfg.get("oa_role_codes") or []
if codes:
from app.models.models import OaRole
extra = (
db.query(OaRole.id)
.filter(
OaRole.tenant_no == tenant_no,
OaRole.role_code.in_([c.upper() for c in codes]),
OaRole.del_flag == 0,
OaRole.status == "1",
)
.all()
)
role_ids = list(role_ids) + [r.id for r in extra]
users = oa_crud.list_oa_role_user_ids(db, list(role_ids), tenant_no)
# 过滤停用用户
if assignee_type == "posts":
post_ids = cfg.get("postIds") or cfg.get("post_ids") or []
users = user_crud.list_user_ids_bound_to_posts(db, list(post_ids), tenant_no)
out = []
seen = set()
for uid in users:
@@ -233,8 +216,8 @@ def resolve_assignees(
seen.add(real)
out.append(real)
if not out:
raise AssigneeResolveError("工作流角色成员为空或均无效")
return out, {"resolve_source": "oa_roles"}
raise AssigneeResolveError("职位成员为空或均无效")
return out, {"resolve_source": "posts"}
if assignee_type == "dept_leader":
return resolve_dept_leader(
backend/app/services/oa_engine.py
+19 -30
View File
@@ -17,9 +17,9 @@ from app.models.models import (
OaInstance,
OaInstanceEvent,
OaRelation,
OaRole,
OaTask,
SysDept,
SysPost,
SysUser,
)
from app.services.oa_assignee import (
@@ -1033,50 +1033,39 @@ def get_template_detail(
_ASSIGNEE_TYPE_LABEL = {
"users": "指定成员",
"oa_roles": "工作流角色",
"posts": "职位",
"dept_leader": "发起人部门负责人",
"direct_supervisor": "发起人的主管",
"initiator_select": "发起人自选",
}
def _role_name_map(db: Session, tenant_no: str, role_ids: List[str], codes: List[str]) -> List[str]:
def _post_name_map(db: Session, tenant_no: str, post_ids: List[str]) -> List[str]:
names: List[str] = []
ids = [str(x).strip() for x in (role_ids or []) if str(x).strip()]
code_list = [str(c).strip().upper() for c in (codes or []) if str(c).strip()]
if ids:
rows = (
db.query(OaRole)
.filter(OaRole.tenant_no == tenant_no, OaRole.id.in_(ids), OaRole.del_flag == 0)
.all()
)
names.extend([(r.role_name or r.role_code or r.id) for r in rows])
if code_list:
rows = (
db.query(OaRole)
.filter(
OaRole.tenant_no == tenant_no,
OaRole.role_code.in_(code_list),
OaRole.del_flag == 0,
)
.all()
)
for r in rows:
label = r.role_name or r.role_code or r.id
if label not in names:
names.append(label)
ids = [str(x).strip() for x in (post_ids or []) if str(x).strip()]
if not ids:
return names
rows = (
db.query(SysPost)
.filter(SysPost.tenant_no == tenant_no, SysPost.id.in_(ids), SysPost.del_flag == 0)
.all()
)
by_id = {r.id: (r.post_name or r.post_code or r.id) for r in rows}
for pid in ids:
label = by_id.get(pid)
if label and label not in names:
names.append(label)
return names
def _assignee_meta(db: Session, tenant_no: str, cfg: Dict[str, Any]) -> str:
assignee_type = (cfg.get("assigneeType") or cfg.get("assignee_type") or "").strip()
base = _ASSIGNEE_TYPE_LABEL.get(assignee_type, assignee_type or "未配置审批人")
if assignee_type == "oa_roles":
names = _role_name_map(
if assignee_type == "posts":
names = _post_name_map(
db,
tenant_no,
cfg.get("oaRoleIds") or cfg.get("oa_role_ids") or [],
cfg.get("oaRoleCodes") or cfg.get("oa_role_codes") or [],
cfg.get("postIds") or cfg.get("post_ids") or [],
)
if names:
return f"{base} · {'/'.join(names)}"
backend/app/services/oa_publish.py
+35 -51
View File
@@ -6,7 +6,7 @@ from typing import Any, Dict, List, Optional, Set, Tuple
from sqlalchemy.orm import Session
from app.crud import oa_approval as oa_crud
from app.models.models import OaRole
from app.models.models import SysPost
from app.services.oa_assignee import VALID_ASSIGNEE_TYPES, normalize_cc_assignee_types
# 可填控件（FormCreate / 自建控件字典交集；布局类不计）
@@ -228,11 +228,10 @@ def validate_flow_tree(flow_tree: Any) -> List[str]:
ids = cfg.get("userIds") or cfg.get("user_ids") or []
if not ids:
errors.append(f"{path}：指定成员不能为空")
elif at == "oa_roles":
rids = cfg.get("oaRoleIds") or cfg.get("oa_role_ids") or []
codes = cfg.get("oaRoleCodes") or cfg.get("oa_role_codes") or []
if not rids and not codes:
errors.append(f"{path}：工作流角色不能为空")
elif at == "posts":
pids = cfg.get("postIds") or cfg.get("post_ids") or []
if not pids:
errors.append(f"{path}：职位不能为空")
if ntype == "cc":
cfg = node.get("approverConfig") or node.get("approver_config") or {}
@@ -249,11 +248,10 @@ def validate_flow_tree(flow_tree: Any) -> List[str]:
ids = cfg.get("userIds") or cfg.get("user_ids") or []
if not ids:
errors.append(f"{path}：指定成员不能为空")
elif at == "oa_roles":
rids = cfg.get("oaRoleIds") or cfg.get("oa_role_ids") or []
codes = cfg.get("oaRoleCodes") or cfg.get("oa_role_codes") or []
if not rids and not codes:
errors.append(f"{path}：工作流角色不能为空")
elif at == "posts":
pids = cfg.get("postIds") or cfg.get("post_ids") or []
if not pids:
errors.append(f"{path}：职位不能为空")
if ntype == "condition":
groups = node.get("conditionGroups") or node.get("condition_groups") or []
@@ -365,25 +363,28 @@ def validate_condition_rules_against_form(form_schema: Any, flow_tree: Any) -> L
return errors
def validate_oa_roles_referenced(
def validate_posts_referenced(
db: Session, *, tenant_no: str, flow_tree: Any
) -> List[str]:
role_ids: Set[str] = set()
role_codes: Set[str] = set()
post_ids: Set[str] = set()
def collect(node: Optional[Dict[str, Any]]) -> None:
if not node or not isinstance(node, dict):
return
cfg = node.get("approverConfig") or {}
if isinstance(cfg, dict):
at = (cfg.get("assigneeType") or "").strip()
if at == "oa_roles":
for rid in cfg.get("oaRoleIds") or cfg.get("oa_role_ids") or []:
if rid:
role_ids.add(str(rid))
for code in cfg.get("oaRoleCodes") or cfg.get("oa_role_codes") or []:
if code:
role_codes.add(str(code).upper())
types: List[str] = []
ntype = _node_type(node)
if ntype == "cc":
types = normalize_cc_assignee_types(cfg)
else:
at = (cfg.get("assigneeType") or "").strip()
if at:
types = [at]
if "posts" in types:
for pid in cfg.get("postIds") or cfg.get("post_ids") or []:
if pid:
post_ids.add(str(pid))
child = node.get("child")
if isinstance(child, dict):
collect(child)
@@ -397,40 +398,23 @@ def validate_oa_roles_referenced(
collect(root if isinstance(root, dict) else None)
errors: List[str] = []
if role_ids:
if post_ids:
rows = (
db.query(OaRole)
db.query(SysPost)
.filter(
OaRole.id.in_(list(role_ids)),
OaRole.tenant_no == tenant_no,
OaRole.del_flag == 0,
SysPost.id.in_(list(post_ids)),
SysPost.tenant_no == tenant_no,
SysPost.del_flag == 0,
)
.all()
)
found = {r.id: r for r in rows}
for rid in role_ids:
r = found.get(rid)
if not r:
errors.append(f"引用的工作流角色不存在：{rid}")
elif r.status != "1":
errors.append(f"工作流角色已停用：{r.role_name or rid}")
if role_codes:
rows = (
db.query(OaRole)
.filter(
OaRole.role_code.in_(list(role_codes)),
OaRole.tenant_no == tenant_no,
OaRole.del_flag == 0,
)
.all()
)
found_codes = {r.role_code.upper(): r for r in rows}
for code in role_codes:
r = found_codes.get(code)
if not r:
errors.append(f"引用的工作流角色编码不存在：{code}")
elif r.status != "1":
errors.append(f"工作流角色已停用：{r.role_name or code}")
for pid in post_ids:
p = found.get(pid)
if not p:
errors.append(f"引用的职位不存在：{pid}")
elif p.status != "1":
errors.append(f"职位已停用：{p.post_name or pid}")
return errors
@@ -471,7 +455,7 @@ def validate_draft_for_publish(
errors.extend(validate_control_types(form_schema))
errors.extend(validate_flow_tree(flow_tree))
errors.extend(validate_condition_rules_against_form(form_schema, flow_tree))
errors.extend(validate_oa_roles_referenced(db, tenant_no=tenant_no, flow_tree=flow_tree))
errors.extend(validate_posts_referenced(db, tenant_no=tenant_no, flow_tree=flow_tree))
return errors
backend/app/services/web_auth_roles.py
+89 -22
View File
@@ -1,15 +1,26 @@
"""Web 管理端登录：基于 V0.3 sys_user / sys_user_role / sys_role 的角色与菜单权限解析"""
"""Web 管理端登录：基于 V0.3 sys_user / sys_user_role / sys_role 的角色与菜单权限解析
有效角色 = 用户直接角色 ∪ 经启用职位继承的角色（sys_post_role）。
"""
from __future__ import annotations
from typing import Set
from typing import List, Set
from sqlalchemy import and_
from sqlalchemy.orm import Session
from app.core.config import settings
from app.models.models import SysMenu, SysRole, SysRoleMenu, SysUserRole
from app.models.models import (
SysMenu,
SysPost,
SysPostRole,
SysRole,
SysRoleMenu,
SysUserPost,
SysUserRole,
)
# 无 sys_user_role 绑定时的 Web 端角色（不可为 super_admin，避免越权）
# 无有效角色绑定时的 Web 端角色（不可为 super_admin，避免越权）
NO_ROLE_WEB_ROLE = "guest"
# 一级菜单权限码（用于顶部菜单权限控制）
@@ -28,13 +39,14 @@ def _map_role_name_to_web(role_name: str) -> str:
return "admin"
def _active_role_name_rows(db: Session, user_id: str):
"""查询用户当前有效的 sys_role.role_name 列表。"""
def get_effective_role_ids(db: Session, user_id: str) -> List[str]:
"""用户有效角色 ID：直接绑定 ∪ 启用职位关联的启用角色（去重保序）。"""
if not user_id:
return []
tenant = settings.DEFAULT_TENANT_NO
rows = (
db.query(SysRole.role_name)
direct_rows = (
db.query(SysRole.id)
.join(SysUserRole, SysUserRole.role_id == SysRole.id)
.filter(
SysUserRole.user_id == user_id,
@@ -47,22 +59,82 @@ def _active_role_name_rows(db: Session, user_id: str):
.order_by(SysRole.create_time.desc())
.all()
)
post_rows = (
db.query(SysRole.id)
.join(SysPostRole, SysPostRole.role_id == SysRole.id)
.join(
SysPost,
and_(
SysPost.id == SysPostRole.post_id,
SysPost.del_flag == 0,
SysPost.status == "1",
SysPost.tenant_no == tenant,
),
)
.join(
SysUserPost,
and_(
SysUserPost.post_id == SysPost.id,
SysUserPost.user_id == user_id,
SysUserPost.del_flag == 0,
SysUserPost.tenant_no == tenant,
),
)
.filter(
SysPostRole.del_flag == 0,
SysPostRole.tenant_no == tenant,
SysRole.del_flag == 0,
SysRole.status == "1",
SysRole.tenant_no == tenant,
)
.order_by(SysRole.create_time.desc())
.all()
)
out: List[str] = []
seen: Set[str] = set()
for row in list(direct_rows) + list(post_rows):
rid = str(row[0]).strip() if row and row[0] else ""
if rid and rid not in seen:
seen.add(rid)
out.append(rid)
return out
def _active_role_name_rows(db: Session, user_id: str) -> list:
"""查询用户当前有效的 sys_role.role_name 列表（含职位继承）。"""
role_ids = get_effective_role_ids(db, user_id)
if not role_ids:
return []
tenant = settings.DEFAULT_TENANT_NO
rows = (
db.query(SysRole.role_name)
.filter(
SysRole.id.in_(role_ids),
SysRole.del_flag == 0,
SysRole.status == "1",
SysRole.tenant_no == tenant,
)
.order_by(SysRole.create_time.desc())
.all()
)
return [str(r[0]).strip() for r in rows if r and r[0]]
def user_has_active_roles(db: Session, user_id: str) -> bool:
"""用户是否至少绑定一个有效角色（sys_user_role → sys_role）。"""
return bool(_active_role_name_rows(db, user_id))
"""用户是否至少拥有一个有效角色（直接或经职位继承）。"""
return bool(get_effective_role_ids(db, user_id))
def get_user_role_names(db: Session, user_id: str) -> list:
"""用户当前绑定的 sys_role.role_name 列表（去重、保序）。"""
"""用户当前有效的 sys_role.role_name 列表（去重、保序）。"""
names = _active_role_name_rows(db, user_id)
return list(dict.fromkeys(names))
def resolve_web_role_for_user(db: Session, user_id: str) -> str:
"""根据用户关联角色解析 Web 端 role（admin / super_admin / guest）。"""
"""根据用户有效角色解析 Web 端 role（admin / super_admin / guest）。"""
names = _active_role_name_rows(db, user_id)
if not names:
return NO_ROLE_WEB_ROLE
@@ -73,7 +145,7 @@ def resolve_web_role_for_user(db: Session, user_id: str) -> str:
def iter_user_menu_perm_codes(db: Session, user_id: str) -> Set[str]:
"""用户通过角色关联得到的菜单权限标识（sys_menu.perms，空则退回菜单 id）。
"""用户通过有效角色关联得到的菜单权限标识（sys_menu.perms，空则退回菜单 id）。
注：不过滤 visible——F 类型按钮等 visible=0 的菜单仍可通过角色授权生效；
visible 仅控制侧栏/菜单树展示，不影响权限码解析。
@@ -81,6 +153,9 @@ def iter_user_menu_perm_codes(db: Session, user_id: str) -> Set[str]:
"""
if not user_id:
return set()
role_ids = get_effective_role_ids(db, user_id)
if not role_ids:
return set()
tenant = settings.DEFAULT_TENANT_NO
try:
q = (
@@ -91,15 +166,7 @@ def iter_user_menu_perm_codes(db: Session, user_id: str) -> Set[str]:
SysRoleMenu.menu_id == SysMenu.id,
SysRoleMenu.del_flag == 0,
SysRoleMenu.tenant_no == tenant,
),
)
.join(
SysUserRole,
and_(
SysUserRole.role_id == SysRoleMenu.role_id,
SysUserRole.user_id == user_id,
SysUserRole.del_flag == 0,
SysUserRole.tenant_no == tenant,
SysRoleMenu.role_id.in_(role_ids),
),
)
.filter(
backend/graphify-out/.graphify_analysis.json
+1990 -1916
View File
File diff suppressed because it is too large. Load diff
backend/graphify-out/.graphify_detect.json
+1
View File
@@ -0,0 +1 @@
{"files": {"code": ["/Users/wuzilong/work/00code/zkxw/backend/app/__init__.py", "/Users/wuzilong/work/00code/zkxw/backend/app/main.py", "/Users/wuzilong/work/00code/zkxw/backend/app/tasks/__init__.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/auth.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/api_crypto.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/login_crypto.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/config.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/wechat_pay.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/api_request_log_middleware.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/avatar_url.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/database.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/security.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/request_payload.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/__init__.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/response.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/menu_guard.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/db_collation.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/qc_material_amount_auth_constants.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/context.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/utils.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/protocol_status_display.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/storage.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/order_status_compat.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/exceptions.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/data_scope.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/admin_request_json.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/api_crypto_middleware.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/wechat_message.py", "/Users/wuzilong/work/00code/zkxw/backend/app/utils/sample_special.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/material.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/production_material.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/qc_param.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/models.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/cleanroom_garment.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/__init__.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/research_donation.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/qc_material.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/base.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/clinical_payment.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/storage_release_review.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/qc_task.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/process_route.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/auth.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/delivery.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/outbound_release_review.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/price_list.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/user.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/production_work_order.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/material.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/storage_occupancy.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/quotation.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/product_parameter_value.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/product_review_media.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/product_parameter.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/production_task.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/product_detail_media.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/product_banner.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/region.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/inquiry.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/order.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/__init__.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/order_adjust.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/cell_product.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/menu.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/attachment.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/category_parameter.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/common.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/unit.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/qc_work_order.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/outbound_release_material.py", "/Users/wuzilong/work/00code/zkxw/bacLine truncated
backend/graphify-out/.graphify_extract.json
+15372 -11534
View File
File diff suppressed because it is too large. Load diff
backend/graphify-out/.graphify_incremental.json
+1
View File
@@ -0,0 +1 @@
{"files": {"code": ["/Users/wuzilong/work/00code/zkxw/backend/app/__init__.py", "/Users/wuzilong/work/00code/zkxw/backend/app/main.py", "/Users/wuzilong/work/00code/zkxw/backend/app/tasks/__init__.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/auth.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/api_crypto.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/login_crypto.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/config.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/wechat_pay.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/api_request_log_middleware.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/avatar_url.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/database.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/security.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/request_payload.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/__init__.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/response.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/menu_guard.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/db_collation.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/qc_material_amount_auth_constants.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/context.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/utils.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/protocol_status_display.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/storage.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/order_status_compat.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/exceptions.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/data_scope.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/admin_request_json.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/api_crypto_middleware.py", "/Users/wuzilong/work/00code/zkxw/backend/app/core/wechat_message.py", "/Users/wuzilong/work/00code/zkxw/backend/app/utils/sample_special.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/material.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/production_material.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/qc_param.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/models.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/cleanroom_garment.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/__init__.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/research_donation.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/qc_material.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/base.py", "/Users/wuzilong/work/00code/zkxw/backend/app/models/clinical_payment.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/storage_release_review.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/qc_task.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/process_route.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/auth.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/delivery.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/outbound_release_review.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/price_list.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/user.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/production_work_order.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/material.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/storage_occupancy.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/quotation.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/product_parameter_value.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/product_review_media.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/product_parameter.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/production_task.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/product_detail_media.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/product_banner.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/region.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/inquiry.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/order.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/__init__.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/order_adjust.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/cell_product.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/menu.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/attachment.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/category_parameter.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/common.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/unit.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/qc_work_order.py", "/Users/wuzilong/work/00code/zkxw/backend/app/schemas/outbound_release_material.py", "/Users/wuzilong/work/00code/zkxw/bacLine truncated
backend/graphify-out/GRAPH_REPORT.md
+103 -116
View File
@@ -1,11 +1,11 @@
# Graph Report - app (2026-07-30)
# Graph Report - app (2026-08-02)
## Corpus Check
- Large corpus: 235 files · ~290,692 words. Semantic extraction will be expensive (many Claude tokens). Consider running on a subfolder, or use --no-semantic to run AST-only.
- Large corpus: 241 files · ~294,814 words. Semantic extraction will be expensive (many Claude tokens). Consider running on a subfolder, or use --no-semantic to run AST-only.
## Summary
- 4990 nodes · 27487 edges · 42 communities detected
- Extraction: 31% EXTRACTED · 69% INFERRED · 0% AMBIGUOUS · INFERRED: 18848 edges (avg confidence: 0.6)
- 5073 nodes · 27810 edges · 39 communities detected
- Extraction: 32% EXTRACTED · 68% INFERRED · 0% AMBIGUOUS · INFERRED: 19033 edges (avg confidence: 0.6)
- Token cost: 0 input · 0 output
## Community Hubs (Navigation)
@@ -42,252 +42,239 @@
- [[_COMMUNITY_Community 30|Community 30]]
- [[_COMMUNITY_Community 31|Community 31]]
- [[_COMMUNITY_Community 32|Community 32]]
- [[_COMMUNITY_Community 33|Community 33]]
- [[_COMMUNITY_Community 34|Community 34]]
- [[_COMMUNITY_Community 35|Community 35]]
- [[_COMMUNITY_Community 36|Community 36]]
- [[_COMMUNITY_Community 37|Community 37]]
- [[_COMMUNITY_Community 38|Community 38]]
- [[_COMMUNITY_Community 39|Community 39]]
- [[_COMMUNITY_Community 40|Community 40]]
- [[_COMMUNITY_Community 41|Community 41]]
- [[_COMMUNITY_Community 42|Community 42]]
- [[_COMMUNITY_Community 43|Community 43]]
## God Nodes (most connected - your core abstractions)
1. `success_response()` - 724 edges
2. `error_response()` - 597 edges
3. `SysUser` - 576 edges
4. `BizQcTaskResult` - 344 edges
5. `BizProductionMaterial` - 328 edges
6. `BizProductionMaterialUsage` - 322 edges
7. `BizQcMaterialUsage` - 320 edges
8. `BizQcMaterial` - 310 edges
9. `BizProductionMaterialStockBatch` - 309 edges
10. `BizMaterialUsage` - 306 edges
1. `success_response()` - 727 edges
2. `error_response()` - 600 edges
3. `SysUser` - 584 edges
4. `BizQcTaskResult` - 346 edges
5. `BizProductionMaterial` - 330 edges
6. `BizProductionMaterialUsage` - 324 edges
7. `BizQcMaterialUsage` - 322 edges
8. `BizQcMaterial` - 312 edges
9. `BizProductionMaterialStockBatch` - 311 edges
10. `BizMaterialUsage` - 308 edges
## Surprising Connections (you probably didn't know these)
- `统一记录 API 请求/响应出入参的中间件` --uses--> `SysApiRequestLog` [INFERRED]
core/api_request_log_middleware.py → models/models.py
- `get_menu_list()` --calls--> `success_response()` [INFERRED]
api/menu.py → core/response.py
- `中试服务管理 API（细胞产品类型/规格/价格体系/项目价格、渠道信息、体检机构）` --uses--> `SysUser` [INFERRED]
api/pilot_service.py → models/models.py
- `保留匹配节点及其全部上级，供关键词检索后仍能正确组树。` --uses--> `SysDept` [INFERRED]
crud/dept.py → models/models.py
- `物品单位 CRUD（biz_item_unit）` --uses--> `BizItemUnit` [INFERRED]
crud/item_unit.py → models/models.py
- `快递公司 CRUD（biz_express_company）` --uses--> `BizExpressCompany` [INFERRED]
crud/express_company.py → models/models.py
## Communities
### Community 0 - "Community 0"
Cohesion: 0.01
Nodes (928): attachment_download_url(), create_dept(), create_dict_data(), create_dict_type(), create_express_company(), create_item_unit(), create_menu(), create_post() (+920 more)
Nodes (982): attachment_download_url(), create_dept(), create_dict_data(), create_dict_type(), create_express_company(), create_item_unit(), create_menu(), create_post() (+974 more)
### Community 1 - "Community 1"
Cohesion: 0.01
Nodes (682): _ensure_customer_for_mother(), generate_uuid(), ApiRequestLogCRUD, delete(), get_multi_with_filters(), allocate_next_biz_no(), _format_biz_no(), _prefix_for() (+674 more)
Nodes (750): generate_uuid(), create_cell_sample_type(), get_cell_sample_type(), list_cell_sample_types(), 细胞样本类型 CRUD（biz_cell_sample_type）, _row_to_dict(), soft_delete_cell_sample_type(), type_code_exists() (+742 more)
### Community 2 - "Community 2"
Cohesion: 0.01
Nodes (630): AttachmentDownloadUrlBody, DeptCreateBody, DeptUpdateBody, DictDataCreateBody, DictDataUpdateBody, DictTypeCreateBody, DictTypeUpdateBody, ExpressCompanyCreateBody (+622 more)
Nodes (595): AttachmentDownloadUrlBody, DeptCreateBody, DeptUpdateBody, DictDataCreateBody, DictDataUpdateBody, DictTypeCreateBody, DictTypeUpdateBody, ExpressCompanyCreateBody (+587 more)
### Community 3 - "Community 3"
Cohesion: 0.06
Nodes (588): 细胞存储 — 采集协议单 / 审核 / 财务确认 / 分期预警 API, 持久化协议子资源。 缴费（含明细校验）须在样本之前：明细校验失败时不得已占用样本编码。 各子表 CRUD 内部仍可能分段 commit，创建接, 与列表接口一致：按租户 + 角色数据权限判断是否可访问该协议单。, If mother info exists but no customerId, create a customer record and link it., Base, 细胞产品 CRUD（biz_cell_product）, 解析任务样本投入物，返回祖先链单段（样本终止节点）。, 将 get_product_chain 结果展平为上游→下游节点列表（含 current，不含 descendants）。 (+580 more)
Cohesion: 0.01
Nodes (390): _normalize_date_bound(), list_ethnics_for_select(), _body_to_payload(), _get_current_user_id(), get_production_reception_by_sample_code(), get_production_reception_detail(), _get_tenant_no(), post_production_reception() (+382 more)
### Community 4 - "Community 4"
Cohesion: 0.01
Nodes (295): _normalize_date_bound(), complete_protocol_invoice_request(), create_collection_protocol(), delete_collection_protocol(), _draft_fields_from_body(), get_collection_protocol_detail(), _get_current_user_id(), get_invoice_eligible_payments() (+287 more)
Cohesion: 0.07
Nodes (407): 环境检测 — 检测项维护 + 登记管理 API, 保险公司及险种价格管理 API（保险公司 + 开票信息 + 险种价格）, ProcessDefCreateBody, ProcessDefUpdateBody, PublishVersionBody, 审批意见：前端传 commentText，兼容 comment。, StartInstanceBody, TaskActionBody (+399 more)
### Community 5 - "Community 5"
Cohesion: 0.02
Nodes (189): get_schedule_detail(), _allocate_batch_name(), _apply_assignees_to_batch_tasks(), _assignee_names(), _batch_assignee_user_ids(), _batch_has_blocking_tasks(), _batch_item_ids(), _batch_to_dict() (+181 more)
Cohesion: 0.06
Nodes (340): CellSampleTypeCreateBody, CellSampleTypeUpdateBody, CollectionRegionCreateBody, CollectionRegionUpdateBody, CustomerCreateBody, CustomerUpdateBody, HospitalCreateBody, HospitalUpdateBody (+332 more)
### Community 6 - "Community 6"
Cohesion: 0.02
Nodes (117): get_designer_data(), _error_json(), 数据库异常：返回 JSON 并保留 CORS 头，避免浏览器只报跨域错误, 未捕获异常：统一 JSON 500，确保跨域场景下仍有 Access-Control-Allow-Origin, sqlalchemy_exception_handler(), unhandled_exception_handler(), BaseHTTPMiddleware, ApiCryptoError (+109 more)
Nodes (219): eq_unicode(), like_unicode(), MySQL 字符串比较/模糊匹配时统一排序规则，避免 Illegal mix of collations。, 跨表字符串等值比较（JOIN / WHERE）时统一为 utf8mb4_unicode_ci。, 将列显式设为 utf8mb4_unicode_ci。, unicode_ci(), build_void_type_label_map(), format_protocol_status_label() (+211 more)
### Community 7 - "Community 7"
Cohesion: 0.02
Nodes (172): eq_unicode(), like_unicode(), MySQL 字符串比较/模糊匹配时统一排序规则，避免 Illegal mix of collations。, 跨表字符串等值比较（JOIN / WHERE）时统一为 utf8mb4_unicode_ci。, 将列显式设为 utf8mb4_unicode_ci。, unicode_ci(), build_void_type_label_map(), format_protocol_status_label() (+164 more)
Nodes (140): get_designer_data(), _error_json(), lifespan(), 数据库异常：返回 JSON 并保留 CORS 头，避免浏览器只报跨域错误, 未捕获异常：统一 JSON 500，确保跨域场景下仍有 Access-Control-Allow-Origin, sqlalchemy_exception_handler(), unhandled_exception_handler(), BaseHTTPMiddleware (+132 more)
### Community 8 - "Community 8"
Cohesion: 0.03
Nodes (166): _batch_line_to_dict(), _check_header_to_dict(), get_check_detail(), _line_counts(), list_checks(), _resolve_unused_item_fields(), _status_label(), _unused_amount() (+158 more)
Nodes (158): _copied_app_name(), copy_app(), create_app(), _create_version(), delete_app(), delete_group(), _dumps(), ensure_presets() (+150 more)
### Community 9 - "Community 9"
Cohesion: 0.03
Nodes (138): api_save_application(), get_protocol_nos_used_in_protocols(), _dec(), _fmt_dt(), list_stock_logs(), _row_to_dict(), _user_nick_name_map(), _fmt_dt() (+130 more)
Cohesion: 0.02
Nodes (144): _jwt_user_payload(), Web 端登录用 RSA 公钥（PKCS#1 v1.5，与 JSEncrypt 一致）, Web 端登录：账号为 sys_user.user_no，密码为 sys_user.password（bcrypt）。, refresh_token(), web_login(), web_login_rsa_public_key(), create_access_token(), create_refresh_token() (+136 more)
### Community 10 - "Community 10"
Cohesion: 0.04
Nodes (134): 发起前预览审批链（条件齐后解析最终路径与审批人）。, 兼容旧 GET：无 formData，含条件分支时多为待确定占位。, _app_to_dict(), create_app(), _create_version(), delete_app(), delete_group(), _dumps() (+126 more)
Cohesion: 0.03
Nodes (148): _ancestor_link_from_cell_product_input(), _ancestor_sample_chain_link(), _apply_cell_product_status_change(), _build_ancestor_chain(), _build_descendant_chain(), _build_facility_path_label(), build_split_product_codes(), create_cell_product() (+140 more)
### Community 11 - "Community 11"
Cohesion: 0.05
Nodes (115): AccessLogCreateBody, AccessLogUpdateBody, CleanRoomCreateBody, CleanRoomUpdateBody, ExhibitionAppointmentCreateBody, ExhibitionAppointmentUpdateBody, list_storage_slot_stats(), OccupancyCreateBody (+107 more)
Nodes (108): AccessLogCreateBody, AccessLogUpdateBody, CleanRoomCreateBody, CleanRoomUpdateBody, ExhibitionAppointmentCreateBody, ExhibitionAppointmentUpdateBody, OccupancyCreateBody, 运营支撑 API（洁净室、进出记录、仓储设施、储位、展厅预约） (+100 more)
### Community 12 - "Community 12"
Cohesion: 0.05
Nodes (94): _body_to_payload(), _get_current_user_id(), get_production_reception_by_sample_code(), get_production_reception_detail(), _get_tenant_no(), post_production_reception(), put_production_reception(), _resolve_reception_id() (+86 more)
### Community 13 - "Community 13"
Cohesion: 0.45
Nodes (71): BatchStockInBody, BatchStockInItem, BatchStockOutBody, BatchStockOutItem, ConsumableCreateBody, ConsumablePackCreateBody, ConsumablePackUpdateBody, ConsumableUpdateBody (+63 more)
### Community 13 - "Community 13"
Cohesion: 0.09
Nodes (50): complete_application(), create_basic_experiment_sale_schedules(), create_infusion_plan(), create_schedule(), _create_schedule_products(), _format_yyyy_mm_dd(), _generate_application_no(), get_application() (+42 more)
### Community 14 - "Community 14"
Cohesion: 0.05
Nodes (55): _jwt_user_payload(), Web 端登录用 RSA 公钥（PKCS#1 v1.5，与 JSEncrypt 一致）, Web 端登录：账号为 sys_user.user_no，密码为 sys_user.password（bcrypt）。, refresh_token(), web_login(), web_login_rsa_public_key(), lifespan(), create_access_token() (+47 more)
### Community 15 - "Community 15"
Cohesion: 0.1
Nodes (39): _ancestor_link_from_cell_product_input(), _ancestor_sample_chain_link(), _build_ancestor_chain(), _build_descendant_chain(), _build_facility_path_label(), build_split_product_codes(), create_cell_products_by_quantity(), _donation_sample_chain_node() (+31 more)
### Community 16 - "Community 16"
Cohesion: 0.12
Nodes (11): get_wechat_pay_client(), get_wechat_pay_v2(), 微信支付工具模块 支持微信支付 V3 API 文档参考: https://pay.weixin.qq.com/docs/v3/apis/index.ht, 统一下单接口 (V3) Args: out_trade_no: 商户订单号 total, 申请退款 Args: out_trade_no: 商户订单号 total_amount, 小程序调起支付的二次签名参数（与公众号 JSAPI 规则一致）, 统一下单 (V2 API) Args: out_trade_no: 商户订单号 tot, 生成签名 V3 (SHA256 with RSA) (+3 more)
### Community 17 - "Community 17"
Cohesion: 0.14
Nodes (11): apply_formulas_and_linkages(), eval_formula(), _extract_rules(), preprocess_formula(), OA 表单公式与数据联动（禁止任意 eval）, 按 schema 中字段 props.formula / props.linkage 回填 form_data。 linkage 示例: { "when, 将 {field} 转为合法标识符引用 field。, _SafeEval (+3 more)
### Community 18 - "Community 18"
Cohesion: 0.16
Nodes (22): _code_exists(), create_material(), _dec(), _fmt_dt(), get_material(), get_material_entity(), get_my_usages(), _is_enabled_status() (+14 more)
### Community 19 - "Community 19"
### Community 15 - "Community 15"
Cohesion: 0.21
Nodes (19): _consumable_row_to_dict(), create_process(), _create_sub_consumable(), _create_sub_data_collection(), _create_sub_output(), _create_sub_reagent(), _data_collection_row_to_dict(), get_process() (+11 more)
### Community 20 - "Community 20"
### Community 16 - "Community 16"
Cohesion: 0.2
Nodes (19): _code_exists(), create_material(), _dec(), _fmt_dt(), get_material(), get_material_entity(), get_my_usages(), _is_enabled_status() (+11 more)
### Community 17 - "Community 17"
Cohesion: 0.21
Nodes (16): _field_label(), _is_non_empty_str(), _is_required(), _is_valid_receive_account_item(), normalize_account_fields(), _pick(), _pick_order_num(), _pick_str() (+8 more)
### Community 21 - "Community 21"
Cohesion: 0.24
Nodes (9): 微信消息通知服务 支持微信小程序模板消息推送 使用方式: from app.core.wechat_message import Wech, 发送模板消息 Args: openid: 用户openid templ, send_delivery_notice(), send_delivery_warning(), send_order_status(), send_payment_success(), send_refund_result(), send_urge_notification() (+1 more)
### Community 18 - "Community 18"
Cohesion: 0.2
Nodes (14): add_days_yyyymmdd(), add_interval_months_yyyymmdd(), add_months_yyyymmdd(), calc_fq_installment_due_date(), calc_installment_due_amounts_by_ratios(), _calc_installment_due_amounts_inline(), calc_unpaid_amounts_by_ratios(), is_legacy_installment_ratios() (+6 more)
### Community 22 - "Community 22"
### Community 19 - "Community 19"
Cohesion: 0.24
Nodes (11): deduct_for_step(), _display_remark(), list_stock_logs(), _parse_receiver_purpose_from_remark(), 试剂变动记录 CRUD（biz_reagent_stock_log）, 撤销步骤此前 step_save 扣减，便于重新填报。, 扣减试剂库存并生成变动记录。调用方控制事务，本函数不 commit。, _resolve_receiver_purpose() (+3 more)
### Community 23 - "Community 23"
### Community 20 - "Community 20"
Cohesion: 0.24
Nodes (11): deduct_for_step(), _display_remark(), list_stock_logs(), _parse_receiver_purpose_from_remark(), 耗材变动记录 CRUD（biz_consumable_stock_log）, 撤销步骤此前 step_save 扣减，便于重新填报。, 扣减耗材库存并生成变动记录。调用方控制事务，本函数不 commit。, _resolve_receiver_purpose() (+3 more)
### Community 24 - "Community 24"
Cohesion: 0.31
Nodes (10): create_account(), _filtered_query(), get_account(), list_accounts(), list_options(), OA 收款账户 CRUD（oa_receive_account）, row_to_dict(), soft_delete_account() (+2 more)
### Community 25 - "Community 25"
### Community 21 - "Community 21"
Cohesion: 0.31
Nodes (10): _build_tree(), _cascade_soft_delete(), _collect_with_ancestors(), get_dept(), list_depts(), list_depts_tree(), 保留匹配节点及其全部上级，供关键词检索后仍能正确组树。, _row_to_dict() (+2 more)
### Community 26 - "Community 26"
### Community 22 - "Community 22"
Cohesion: 0.31
Nodes (10): create_account(), _filtered_query(), get_account(), list_accounts(), list_options(), OA 收款账户 CRUD（oa_receive_account）, row_to_dict(), soft_delete_account() (+2 more)
### Community 23 - "Community 23"
Cohesion: 0.33
Nodes (8): _build_tree(), _cascade_soft_delete(), get_menu(), list_menus(), list_menus_tree(), _row_to_dict(), soft_delete_menu(), update_menu()
### Community 27 - "Community 27"
### Community 24 - "Community 24"
Cohesion: 0.29
Nodes (2): BaseModel, SoftDeleteModel
### Community 28 - "Community 28"
Cohesion: 0.32
Nodes (5): create_leave(), get_leave(), list_leaves(), _row_to_dict(), soft_delete_leave()
### Community 29 - "Community 29"
### Community 25 - "Community 25"
Cohesion: 0.38
Nodes (6): derive_legacy_status_from_three(), derive_three_status_from_legacy(), 阶段A兼容：从旧 status 推导三字段。 约束：旧 status 本身混合了支付/配送/订单生命周期，因此只能尽力推断； 若业务侧已有更精确, 阶段A兼容：从三字段反推旧 status（用于旧前端/旧筛选参数兼容）。, ThreeStatus, _to_decimal()
### Community 30 - "Community 30"
### Community 26 - "Community 26"
Cohesion: 0.5
Nodes (3): BaseSettings, Config, Settings
### Community 31 - "Community 31"
### Community 27 - "Community 27"
Cohesion: 0.5
Nodes (2): _auto_fill_create_dept_id(), ORM before_insert 钩子：当 create_dept_id 为空时，自动从请求上下文填充当前用户部门 ID
### Community 32 - "Community 32"
### Community 28 - "Community 28"
Cohesion: 0.67
Nodes (2): get_menu_list(), 运营端菜单接口（与 web-admin 前端静态路由 sqxp.ts 对齐，5 个一级菜单分组）
### Community 33 - "Community 33"
### Community 29 - "Community 29"
Cohesion: 0.67
Nodes (1): 转正套件：入职日 + 试用期月数 → 建议转正日（YYYY-MM-DD）。
### Community 30 - "Community 30"
Cohesion: 1.0
Nodes (1): 质检物料金额查看授权：专用角色与菜单权限常量。
### Community 34 - "Community 34"
### Community 31 - "Community 31"
Cohesion: 1.0
Nodes (1): 请求级别的用户上下文变量 通过 contextvars 在请求处理链路中传递当前用户信息， 供 SQLAlchemy 事件监听器等底层机制使用，避免逐层手动传
### Community 35 - "Community 35"
### Community 32 - "Community 32"
Cohesion: 1.0
Nodes (1): API 路由包（骨架：公共鉴权 + 静态菜单 + 运营端占位）
### Community 38 - "Community 38"
### Community 35 - "Community 35"
Cohesion: 1.0
Nodes (1): 发送订单状态通知 Args: openid: 用户openid ord
### Community 39 - "Community 39"
### Community 36 - "Community 36"
Cohesion: 1.0
Nodes (1): 发送支付成功通知 Args: openid: 用户openid ord
### Community 40 - "Community 40"
### Community 37 - "Community 37"
Cohesion: 1.0
Nodes (1): 发送配送通知 Args: openid: 配送员openid task
### Community 41 - "Community 41"
### Community 38 - "Community 38"
Cohesion: 1.0
Nodes (1): 发送配送时效预警 Args: openid: 配送员openid ta
### Community 42 - "Community 42"
### Community 39 - "Community 39"
Cohesion: 1.0
Nodes (1): 发送退款结果通知 Args: openid: 用户openid ord
### Community 43 - "Community 43"
### Community 40 - "Community 40"
Cohesion: 1.0
Nodes (1): 发送催单通知给配送员 Args: deliver_openid: 配送员openid
## Knowledge Gaps
- **151 isolated node(s):** `刷新会话 TTL（refreshToken 续期；已登录用户每次 API 校验通过后滑动续期）`, `写入 refreshToken（用于 one-time 使用/吊销）`, `根据 token 获取当前用户（包含 Redis 会话校验；会话滑动续期）`, `登录凭据 RSA 解密（与前端 JSEncrypt PKCS#1 v1.5 兼容）。`, `加载 RSA 密钥对：优先环境变量，否则使用内置固定默认密钥。` (+146 more)
- **163 isolated node(s):** `刷新会话 TTL（refreshToken 续期；已登录用户每次 API 校验通过后滑动续期）`, `写入 refreshToken（用于 one-time 使用/吊销）`, `根据 token 获取当前用户（包含 Redis 会话校验；会话滑动续期）`, `登录凭据 RSA 解密（与前端 JSEncrypt PKCS#1 v1.5 兼容）。`, `加载 RSA 密钥对：优先环境变量，否则使用内置固定默认密钥。` (+158 more)
These have ≤1 connection - possible missing edges or undocumented components.
- **Thin community `Community 27`** (8 nodes): `BaseModel`, `.to_dict()`, `get_active()`, `base.py`, `SoftDeleteModel`, `.restore()`, `.soft_delete()`, `__tablename__()`
- **Thin community `Community 24`** (8 nodes): `BaseModel`, `.to_dict()`, `get_active()`, `base.py`, `SoftDeleteModel`, `.restore()`, `.soft_delete()`, `__tablename__()`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 31`** (4 nodes): `_auto_fill_create_dept_id()`, `get_db()`, `database.py`, `ORM before_insert 钩子：当 create_dept_id 为空时，自动从请求上下文填充当前用户部门 ID`
- **Thin community `Community 27`** (4 nodes): `_auto_fill_create_dept_id()`, `get_db()`, `database.py`, `ORM before_insert 钩子：当 create_dept_id 为空时，自动从请求上下文填充当前用户部门 ID`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 32`** (3 nodes): `get_menu_list()`, `menu.py`, `运营端菜单接口（与 web-admin 前端静态路由 sqxp.ts 对齐，5 个一级菜单分组）`
- **Thin community `Community 28`** (3 nodes): `get_menu_list()`, `menu.py`, `运营端菜单接口（与 web-admin 前端静态路由 sqxp.ts 对齐，5 个一级菜单分组）`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 33`** (2 nodes): `qc_material_amount_auth_constants.py`, `质检物料金额查看授权：专用角色与菜单权限常量。`
- **Thin community `Community 29`** (3 nodes): `add_months_ymd()`, `oa_confirmation_date.py`, `转正套件：入职日 + 试用期月数 → 建议转正日（YYYY-MM-DD）。`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 34`** (2 nodes): `context.py`, `请求级别的用户上下文变量 通过 contextvars 在请求处理链路中传递当前用户信息， 供 SQLAlchemy 事件监听器等底层机制使用，避免逐层手动传`
- **Thin community `Community 30`** (2 nodes): `qc_material_amount_auth_constants.py`, `质检物料金额查看授权：专用角色与菜单权限常量。`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 35`** (2 nodes): `__init__.py`, `API 路由包（骨架：公共鉴权 + 静态菜单 + 运营端占位）`
- **Thin community `Community 31`** (2 nodes): `context.py`, `请求级别的用户上下文变量 通过 contextvars 在请求处理链路中传递当前用户信息， 供 SQLAlchemy 事件监听器等底层机制使用，避免逐层手动传`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 38`** (1 nodes): `发送订单状态通知 Args: openid: 用户openid ord`
- **Thin community `Community 32`** (2 nodes): `__init__.py`, `API 路由包（骨架：公共鉴权 + 静态菜单 + 运营端占位）`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 39`** (1 nodes): `发送支付成功通知 Args: openid: 用户openid ord`
- **Thin community `Community 35`** (1 nodes): `发送订单状态通知 Args: openid: 用户openid ord`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 40`** (1 nodes): `发送配送通知 Args: openid: 配送员openid task`
- **Thin community `Community 36`** (1 nodes): `发送支付成功通知 Args: openid: 用户openid ord`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 41`** (1 nodes): `发送配送时效预警 Args: openid: 配送员openid ta`
- **Thin community `Community 37`** (1 nodes): `发送配送通知 Args: openid: 配送员openid task`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 42`** (1 nodes): `发送退款结果通知 Args: openid: 用户openid ord`
- **Thin community `Community 38`** (1 nodes): `发送配送时效预警 Args: openid: 配送员openid ta`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 43`** (1 nodes): `发送催单通知给配送员 Args: deliver_openid: 配送员openid`
- **Thin community `Community 39`** (1 nodes): `发送退款结果通知 Args: openid: 用户openid ord`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 40`** (1 nodes): `发送催单通知给配送员 Args: deliver_openid: 配送员openid`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
## Suggested Questions
_Questions this graph is uniquely positioned to answer:_
- **Why does `SysUser` connect `Community 2` to `Community 0`, `Community 1`, `Community 3`, `Community 4`, `Community 5`, `Community 8`, `Community 9`, `Community 10`, `Community 11`, `Community 13`, `Community 14`, `Community 18`, `Community 22`, `Community 23`?**
_High betweenness centrality (0.122) - this node is a cross-community bridge._
- **Why does `success_response()` connect `Community 0` to `Community 32`, `Community 2`, `Community 4`, `Community 6`, `Community 9`, `Community 11`, `Community 12`, `Community 14`?**
_High betweenness centrality (0.051) - this node is a cross-community bridge._
- **Why does `generate_uuid()` connect `Community 1` to `Community 0`, `Community 4`, `Community 5`, `Community 6`, `Community 7`, `Community 8`, `Community 9`, `Community 10`, `Community 11`, `Community 12`, `Community 14`, `Community 18`, `Community 19`, `Community 22`, `Community 23`, `Community 24`, `Community 28`?**
_High betweenness centrality (0.035) - this node is a cross-community bridge._
- **Are the 822 inferred relationships involving `str` (e.g. with `unhandled_exception_handler()` and `get_current_user_by_token()`) actually correct?**
_`str` has 822 INFERRED edges - model-reasoned connections that need verification._
- **Are the 723 inferred relationships involving `success_response()` (e.g. with `list_storage_release_reviews()` and `get_storage_release_review_detail()`) actually correct?**
_`success_response()` has 723 INFERRED edges - model-reasoned connections that need verification._
- **Are the 596 inferred relationships involving `error_response()` (e.g. with `_json_error_response()` and `list_storage_release_reviews()`) actually correct?**
_`error_response()` has 596 INFERRED edges - model-reasoned connections that need verification._
- **Are the 574 inferred relationships involving `SysUser` (e.g. with `数据权限过滤（V0.3：基于角色 data_scope 的查询级行级过滤） data_scope 值： 1 = 全部数据 2 = 本部门数据 3` and `从 SysUser 读取用户的 dept_id。`) actually correct?**
_`SysUser` has 574 INFERRED edges - model-reasoned connections that need verification._
- **Why does `SysUser` connect `Community 2` to `Community 0`, `Community 1`, `Community 3`, `Community 4`, `Community 5`, `Community 7`, `Community 8`, `Community 9`, `Community 11`, `Community 12`, `Community 19`, `Community 20`?**
_High betweenness centrality (0.123) - this node is a cross-community bridge._
- **Why does `success_response()` connect `Community 0` to `Community 2`, `Community 3`, `Community 5`, `Community 7`, `Community 9`, `Community 28`?**
_High betweenness centrality (0.050) - this node is a cross-community bridge._
- **Why does `generate_uuid()` connect `Community 1` to `Community 0`, `Community 2`, `Community 3`, `Community 5`, `Community 6`, `Community 7`, `Community 8`, `Community 9`, `Community 10`, `Community 11`, `Community 15`, `Community 16`, `Community 19`, `Community 20`, `Community 22`?**
_High betweenness centrality (0.037) - this node is a cross-community bridge._
- **Are the 847 inferred relationships involving `str` (e.g. with `unhandled_exception_handler()` and `get_current_user_by_token()`) actually correct?**
_`str` has 847 INFERRED edges - model-reasoned connections that need verification._
- **Are the 726 inferred relationships involving `success_response()` (e.g. with `list_storage_release_reviews()` and `get_storage_release_review_detail()`) actually correct?**
_`success_response()` has 726 INFERRED edges - model-reasoned connections that need verification._
- **Are the 599 inferred relationships involving `error_response()` (e.g. with `_json_error_response()` and `list_storage_release_reviews()`) actually correct?**
_`error_response()` has 599 INFERRED edges - model-reasoned connections that need verification._
- **Are the 582 inferred relationships involving `SysUser` (e.g. with `数据权限过滤（V0.3：基于角色 data_scope 的查询级行级过滤） data_scope 值： 1 = 全部数据 2 = 本部门数据 3` and `从 SysUser 读取用户的 dept_id。`) actually correct?**
_`SysUser` has 582 INFERRED edges - model-reasoned connections that need verification._
backend/graphify-out/graph.json
+20707 -16084
View File
File diff suppressed because it is too large. Load diff
backend/tests/test_effective_roles.py
+16
View File
@@ -0,0 +1,16 @@
"""有效角色解析：直接角色 ∪ 职位继承角色（纯逻辑断言，无 DB 依赖部分）。"""
from app.services.web_auth_roles import _map_role_name_to_web, NO_ROLE_WEB_ROLE
def test_map_role_name_super_admin():
assert _map_role_name_to_web("超级管理员") == "super_admin"
assert _map_role_name_to_web("系统管理员") == "super_admin"
def test_map_role_name_admin_default():
assert _map_role_name_to_web("质检员") == "admin"
assert _map_role_name_to_web("") == "admin"
def test_guest_constant():
assert NO_ROLE_WEB_ROLE == "guest"
backend/tests/test_oa_assignee.py
+9 -10
View File
@@ -82,10 +82,10 @@ class TestOaAssignee(unittest.TestCase):
advanced={"supervisorFallbackToDeptLeader": False},
)
def test_oa_role_gm(self):
def test_posts_resolve(self):
db = MagicMock()
with patch(
"app.services.oa_assignee.oa_crud.list_oa_role_user_ids",
"app.services.oa_assignee.user_crud.list_user_ids_bound_to_posts",
return_value=["gm_user", "inactive"],
), patch(
"app.services.oa_assignee._active_user_id",
@@ -94,17 +94,17 @@ class TestOaAssignee(unittest.TestCase):
users, meta = resolve_assignees(
db,
tenant_no="zkxw",
assignee_config={"assigneeType": "oa_roles", "oaRoleIds": ["gm_role_id"]},
assignee_config={"assigneeType": "posts", "postIds": ["post_gm"]},
initiator_user_id="zhang",
)
self.assertEqual(users, ["gm_user"])
self.assertEqual(meta.get("resolve_source"), "oa_roles")
self.assertEqual(meta.get("resolve_source"), "posts")
def test_never_reads_sys_role(self):
db = MagicMock()
with patch(
"app.services.oa_assignee.oa_crud.list_oa_role_user_ids",
return_value=["oa_only"],
"app.services.oa_assignee.user_crud.list_user_ids_bound_to_posts",
return_value=["post_only"],
) as mock_list, patch(
"app.services.oa_assignee._active_user_id",
side_effect=lambda _db, uid, _tn: uid,
@@ -112,12 +112,11 @@ class TestOaAssignee(unittest.TestCase):
users, _meta = resolve_assignees(
db,
tenant_no="zkxw",
assignee_config={"assigneeType": "oa_roles", "oaRoleIds": ["r1"]},
assignee_config={"assigneeType": "posts", "postIds": ["p1"]},
initiator_user_id="zhang",
)
self.assertEqual(users, ["oa_only"])
self.assertEqual(users, ["post_only"])
mock_list.assert_called_once()
# 业务路径不得查询 sys_role
for call in db.query.call_args_list:
args = call[0] if call[0] else ()
for a in args:
@@ -139,7 +138,7 @@ class TestOaAssignee(unittest.TestCase):
def test_normalize_prefers_assignee_types(self):
self.assertEqual(
normalize_cc_assignee_types(
{"assigneeTypes": ["users", "dept_leader", "users", "bad"], "assigneeType": "oa_roles"}
{"assigneeTypes": ["users", "dept_leader", "users", "bad"], "assigneeType": "posts"}
),
["users", "dept_leader"],
)
backend/tests/test_oa_publish.py
+4 -4
View File
@@ -192,7 +192,7 @@ class TestOaPublishValidate(unittest.TestCase):
def test_draft_requires_fillable_and_assignee(self):
db = MagicMock()
with patch(
"app.services.oa_publish.validate_oa_roles_referenced",
"app.services.oa_publish.validate_posts_referenced",
return_value=[],
):
errs = validate_draft_for_publish(
@@ -214,7 +214,7 @@ class TestOaPublishValidate(unittest.TestCase):
def test_valid_draft_passes_form_and_flow(self):
db = MagicMock()
with patch(
"app.services.oa_publish.validate_oa_roles_referenced",
"app.services.oa_publish.validate_posts_referenced",
return_value=[],
):
errs = validate_draft_for_publish(
@@ -264,7 +264,7 @@ class TestConditionPublish(unittest.TestCase):
def test_invalid_field_reference(self):
db = MagicMock()
with patch(
"app.services.oa_publish.validate_oa_roles_referenced",
"app.services.oa_publish.validate_posts_referenced",
return_value=[],
):
errs = validate_draft_for_publish(
@@ -290,7 +290,7 @@ class TestConditionPublish(unittest.TestCase):
def test_field_not_flagged_rejected(self):
db = MagicMock()
with patch(
"app.services.oa_publish.validate_oa_roles_referenced",
"app.services.oa_publish.validate_posts_referenced",
return_value=[],
):
errs = validate_draft_for_publish(
docs/mockups/oa-form-kit-tab-demo.html
+1097
View File
File diff suppressed because it is too large. Load diff
docs/sql/drop_oa_role.sql
+10
View File
@@ -0,0 +1,10 @@
-- docs/sql/drop_oa_role.sql
-- 下线 OA 工作流角色：审批人选改为职位（sys_post / sys_user_post）
-- 同步软删菜单「工作流角色」
UPDATE `sys_menu`
SET `del_flag` = 1, `update_time` = NOW()
WHERE `id` = 'OA000000000000000000000000000102' AND `del_flag` = 0;
DROP TABLE IF EXISTS `oa_role_user`;
DROP TABLE IF EXISTS `oa_role`;
docs/sql/sys_post_role.sql
+19
View File
@@ -0,0 +1,19 @@
-- docs/sql/sys_post_role.sql
-- 职位-角色关联：职位可绑定多个角色，用户经职位继承角色权限（与直接角色取并集）
CREATE TABLE IF NOT EXISTS `sys_post_role` (
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
`post_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '职位ID',
`role_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '角色ID',
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记：0-正常 1-已删除',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_spr_post` (`tenant_no`,`post_id`,`del_flag`) USING BTREE,
KEY `idx_spr_role` (`tenant_no`,`role_id`,`del_flag`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='职位-角色关联';
docs/superpowers/plans/2026-07-31-oa-app-copy.md
+36
View File
@@ -0,0 +1,36 @@
# OA 审批应用复制 Implementation Plan
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
**Goal:** 在审批管理页支持一键复制审批应用（含表单/流程草稿），名称为原名+「复制」。
**Architecture:** 后端 `POST /apps/{id}/copy` 原子复制 `oa_app` + 一份草稿版本；前端「更多」菜单调用并刷新列表。
**Tech Stack:** FastAPI + SQLAlchemy；Vue 3 + Element Plus
**Spec:** `docs/superpowers/specs/2026-07-31-oa-app-copy-design.md`
---
### Task 1: 后端 copy_app CRUD + API
**Files:**
- Modify: `backend/app/crud/oa_approval.py`
- Modify: `backend/app/api/oa_approval.py`
- [ ] **Step 1:** 在 `oa_approval.py` CRUD 增加 `copy_app`：查源 app → 选草稿或最新发布 → `create_app` 等价新建（名称加「复制」并截断）→ 用源 JSON 写入 draft 版本（覆盖 create 时空草稿）。
- [ ] **Step 2:** 增加路由 `POST /apps/{app_id}/copy`，返回 `_app_to_dict(..., has_draft=True)`。
### Task 2: 前端 API + 菜单
**Files:**
- Modify: `web-admin/src/api/oaApproval.ts`
- Modify: `web-admin/src/views/oa-approval/apps/index.vue`
- [ ] **Step 1:** 增加 `fetchCopyOaApp`
- [ ] **Step 2:** 「更多」增加「复制」；`handleCopy` 调用后 `loadData`
### Task 3: 验证
- [ ] 手工：复制有草稿 / 仅已发布 / 空应用；名称与未发布状态正确
- [ ] 更新 graph：`./scripts/update-graph.sh all`（或 backend + frontend）
docs/superpowers/plans/2026-08-02-post-role-permission.md
+220
View File
@@ -0,0 +1,220 @@
# 职位关联角色（权限并集）Implementation Plan
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
**Goal:** 职位可关联角色；用户权限 = 直接角色 ∪ 职位继承角色（菜单 + 数据权限）；职位管理可配置角色，用户管理可多选职位。
**Architecture:** 新增 `sys_post_role`；抽 `get_effective_role_ids` 供 `web_auth_roles` 与 `data_scope` 共用；API 对齐现有 `GET/PUT /posts/{id}/users`；前端职位页「角色配置」、用户页补 `postIds`。
**Tech Stack:** FastAPI + SQLAlchemy + MySQL；Vue 3 + Element Plus；OpenSpec permission-conventions。
**Spec:** `docs/superpowers/specs/2026-08-02-post-role-permission-design.md`
---
## File map
| 文件 | 职责 |
|------|------|
| `docs/sql/sys_post_role.sql` | 建表 |
| `backend/app/models/models.py` | `SysPostRole` |
| `backend/app/crud/post.py` | 职位角色 list/sync；软删职位时软删关联 |
| `backend/app/services/web_auth_roles.py` | `get_effective_role_ids` + 改造菜单/角色名 |
| `backend/app/core/data_scope.py` | `_resolve_user_role_scopes` 用有效角色 |
| `backend/app/api/admin.py` | `GET/PUT /posts/{post_id}/roles` |
| `backend/tests/test_effective_roles.py` | 有效角色解析单测（可 mock Session 或轻量集成） |
| `web-admin/src/api/admin.ts` | `fetchPostBoundRoleIds` / `fetchUpdatePostBoundRoles` |
| `web-admin/src/views/system/post/index.vue` | 「角色配置」弹窗 |
| `web-admin/src/views/system/user/index.vue` | 职位多选 + 查看展示 |
| `docs/中科兴皖需求V0.3.md` §2.1.8 | 需求补充 |
| `openspec/.../permission-conventions/spec.md` | 并集语义扩展 |
---
### Task 1: SQL + Model
**Files:**
- Create: `docs/sql/sys_post_role.sql`
- Modify: `backend/app/models/models.py`（在 `SysUserPost` 后插入 `SysPostRole`）
- [ ] **Step 1: 写增量 SQL**
```sql
-- docs/sql/sys_post_role.sql
CREATE TABLE IF NOT EXISTS `sys_post_role` (
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
`post_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '职位ID',
`role_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '角色ID',
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记：0-正常 1-已删除',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_spr_post` (`tenant_no`,`post_id`,`del_flag`) USING BTREE,
KEY `idx_spr_role` (`tenant_no`,`role_id`,`del_flag`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='职位-角色关联';
```
- [ ] **Step 2: 增加 SQLAlchemy 模型**（字段与 `SysUserPost` 同风格，表名 `sys_post_role`，字段 `post_id`/`role_id`）
- [ ] **Step 3: 本地执行 SQL**（对当前开发库）
```bash
# 使用项目既有 DB 连接方式执行 docs/sql/sys_post_role.sql
```
---
### Task 2: 职位角色 CRUD
**Files:**
- Modify: `backend/app/crud/post.py`
- Modify: `backend/app/api/admin.py`（紧挨 posts users 路由之后）
- [ ] **Step 1: 在 `post.py` 增加**
```python
def list_role_ids_for_post(db, post_id: str, tenant_no: str) -> List[str]:
...
def sync_post_role_bindings(db, post_id, tenant_no, role_ids, updater_id) -> None:
"""全量替换：目标外软删，目标内恢复或新建（对齐 user 侧 set_user_* 模式）。"""
...
```
校验：每个 `role_id` 存在、同租户、`del_flag=0`（可选要求 `status=='1'` 才允许绑定——推荐允许绑停用角色但运行时不算有效，与用户绑停用角色一致即可）。
- [ ] **Step 2: `soft_delete_post` 时同步软删该职位下 `SysPostRole`（`del_flag=0` → 1）**
- [ ] **Step 3: API**
```python
class PostRolesUpdateBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
role_ids: List[str] = Field(default_factory=list, alias="roleIds")
@router.get("/posts/{post_id}/roles")
# require_menu_code("system:post:list") → {"roleIds": [...]}
@router.put("/posts/{post_id}/roles")
# require_admin_or_super_admin → sync_post_role_bindings
```
---
### Task 3: 有效角色解析
**Files:**
- Modify: `backend/app/services/web_auth_roles.py`
- Modify: `backend/app/core/data_scope.py`
- Create: `backend/tests/test_effective_roles.py`（纯函数级：若难起库，可用 SQLAlchemy 内存或对查询逻辑做小型集成；最低限度用注释说明手动验收场景）
- [ ] **Step 1: 实现 `get_effective_role_ids(db, user_id) -> list[str]`**
逻辑：
1. 直接：`SysUserRole` ⋈ `SysRole`（role status=1, del_flag=0）
2. 职位：`SysUserPost` ⋈ `SysPost`(status=1) ⋈ `SysPostRole` ⋈ `SysRole`(status=1)
3. 去重保序
- [ ] **Step 2: 改造 `_active_role_name_rows` / `iter_user_menu_perm_codes`**
用有效 role_id 查 `SysRole.role_name` / `SysRoleMenu`→`SysMenu`，不再仅 join `SysUserRole`。
- [ ] **Step 3: 改造 `data_scope._resolve_user_role_scopes`**
`from app.services.web_auth_roles import get_effective_role_ids`，按 ids 查 `SysRole` 与 detail。
- [ ] **Step 4: grep 防漏**
```bash
rg -n "SysUserRole" backend/app --glob '*.py'
```
凡「解析当前用户权限」路径必须改为有效角色；配置管理类（给角色绑用户等）保持只动 `sys_user_role`。
- [ ] **Step 5: 跑测试**
```bash
cd backend && source venv/bin/activate && pytest tests/test_effective_roles.py tests/test_api_crypto.py -v
```
---
### Task 4: 前端 API + 职位「角色配置」
**Files:**
- Modify: `web-admin/src/api/admin.ts`
- Modify: `web-admin/src/views/system/post/index.vue`
- [ ] **Step 1: API**
```ts
export function fetchPostBoundRoleIds(postId: string) {
return request.get<{ roleIds: string[] }>({ url: `/web/admin/posts/${postId}/roles` })
}
export function fetchUpdatePostBoundRoles(postId: string, roleIds: string[]) {
return request.put({
url: `/web/admin/posts/${postId}/roles`,
params: { roleIds },
showSuccessMessage: true
})
}
```
- [ ] **Step 2: 职位页**
操作列在「关联用户」旁加「角色配置」；弹窗用 `el-select` multiple + `fetchRoleList({ pageSize: 100 })` 加载选项；打开时 `fetchPostBoundRoleIds`；保存 `fetchUpdatePostBoundRoles`。
查看详情可增加「已关联角色」字段（可选）。
按钮须带 `el-icon`（如 `Key` / `Setting`）。
---
### Task 5: 用户管理职位多选
**Files:**
- Modify: `web-admin/src/views/system/user/index.vue`
- [ ] **Step 1:** `formData` 增加 `postIds: string[]`；表单项「职位」多选（`fetchPostList`）；详情回填 `detail.postIds`；submit 带 `postIds`；查看 sections 展示职位名（可用 `postOptions` 映射）。
- [ ] **Step 2:** 确认后端 create/update 已传 `postIds`（`admin.py` UserCreate/UpdateBody 已有）。
---
### Task 6: 文档与图谱
**Files:**
- Modify: `docs/中科兴皖需求V0.3.md` §2.1.8
- Modify: `openspec/changes/zkxw-engineering-standards/specs/permission-conventions/spec.md`
- Run: `./scripts/update-graph.sh backend` 与 `frontend`（若改了前端）
- [ ] **Step 1:** 需求补充：职位可关联角色；用户菜单/数据权限 = 直接角色 ∪ 职位角色。
- [ ] **Step 2:** OpenSpec 在「多角色权限合并」下增加职位继承 Scenario。
- [ ] **Step 3:** 更新 graphify。
---
### Task 7: 手工验收清单
- [ ] 仅职位绑角色、无直接角色 → 侧栏有菜单、非 guest
- [ ] 直接角色 + 职位角色 → 菜单并集
- [ ] 停用职位 → 继承失效
- [ ] 用户改职位不影响直接角色；职位改角色不影响用户直接角色列表
- [ ] OA 职位控件仍可用
---
## Spec coverage check
| Spec 项 | Task |
|---------|------|
| `sys_post_role` | T1 |
| GET/PUT roles API | T2 |
| `get_effective_role_ids` + web_auth + data_scope | T3 |
| 职位角色配置 UI | T4 |
| 用户 postIds UI | T5 |
| 文档/OpenSpec | T6 |
| 停用语义 / 并集 | T3 + T7 |
| 非目标 OA | 不改 |
**Commits:** 按用户要求再提交；实现过程默认不自动 commit。
docs/superpowers/plans/2026-08-04-oa-assignee-posts-replace-roles.md
+16
View File
@@ -0,0 +1,16 @@
# OA 审批人：工作流角色 → 职位 Implementation Plan
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task.
**Goal:** 流程审批/抄送用职位成员替代工作流角色；彻底删除 OA 角色模块并 DROP 表。
**Architecture:** `assigneeType: "posts"` + `postIds` → `sys_user_post` 展开用户；不碰 `sys_post_role`。
**Spec:** `docs/superpowers/specs/2026-08-04-oa-assignee-posts-replace-roles-design.md`
**Status:** 已完成（2026-08-04）
- [x] Task 1: 后端解析与发布校验
- [x] Task 2: 前端流程设计器
- [x] Task 3: 删除工作流角色模块 + drop SQL
- [x] Task 4: 验收（`pytest` 35 passed）
docs/superpowers/specs/2026-07-31-oa-app-copy-design.md
+62
View File
@@ -0,0 +1,62 @@
# OA 审批应用「复制」设计
| 项 | 内容 |
|----|------|
| 状态 | 已定稿 |
| 日期 | 2026-07-31 |
| 范围 | 审批管理页复制应用（基础信息 + 表单/流程/高级设置草稿） |
| 页面 | `/#/system-manage/oa-approval/apps` |
---
## 1. 目标与非目标
**目标**
- 在审批管理卡片「更多」中提供「复制」。
- 一键生成与源流程内容一致的新应用；名称 = 原名称 +「复制」。
- 内容来源：优先当前草稿；无草稿则用最新已发布版；皆无则空草稿。
- 副本始终为**未发布草稿**；复制成功后留在列表并刷新。
**非目标**
- 不自动发布副本。
- 不复制历史版本、实例、任务。
- 不跳转设计器。
---
## 2. 行为（SHALL）
1. 入口：卡片「更多」→「复制」（位于「编辑基础」与「删除」之间）。
2. 点击后直接执行（无二次确认）；成功 Toast；刷新列表。
3. 新名称：`{appName}复制`。若超过 50 字：保留后缀「复制」，前缀截断使总长 ≤ 50。
4. 复制字段：
- 应用：`groupId`、`iconUrl`、`description`、`initiatorScope`、`initiatorUserIds`、`adminScope`、`adminUserIds`、`status`、`orderNum`、`remark`
- 版本草稿：`formSchemaJson`、`flowTreeJson`、`advancedSettingsJson`（深拷贝 JSON）
5. 新应用仅有 `version_no=1` 的 `draft`；`is_latest_published=0`；列表无已发布版本标签。
6. 租户隔离与创建应用权限一致（admin / super_admin）。
---
## 3. API
`POST /web/admin/oa-approval/apps/{app_id}/copy`
- 成功：返回新应用字典（与 create 一致），message「复制成功」。
- 源不存在：400「应用不存在」。
---
## 4. 前端
- `fetchCopyOaApp(id)` in `web-admin/src/api/oaApproval.ts`
- `apps/index.vue`：下拉项 + `handleCopy`；图标可用 `CopyDocument`
---
## 5. 自检
- [x] 无未决占位符
- [x] 与口头确认一致（草稿优先 / 未发布 / 留列表）
- [x] 范围仅应用复制，不涉及实例复制
docs/superpowers/specs/2026-08-02-post-role-permission-design.md
+146
View File
@@ -0,0 +1,146 @@
# 职位纳入权限载体（职位关联角色 · 并集模型）
**日期：** 2026-08-02
**范围：** `sys_post` / `sys_post_role` / 用户有效角色解析 / 职位管理「角色配置」/ 用户管理职位多选
**方案：** 运行时并集（方案 1），不物化复制到 `sys_user_role`
## 已确认决策
| 项 | 结论 |
|----|------|
| 权限来源 | **并集**：用户直接角色 ∪ 职位继承角色 |
| 继承内容 | **菜单权限 + 数据权限**（与现有多角色并集语义一致） |
| 配置入口 | **职位管理**增加「角色配置」；用户管理补上职位多选 |
| 非目标 | 角色页反向关联职位；权限来源可视化；OA `OaRole` / 审批人解析；职位自带菜单树 |
## 背景与现状
- **角色**（`sys_role`）是权限载体：`sys_role_menu`（菜单）、`data_scope` + `sys_role_data_scope_detail`（数据范围）。
- **用户**通过 `sys_user_role` 绑定角色；登录后 `iter_user_menu_perm_codes`、`apply_data_scope`（`_resolve_user_role_scopes`）仅查直接角色。
- **职位**（`sys_post`）仅有 `sys_user_post` 关联；不参与 RBAC。OA 表单「职位」控件另用，本设计不改动。
- 用户 API 已支持 `postIds`，用户管理前端未暴露职位多选。
## 目标模型
```
用户 ──sys_user_role──────────────▶ 角色 ──▶ 菜单 / 数据权限
│ ▲
└──sys_user_post──▶ 职位 ──sys_post_role──┘
有效角色 = 启用直接角色 ∪（启用职位所关联的启用角色）
有效菜单码 / 数据范围 = 对有效角色取并集（与现规范一致）
```
## 数据模型
### 新表 `sys_post_role`
对齐 `sys_user_role` / `sys_user_post` 结构：
| 字段 | 说明 |
|------|------|
| `id` | VARCHAR(64) UUID PK |
| `post_id` | 职位 ID |
| `role_id` | 角色 ID |
| 公共字段 | `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag` |
- 软删除：`del_flag=1`，查询默认排除。
- 业务唯一：同一租户下同一 `(post_id, role_id)` 仅一条有效关联（写入时软删旧行再插，或应用层去重；与现有 `sys_user_role` 替换策略一致）。
- SQL 增量：`docs/sql/sys_post_role.sql`；模型：`SysPostRole`（`backend/app/models/models.py`）。
既有表不变：`sys_post`、`sys_user_post`、`sys_user_role`、`sys_role*`。
## 后端权限解析
### 统一入口
在 `backend/app/services/web_auth_roles.py`（或抽出共享 helper，供 data_scope 复用）提供：
1. **`get_effective_role_ids(db, user_id) -> List[str]`**
- 来源 A：`sys_user_role` → `sys_role`（`del_flag=0`, `status='1'`, 租户一致）
- 来源 B：`sys_user_post` → `sys_post`（`del_flag=0`, `status='1'`）→ `sys_post_role` → `sys_role`（同上）
- 去重后返回 role id 列表。
2. 基于有效角色 ID 改造：
- `user_has_active_roles`：有效角色非空即为真（仅职位带角色、无直接角色也通过登录门禁）。
- `get_user_role_names` / `_active_role_name_rows` / `resolve_web_role_for_user`：按有效角色名称映射 `admin` / `super_admin`。
- `iter_user_menu_perm_codes`：`SysRoleMenu` 的 `role_id` 属于有效角色集合（可用 `role_id IN (...)` 或等价 join，避免只 join `SysUserRole`）。
3. **`data_scope._resolve_user_role_scopes`**：角色查询改为基于有效角色 ID，不再仅 join `SysUserRole`。
### 停用语义（显式）
| 状态 | 是否参与并集 |
|------|----------------|
| 职位 `status != '1'` 或已删 | 否（其下角色关联全部不计入） |
| 角色 `status != '1'` 或已删 | 否 |
| `sys_post_role` / `sys_user_post` / `sys_user_role` `del_flag=1` | 否 |
### API
| 方法 | 路径 | 说明 |
|------|------|------|
| GET | `/web/admin/posts/{postId}/roles` | 返回该职位已关联 `roleIds`（及可选角色摘要） |
| PUT | `/web/admin/posts/{postId}/roles` | body：`{ roleIds: string[] }`，全量替换关联（对齐 `PUT .../users`） |
- 权限/租户：与现有 posts CRUD 一致（当前用户租户，不信任客户端改租户）。
- 用户创建/更新：继续使用已有 `postIds`；确保 `_replace_user_posts` 与角色替换互不影响（已有行为保留）。
- 删除职位：现有软删职位逻辑下，有效角色解析因职位 `del_flag`/`status` 自动失效；可选同步软删 `sys_post_role`（与删职位时处理 `sys_user_post` 的方式对齐即可）。
路由注册：沿用 `admin` 路由模块，无需新 router 文件。
## 前端
### 职位管理 `web-admin/src/views/system/post/index.vue`
- 操作列增加 **「角色配置」**（与现有「关联用户」并列）。
- 弹窗：角色多选列表（`el-select` multiple 或勾选表格），加载全部启用角色 + 当前 `roleIds`，确定调用 `PUT .../roles`。
- UI 对齐 Fresh Mint / 现有职位用户配置弹窗；按钮带图标。
### 用户管理 `web-admin/src/views/system/user/index.vue`
- 新增/编辑表单：在「角色」旁增加 **「职位」** 多选（`postIds`），数据源 `fetchPostList`（或现有 posts API）。
- 提交时带上 `postIds`；详情回填；查看弹窗展示职位名称。
- 不移除用户直接绑角色。
### API 模块
- `web-admin/src/api/` 增加 `fetchPostRoleIds` / `fetchUpdatePostRoles`（命名与 posts users API 对称）。
### 列表展示（可选但建议）
- 职位列表可增加「关联角色数」或角色名摘要列（若实现成本低）；非必须。
- 首期不做「有效权限预览」。
## 文档与规范同步
实现时同步更新（最小必要）：
1. `docs/sql/sys_post_role.sql`（及视情况合并说明到基线 SQL 的维护方式与仓库惯例一致）。
2. `docs/中科兴皖需求V0.3.md` §2.1.8：补充职位可关联角色；用户权限 = 直接角色 ∪ 职位角色。
3. OpenSpec `permission-conventions`：多角色并集扩展为「直接角色 ∪ 经职位继承的角色」；菜单与数据权限均适用。
## 测试要点
1. 用户仅绑职位、职位绑角色 A → 拥有角色 A 的菜单码与数据范围；可登录（非 guest）。
2. 用户直接角色 B + 职位角色 A → 菜单/数据为 A∪B。
3. 停用职位或角色后，对应继承立即失效。
4. 职位角色配置全量替换；用户改 `postIds` 不影响 `roleIds`，反之亦然。
5. `super_admin` 映射：若职位关联的角色名命中超级管理员规则，JWT/web role 应为 `super_admin`。
6. OA 职位控件与审批流程不受影响。
## 风险与注意
- **接入点遗漏**：任何仍只 join `SysUserRole` 的权限路径都要改为有效角色；以 `web_auth_roles` + `data_scope._resolve_user_role_scopes` 为必改清单，实现前再 grep `SysUserRole` 防漏。
- **性能**：有效角色 ID 一次查出后复用；列表页高频 `apply_data_scope` 保持与现网同级查询次数（一次角色查询 + 明细）。
- **与 OA 角色混淆**：本设计仅扩展 `sys_role`；不触及 `oa_role` / `oa_role_user`。
## 实现顺序（建议）
1. SQL + Model `SysPostRole`
2. CRUD/API：`GET/PUT posts/{id}/roles`
3. `get_effective_role_ids` + 改造 `web_auth_roles` / `data_scope`
4. 前端职位「角色配置」
5. 前端用户「职位」多选
6. 文档 / OpenSpec 同步
7. `./scripts/update-graph.sh backend`（及改前端时 frontend）
docs/superpowers/specs/2026-08-04-oa-assignee-posts-replace-roles-design.md
+122
View File
@@ -0,0 +1,122 @@
# OA 审批人选：工作流角色 → 职位（硬切换）
**日期：** 2026-08-04
**范围：** 去掉 `oa_role` / `oa_role_user` 与【工作流角色】模块；流程审批人/抄送改为选【职位】，运行时按 `sys_user_post` 展开成员。
**方案：** 方案 1 — `assigneeType: "posts"` + `postIds`
## 已确认决策
| 项 | 结论 |
|----|------|
| 历史流程 | 系统未上线，无历史 `flow_tree` → **硬切换**，不做兼容层 |
| 预置 GM/CHAIRMAN | **不做**；设计器普通多选启用职位 |
| 下线范围 | **彻底去掉**：菜单/路由/管理页/API/`fetchOaRole*` |
| 数据表 | **一并 DROP** `oa_role_user`、`oa_role`（增量 SQL） |
| 审批人数据源 | **仅** `sys_user_post`（职位成员）；**禁止**用 `sys_post_role` / `sys_role` |
## 目标模型
```
流程节点 approverConfig
assigneeType / assigneeTypes: "posts"
postIds: [sys_post.id, ...]
│
▼
sys_user_post（启用职位 + 启用用户）
│
▼
待办 / 抄送人 userId 列表
```
与权限链分离：
```
职位 → sys_post_role → sys_role → 菜单/数据权限 （登录 RBAC，本需求不改）
职位 → sys_user_post → 用户 （本需求：审批人选）
```
## Flow JSON（新约定）
审批节点示例：
```json
{
"assigneeType": "posts",
"postIds": ["<sys_post.id>"],
"signMode": "or"
}
```
抄送节点：`assigneeTypes` 可含 `"posts"`（与 `users` / `dept_leader` 等组合），成员来自同一套 `postIds`（或按现抄送结构对每种类型分字段；实现时与现 `oa_roles` 写法一一对应替换）。
**删除字段/枚举：** `oa_roles`、`oaRoleIds`、`oaRoleCodes`、`oa_role_ids`、`oa_role_codes`。
## 后端
### 新增/改造
| 位置 | 变更 |
|------|------|
| `crud/user.py` 或 `crud/post.py` | `list_user_ids_bound_to_posts(db, post_ids, tenant_no)`：多职位展开用户，过滤职位 `status=1`/`del_flag=0`、用户启用 |
| `oa_assignee.py` | `assigneeType == "posts"` 分支；`resolve_source: "posts"`；删除 `oa_roles` 分支 |
| `oa_publish.py` | 校验 `posts` 时 `postIds` 非空；引用校验查 `SysPost`；删除 `validate_oa_roles_referenced` |
| `oa_engine.py` | 展示标签改职位名称映射；删除 `OaRole` 查询 |
| `oa_approval.py` API | 删除整个工作流角色路由段 |
| `crud/oa_approval.py` | 删除 `PRESET_ROLES` / `ensure_presets` / 角色 CRUD / `list_oa_role_user_ids` |
| `models.py` | 删除 `OaRole`、`OaRoleUser`（与 drop SQL 同步） |
### SQL
创建 `docs/sql/drop_oa_role.sql`：
```sql
DROP TABLE IF EXISTS `oa_role_user`;
DROP TABLE IF EXISTS `oa_role`;
```
菜单：软删或删除「工作流角色」菜单项（`oa:roles:list`），与项目菜单维护方式一致。
### 错误语义
- 发布：未选职位 / 职位不存在或停用 → 明确错误
- 运行：职位下无有效用户 → 与现「工作流角色成员为空」同等失败（`AssigneeResolveError`）
## 前端
| 位置 | 变更 |
|------|------|
| `FlowDesigner.vue` | 选项「工作流角色」→「职位」；`fetchPostList` 加载（仅 `status==='1'`）；`postIds` 多选 |
| `flow-tree/types.ts` | `AssigneeType` 含 `posts`；去掉 `oa_roles`；`summarizeApprover` 文案「职位」 |
| `OaProgressChain.vue` | `posts` →「职位」 |
| 删除 | `views/oa-approval/roles/index.vue`；路由 `oa-approval/roles`；`oaApproval.ts` 中全部 `fetchOaRole*` |
| 保留 | `OaPostSelect.vue`（表单控件，与审批人选独立） |
## 文档与测试
- 更新钉钉式 OA 设计文档中「工作流角色」章节为「职位」
- 需求/OpenSpec 若提及 OA 独立角色作审批人，改为职位
- 单测：`test_oa_assignee.py` 改为 posts；去掉「不读 sys_role」之外的 oa_role mocks；`test_oa_publish.py` 同步
- `./scripts/update-graph.sh backend`（及 frontend）
## 非目标
- 职位权限（`sys_post_role`）行为不变
- 不种子 GM/CHAIRMAN 职位
- 不做旧 JSON 兼容读取
- 不改审批人其它类型：`users` / `dept_leader` / `direct_supervisor` / `initiator_select`
## 实现顺序（建议）
1. 后端：`list_user_ids_bound_to_posts` + assignee/publish/engine 改 `posts`
2. 前端：FlowDesigner + types + 进度文案
3. 删除角色模块（页/路由/API/CRUD/模型）
4. drop SQL + 菜单清理 + 文档/单测
5. 图谱更新
## 验收
1. OA 菜单无「工作流角色」
2. 流程设计审批/抄送可选职位并保存 `posts`/`postIds`
3. 职位已关联用户时，发起后待办落到这些用户
4. 空成员职位无法正常完成解析（错误可读）
5. 代码库无 `oa_roles` / `fetchOaRole` / `OaRole` 残留（除历史设计文档归档说明外）
docs/中科兴皖需求V0.3.md
+6 -2
View File
@@ -387,12 +387,16 @@
### 2.1.8、职位管理
- 这个模块用于职位信息的维护管理，支持职位绑定用户，一个职位可以绑定多个用户，一个用户可以绑定多个职位
- 职位可关联角色：一个职位可绑定多个角色；用户通过职位继承这些角色的**菜单权限**与**数据权限**
- **特别注意：用户最终权限 = 用户直接绑定角色 ∪ 经启用职位继承的角色**（与 §2.1.5 多角色并集语义一致；停用职位或停用角色不参与并集）
- 职位表 sys_post,核心字段包括： 职位名称、职位编码、排序号、状态（1 正常 0 停用）
- 职位与用户关联表 sys_user_post, 核心字段： 用户id、职位id
- 职位表和职位与用户关联表的关系
- 职位与角色关联表 sys_post_role, 核心字段： 职位id、角色id
- 职位表和关联表的关系
- 职位表
- 职位与用户关联表
- 界面中展示职位信息，支持职位信息的新增、修改、删除、职位用户配置。点击【职位用户配置】按钮，弹出弹窗，弹窗中展示用户信息[2.1.4、用户管理]，支持勾选多个用户
- 职位与角色关联表
- 界面中展示职位信息，支持职位信息的新增、修改、删除、职位用户配置、职位角色配置。点击【职位用户配置】按钮，弹出弹窗，弹窗中展示用户信息[2.1.4、用户管理]，支持勾选多个用户；点击【角色配置】按钮，弹出弹窗支持勾选多个角色[2.1.5、角色管理]。用户管理支持为用户多选职位。
### 2.1.9、物品单位管理
- 记录物品单位的表，核心字段： 单位编码、单位名称 (例如：单位编码 g 、 单位名称 克)
login-success.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 76 KiB

openspec/changes/zkxw-engineering-standards/specs/permission-conventions/spec.md
+16
View File
@@ -22,6 +22,8 @@
单个用户允许绑定多个角色；其**菜单权限**与**数据权限** SHALL 分别取所有的角色的权限**并集**（与需求 §2.1.5「特别注意」一致）。
用户有效角色 SHALL 为：**直接绑定角色** ∪ **经启用职位（`sys_user_post` → `sys_post` → `sys_post_role`）继承的启用角色**（与需求 §2.1.8 一致）。停用职位、停用角色或已软删关联 SHALL NOT 参与并集。
#### Scenario: 两角色菜单合并
- **WHEN** 用户同时具有角色 R1（菜单集合 M1）与角色 R2（菜单集合 M2）
@@ -32,6 +34,20 @@
- **WHEN** 用户同时具有角色 R1 与 R2，各自数据权限范围不同
- **THEN** 可访问数据 SHALL 为两角色数据权限的并集（在实现上与产品确认：取更宽或按需求文档并集语义）
#### Scenario: 经职位继承角色
- **WHEN** 用户未直接绑定角色，但绑定启用职位 P，且 P 关联启用角色 R（菜单集合 M）
- **THEN** 用户有效菜单 SHALL 包含 M，且数据权限 SHALL 按 R 的 `data_scope` 参与并集；登录门禁 SHALL 视该用户为已有有效角色
### Requirement: 职位关联角色配置
系统 SHALL 通过 `sys_post_role` 维护职位与角色关联；职位管理界面 SHALL 支持为职位配置关联角色；用户管理界面 SHALL 支持为用户多选职位。职位本身 SHALL NOT 直接配置菜单树或独立 `data_scope`（权限仍落在 `sys_role`）。
#### Scenario: 职位角色配置全量替换
- **WHEN** 管理员在职位「角色配置」中保存角色 ID 列表
- **THEN** 系统 SHALL 将该职位的有效 `sys_post_role` 关联替换为该列表（软删除旧关联）
### Requirement: Web 与小程序菜单树
菜单管理 SHALL 同时支撑 Web 端与小程序端菜单；系统 SHALL 预置两棵顶层虚拟根（需求中的 parent_id=0 的「web 端菜单」「移动端菜单」），后续菜单 SHALL 挂载其下（与需求 §2.1.6）。
web-admin/graphify-out/.graphify_analysis.json
+2255 -2070
View File
File diff suppressed because it is too large. Load diff
web-admin/graphify-out/.graphify_extract.json
+4352 -811
View File
File diff suppressed because it is too large. Load diff
web-admin/graphify-out/GRAPH_REPORT.md
+184 -136
View File
@@ -1,11 +1,11 @@
# Graph Report - src (2026-07-30)
# Graph Report - src (2026-07-31)
## Corpus Check
- Large corpus: 919 files · ~612,783 words. Semantic extraction will be expensive (many Claude tokens). Consider running on a subfolder, or use --no-semantic to run AST-only.
- Large corpus: 955 files · ~623,578 words. Semantic extraction will be expensive (many Claude tokens). Consider running on a subfolder, or use --no-semantic to run AST-only.
## Summary
- 3202 nodes · 4492 edges · 63 communities detected
- Extraction: 78% EXTRACTED · 22% INFERRED · 0% AMBIGUOUS · INFERRED: 997 edges (avg confidence: 0.8)
- 3345 nodes · 4712 edges · 71 communities detected
- Extraction: 78% EXTRACTED · 22% INFERRED · 0% AMBIGUOUS · INFERRED: 1035 edges (avg confidence: 0.8)
- Token cost: 0 input · 0 output
## Community Hubs (Navigation)
@@ -48,34 +48,42 @@
- [[_COMMUNITY_Community 36|Community 36]]
- [[_COMMUNITY_Community 37|Community 37]]
- [[_COMMUNITY_Community 38|Community 38]]
- [[_COMMUNITY_Community 39|Community 39]]
- [[_COMMUNITY_Community 40|Community 40]]
- [[_COMMUNITY_Community 41|Community 41]]
- [[_COMMUNITY_Community 42|Community 42]]
- [[_COMMUNITY_Community 43|Community 43]]
- [[_COMMUNITY_Community 47|Community 47]]
- [[_COMMUNITY_Community 44|Community 44]]
- [[_COMMUNITY_Community 45|Community 45]]
- [[_COMMUNITY_Community 46|Community 46]]
- [[_COMMUNITY_Community 48|Community 48]]
- [[_COMMUNITY_Community 50|Community 50]]
- [[_COMMUNITY_Community 51|Community 51]]
- [[_COMMUNITY_Community 52|Community 52]]
- [[_COMMUNITY_Community 53|Community 53]]
- [[_COMMUNITY_Community 54|Community 54]]
- [[_COMMUNITY_Community 55|Community 55]]
- [[_COMMUNITY_Community 56|Community 56]]
- [[_COMMUNITY_Community 57|Community 57]]
- [[_COMMUNITY_Community 58|Community 58]]
- [[_COMMUNITY_Community 59|Community 59]]
- [[_COMMUNITY_Community 60|Community 60]]
- [[_COMMUNITY_Community 61|Community 61]]
- [[_COMMUNITY_Community 63|Community 63]]
- [[_COMMUNITY_Community 65|Community 65]]
- [[_COMMUNITY_Community 66|Community 66]]
- [[_COMMUNITY_Community 71|Community 71]]
- [[_COMMUNITY_Community 64|Community 64]]
- [[_COMMUNITY_Community 67|Community 67]]
- [[_COMMUNITY_Community 69|Community 69]]
- [[_COMMUNITY_Community 74|Community 74]]
- [[_COMMUNITY_Community 76|Community 76]]
- [[_COMMUNITY_Community 77|Community 77]]
- [[_COMMUNITY_Community 88|Community 88]]
- [[_COMMUNITY_Community 90|Community 90]]
- [[_COMMUNITY_Community 91|Community 91]]
- [[_COMMUNITY_Community 80|Community 80]]
- [[_COMMUNITY_Community 81|Community 81]]
- [[_COMMUNITY_Community 82|Community 82]]
- [[_COMMUNITY_Community 86|Community 86]]
- [[_COMMUNITY_Community 97|Community 97]]
- [[_COMMUNITY_Community 99|Community 99]]
- [[_COMMUNITY_Community 100|Community 100]]
## God Nodes (most connected - your core abstractions)
1. `get()` - 300 edges
2. `push()` - 97 edges
1. `get()` - 301 edges
2. `push()` - 109 edges
3. `emit()` - 28 edges
4. `WebSocketClient` - 26 edges
5. `set()` - 21 edges
@@ -83,325 +91,365 @@
7. `parseProtocolStandardImportText()` - 17 edges
8. `scopeQuery()` - 16 edges
9. `MenuProcessor` - 16 edges
10. `TableCache` - 14 edges
10. `walkRules()` - 14 edges
## Surprising Connections (you probably didn't know these)
- `handleBatchDelete()` --calls--> `withFullscreenLoading()` [INFERRED]
views/basic-info/customer/index.vue → utils/fullscreen-loading.ts
- `formatReceiveAccountLine()` --calls--> `push()` [INFERRED]
utils/oa-receive-account-value.ts → views/operations/storage-facility/index.vue
- `dash()` --calls--> `formatDisplayOrDash()` [INFERRED]
components/business/infusion-schedule-outbound-chain-view/index.vue → utils/datetime-display.ts
- `dash()` --calls--> `formatDisplayOrDash()` [INFERRED]
components/business/clinical-schedule-payment-detail/index.vue → utils/datetime-display.ts
- `fmtMoney()` --calls--> `formatMoneyDisplay()` [INFERRED]
components/business/clinical-schedule-payment-detail/index.vue → utils/money-format.ts
- `defaultInstallmentRatios()` --calls--> `push()` [INFERRED]
utils/protocol-payment-installment.ts → views/operations/storage-facility/index.vue
- `calcUnpaidAmountsByRatios()` --calls--> `push()` [INFERRED]
utils/protocol-payment-installment.ts → views/operations/storage-facility/index.vue
- `handleAttachmentDownload()` --calls--> `downloadAttachmentFile()` [INFERRED]
components/business/infusion-schedule-outbound-chain-view/index.vue → utils/download-attachment.ts
## Communities
### Community 0 - "Community 0"
Cohesion: 0.01
Nodes (178): fetchAccessLogList(), fetchActiveRegions(), fetchCategoryList(), fetchCategoryParameters(), fetchCellProductPriceList(), fetchCellProductSpecList(), fetchCellProductTypeList(), fetchChannelAccount() (+170 more)
Cohesion: 0.0
Nodes (187): fetchAccessLogList(), fetchActiveRegions(), fetchCategoryList(), fetchCategoryParameters(), fetchCellProductPriceList(), fetchCellProductSpecList(), fetchCellProductTypeList(), fetchChannelAccount() (+179 more)
### Community 1 - "Community 1"
Cohesion: 0.03
Nodes (90): batchSavePilotCheckup(), deletePilotCheckupActualItem(), fetchCheckupInstitutionList(), fetchCheckupInstitutionPackageDetail(), fetchCheckupInstitutionPackages(), fetchPilotCheckupActualItems(), fetchPilotCheckupDetail(), fetchPilotCheckupList() (+82 more)
Cohesion: 0.02
Nodes (78): fetchUploadAttachment(), fetchOaInstanceDetail(), fetchOaTasks(), FireworkSystem, currentPrinterName(), load(), openDetail(), printRow() (+70 more)
### Community 2 - "Community 2"
Cohesion: 0.03
Nodes (81): fetchUploadAttachment(), fetchOaInstanceDetail(), fetchOaRelatedSummaries(), fetchOaTasks(), FireworkSystem, currentPrinterName(), load(), openDetail() (+73 more)
Nodes (67): collectIds(), buildInboundBasicSection(), buildInboundCellStorageViewSections(), buildInboundResearchDonationViewSections(), buildReceptionSection(), buildTransportSection(), resolveInboundProtocolStatus(), buildBaseFields() (+59 more)
### Community 3 - "Community 3"
Cohesion: 0.03
Nodes (64): fetchCheckupInstitutionInvoices(), fetchCheckupInstitutionProjects(), fetchCreateCheckupInstitution(), fetchCreateCheckupInstitutionInvoice(), fetchCreateCheckupInstitutionProject(), fetchUpdateCheckupInstitution(), fetchUpdateCheckupInstitutionInvoice(), fetchUpdateCheckupInstitutionProject() (+56 more)
Nodes (86): batchSavePilotCheckup(), deletePilotCheckupActualItem(), fetchCheckupInstitutionList(), fetchCheckupInstitutionPackageDetail(), fetchCheckupInstitutionPackages(), fetchPilotCheckupDetail(), fetchPilotCheckupList(), markPilotCheckupChecked() (+78 more)
### Community 4 - "Community 4"
Cohesion: 0.03
Nodes (57): useSettingsHandlers(), useSettingsPanel(), useSettingsState(), RoutePermissionValidator, useCeremony(), useTheme(), if(), branchTitle() (+49 more)
Nodes (80): fetchEthnicList(), formatNowDatetime(), applyDonationBundleToForm(), createEmptyTransport(), ensureEthnicOptionInList(), handleOpenForAdd(), if(), loadEthnicOptions() (+72 more)
### Community 5 - "Community 5"
Cohesion: 0.02
Nodes (29): fetchAllConsumablePacks(), fetchAllConsumables(), fetchAllConsumableStockLogs(), fetchAllEquipments(), fetchAllOutputTypes(), fetchAllProcessCategories(), fetchAllProcesses(), fetchAllReagents() (+21 more)
Cohesion: 0.03
Nodes (64): fetchCheckupInstitutionInvoices(), fetchCheckupInstitutionProjects(), fetchCreateCheckupInstitution(), fetchCreateCheckupInstitutionInvoice(), fetchCreateCheckupInstitutionProject(), fetchUpdateCheckupInstitution(), fetchUpdateCheckupInstitutionInvoice(), fetchUpdateCheckupInstitutionProject() (+56 more)
### Community 6 - "Community 6"
Cohesion: 0.04
Nodes (69): formatNowDatetime(), formatTodayDate(), addPaymentDetail(), applyFqPaymentDefaults(), applyPaymentPresetForMode(), createEmptyTransport(), datetimeToYmd(), defaultInstallmentStartDateYmd() (+61 more)
Cohesion: 0.03
Nodes (48): handleBlur(), handleFocus(), handleInput(), fetchClinicalPaymentDetail(), fetchClinicalPayments(), fetchClinicalReceiptConfirmed(), fetchClinicalReceiptPending(), fetchClinicalRefundConfirmed() (+40 more)
### Community 7 - "Community 7"
Cohesion: 0.03
Nodes (53): fetchBatchDeleteOaReceiveAccounts(), fetchCreateOaReceiveAccount(), fetchCreateOaRole(), fetchDeleteOaReceiveAccount(), fetchDeleteOaRole(), fetchOaAppDraft(), fetchOaAppList(), fetchOaGroupList() (+45 more)
Nodes (43): fetchGetMenuList(), fetchGetMenuCodes(), fetchGetUserInfo(), fetchLogin(), fetchRefreshToken(), fetchUpdateProfile(), fetchUploadProfileAvatar(), MenuProcessor (+35 more)
### Community 8 - "Community 8"
Cohesion: 0.03
Nodes (55): buildInboundBasicSection(), buildInboundCellStorageViewSections(), buildInboundResearchDonationViewSections(), buildReceptionSection(), buildTemporaryViewSections(), buildTransportSection(), resolveInboundProtocolStatus(), buildInsertedSiblingCard() (+47 more)
Nodes (56): fetchMyProductionTasks(), fetchMyQcTaskList(), fetchQcTaskDetail(), fetchQcTaskList(), fetchMineTasksForWorkOrders(), useInboundSiblingNavigation(), shouldApplyTriggerSourceFilter(), useQcWorkOrderTabPage() (+48 more)
### Community 9 - "Community 9"
Cohesion: 0.03
Nodes (56): fetchMyProductionTasks(), fetchMyQcTaskList(), fetchQcTaskDetail(), fetchQcTaskList(), fetchMineTasksForWorkOrders(), useInboundSiblingNavigation(), shouldApplyTriggerSourceFilter(), useQcWorkOrderTabPage() (+48 more)
Nodes (53): fetchBatchDeleteOaReceiveAccounts(), fetchCreateOaReceiveAccount(), fetchCreateOaRole(), fetchDeleteOaReceiveAccount(), fetchDeleteOaRole(), fetchOaAppDraft(), fetchOaAppList(), fetchOaGroupList() (+45 more)
### Community 10 - "Community 10"
Cohesion: 0.03
Nodes (58): fetchFullmoonTodoList(), fetchUpdateFullmoonTodoInsurance(), fetchCollectionProtocolAuditList(), fetchCollectionProtocolDetail(), fetchCollectionProtocolList(), fetchCreateProtocolInvoiceRequest(), fetchInvoiceEligiblePayments(), fetchPaymentDetailList() (+50 more)
Cohesion: 0.04
Nodes (49): buildTemporaryViewSections(), buildInsertedSiblingCard(), resolveShowProtocolPaymentAtGroup(), appendTaskResultSections(), batchTasksForPanelSlot(), buildConfiguredOnlySection(), for(), for() (+41 more)
### Community 11 - "Community 11"
Cohesion: 0.04
Nodes (41): fetchGetMenuList(), fetchGetMenuCodes(), fetchGetUserInfo(), fetchLogin(), fetchUpdateProfile(), fetchUploadProfileAvatar(), MenuProcessor, RouteRegistry (+33 more)
Nodes (48): fetchCreateCustomer(), fetchCustomerList(), fetchDeleteCustomer(), fetchUpdateCustomer(), updateInfusionScheduleStatus(), handleDialogClose(), handleAdd(), handleBatchDelete() (+40 more)
### Community 12 - "Community 12"
Cohesion: 0.04
Nodes (42): buildBaseFields(), buildFeeSection(), buildInboundBasicSection(), buildInboundCellStorageProductionViewSections(), buildInboundResearchDonationProductionViewSections(), buildOutboundBasicExperimentProductionViewSections(), buildOutboundClinicalProductionViewSections(), buildOutboundDetail() (+34 more)
Nodes (43): fetchAttachmentDownloadUrl(), qcAttachmentFullUrl(), qcDownloadAttachment(), qcPreviewAttachment(), handleDownloadAttachment(), attachmentFullUrl(), dash(), handleAttachmentDownload() (+35 more)
### Community 13 - "Community 13"
Cohesion: 0.04
Nodes (47): fetchCreateCustomer(), fetchCustomerList(), fetchDeleteCustomer(), fetchUpdateCustomer(), updateInfusionScheduleStatus(), handleDialogClose(), handleAdd(), handleDelete() (+39 more)
Nodes (42): useSettingsHandlers(), useSettingsPanel(), useSettingsState(), useCeremony(), useTheme(), if(), handleSiblingLinkClick(), resolveInboundWorkOrderCardTitle() (+34 more)
### Community 14 - "Community 14"
Cohesion: 0.05
Nodes (48): fetchEthnicList(), applyDonationBundleToForm(), createEmptyTransport(), ensureEthnicOptionInList(), handleOpenForAdd(), if(), loadEthnicOptions(), normalizeSampleRow() (+40 more)
Nodes (54): fetchOaRelatedSummaries(), displayPeople(), personLines(), personTitle(), showNodeComment(), signBadge(), signBadgeText(), statusText() (+46 more)
### Community 15 - "Community 15"
Cohesion: 0.04
Nodes (38): fetchCellSampleTypeList(), fetchCreateCellSampleType(), fetchCreateMenu(), fetchDeleteCellSampleType(), fetchDeleteMenu(), fetchMenuTree(), fetchUpdateCellSampleType(), fetchUpdateMenu() (+30 more)
Nodes (43): fetchFullmoonTodoList(), fetchUpdateFullmoonTodoInsurance(), fetchCollectionProtocolAuditList(), fetchCollectionProtocolDetail(), fetchCollectionProtocolList(), fetchCreateProtocolInvoiceRequest(), fetchInvoiceEligiblePayments(), fetchPaymentDetailList() (+35 more)
### Community 16 - "Community 16"
Cohesion: 0.06
Nodes (37): attachmentFullUrl(), dash(), handleAttachmentDownload(), handleAttachmentPreview(), buildPaymentFlowSteps(), dash(), formatAmount(), hasFinanceReceipt() (+29 more)
Cohesion: 0.05
Nodes (26): fetchUserList(), fetchProductionReceptionBySampleCode(), fetchProductionReceptionSubmit(), fetchProductionReceptionUpdate(), formatHandoverUserLabel(), formatNowDatetime(), fullFileUrl(), handlePreviewAttachment() (+18 more)
### Community 17 - "Community 17"
Cohesion: 0.06
Nodes (41): completePilotApplication(), deletePilotApplication(), fetchPilotApplicationList(), startPilotApplication(), voidPilotApplication(), fetchClinicalRefundConfirmed(), buildConfirmedParams(), buildPendingParams() (+33 more)
Cohesion: 0.08
Nodes (37): formatDatetimeToMinute(), handleChineseDatetimePaste(), parseChineseDatetimeText(), parseBirthOrder(), parseChineseNumeral(), addSampleHint(), earliestCollectTime(), isMaternalBloodEmpty() (+29 more)
### Community 18 - "Community 18"
Cohesion: 0.05
Nodes (23): handleBlur(), handleFocus(), handleInput(), fetchClinicalReceiptConfirmed(), buildConfirmedParams(), buildPendingParams(), formatAmount(), handleConfirmedReset() (+15 more)
Cohesion: 0.06
Nodes (22): fetchQcMaterialBatchDetail(), fetchQcMaterialBatchList(), fetchQcMaterialBatchOptions(), fetchQcMaterialList(), fetchQcMaterialOptions(), fetchUpdateQcMaterialBatch(), fetchMarkQcMaterialUsageFullyUsed(), financeAttachmentsToUrlString() (+14 more)
### Community 19 - "Community 19"
Cohesion: 0.06
Nodes (38): fetchUserList(), fetchAddTaskStep(), fetchCopyTaskStep(), fetchDeleteTaskStep(), fetchDispatchProductionTaskSteps(), fetchForwardProductionTask(), fetchProductionTaskDetail(), fetchProductionTaskEditorInit() (+30 more)
Cohesion: 0.08
Nodes (37): fetchStartOaInstance(), restoreConfirmationDateAuto(), submit(), syncConfirmationKitDates(), applyConfirmationKitDateLinkage(), applyConfirmationKitDefaults(), asRules(), clearConfirmationDateManualAndRelink() (+29 more)
### Community 20 - "Community 20"
Cohesion: 0.06
Nodes (22): fetchQcMaterialBatchDetail(), fetchQcMaterialBatchList(), fetchQcMaterialBatchOptions(), fetchQcMaterialList(), fetchQcMaterialOptions(), fetchUpdateQcMaterialBatch(), fetchMarkQcMaterialUsageFullyUsed(), financeAttachmentsToUrlString() (+14 more)
Nodes (13): fetchProductionWorkOrderQcInfo(), dash(), fmtMoney(), auditorDisplay(), dash(), ensureUnitsInOptions(), expressName(), formatYm() (+5 more)
### Community 21 - "Community 21"
Cohesion: 0.1
Nodes (2): WebSocketClient, TableCache
### Community 22 - "Community 22"
Cohesion: 0.08
Nodes (33): fetchRefreshToken(), toLogin(), base64ToBytes(), bytesToBase64(), decryptJson(), deriveKey(), encryptJson(), fromBase64Url() (+25 more)
Cohesion: 0.09
Nodes (31): base64ToBytes(), bytesToBase64(), decryptJson(), deriveKey(), encryptJson(), fromBase64Url(), hexToBytes(), sha256Hex() (+23 more)
### Community 23 - "Community 23"
Cohesion: 0.06
Nodes (11): dash(), fmtMoney(), auditorDisplay(), dash(), ensureUnitsInOptions(), expressName(), formatYm(), formatYmd() (+3 more)
### Community 24 - "Community 24"
Cohesion: 0.07
Nodes (24): fetchMineProductionWorkOrderTabStepCounts(), fetchMineProductionWorkOrderTabStepCountsDeduped(), fetchProductionWorkOrderCellProductOptions(), fetchProductionWorkOrderDetail(), fetchProductionWorkOrderList(), fetchProductionWorkOrderQcDispatchOptions(), fetchProductionWorkOrderQcInfo(), fetchProductionWorkOrderTabStepCounts() (+16 more)
### Community 25 - "Community 25"
Cohesion: 0.09
Nodes (8): getDefaultLanguage(), checkStorageCompatibility(), StorageConfig, getSystemStorage(), getSysVersion(), StorageKeyManager, StorageCompatibilityManager, validateStorageData()
### Community 26 - "Community 26"
### Community 24 - "Community 24"
Cohesion: 0.08
Nodes (12): ComponentLoader, IframeRouteManager, RouteTransformer, getFirstMenuPath(), getFirstSecondLevelMenuPath(), isIframe(), isNavigableMenuItem(), isWorkbenchMenuItem() (+4 more)
### Community 27 - "Community 27"
Cohesion: 0.08
Nodes (18): fetchProductionReceptionBySampleCode(), fetchProductionReceptionSubmit(), fetchProductionReceptionUpdate(), onUserSelectVisible(), remoteSearchUsers(), buildPayload(), ensureDefaultHandler(), initDialog() (+10 more)
### Community 28 - "Community 28"
### Community 25 - "Community 25"
Cohesion: 0.08
Nodes (20): createEmptySnapshots(), normalizeConfiguredReagents(), normalizeConsumables(), normalizeDataCollections(), normalizeReagents(), normalizeStepOutputs(), serializeAttachments(), serializeEquipmentIds() (+12 more)
### Community 29 - "Community 29"
### Community 26 - "Community 26"
Cohesion: 0.09
Nodes (30): fetchAddTaskStep(), fetchCopyTaskStep(), fetchDeleteTaskStep(), fetchDispatchProductionTaskSteps(), fetchForwardProductionTask(), fetchProductionTaskDetail(), fetchProductionTaskEditorInit(), fetchProductionTaskList() (+22 more)
### Community 27 - "Community 27"
Cohesion: 0.07
Nodes (19): fetchDeleteMaterialBatch(), fetchMaterialBatchList(), fetchMaterialBatchOptions(), fetchMaterialList(), fetchMaterialOptions(), fetchUpdateMaterialBatch(), fetchMaterialUsageList(), fetchMyMaterialUsageList() (+11 more)
### Community 28 - "Community 28"
Cohesion: 0.09
Nodes (28): completePilotApplication(), deletePilotApplication(), fetchPilotApplicationList(), startPilotApplication(), voidPilotApplication(), clearTableSelection(), handleBatchComplete(), handleBatchStart() (+20 more)
### Community 29 - "Community 29"
Cohesion: 0.09
Nodes (22): fetchMineProductionWorkOrderTabStepCounts(), fetchMineProductionWorkOrderTabStepCountsDeduped(), fetchProductionWorkOrderCellProductOptions(), fetchProductionWorkOrderDetail(), fetchProductionWorkOrderList(), fetchProductionWorkOrderQcDispatchOptions(), fetchProductionWorkOrderTabStepCounts(), fetchProductionWorkOrderTabStepCountsDeduped() (+14 more)
### Community 30 - "Community 30"
Cohesion: 0.09
Nodes (12): fetchMineQcWorkOrderTabUnfinishedCounts(), fetchOutboundQcDetail(), fetchQcWorkOrderDetail(), fetchQcWorkOrderList(), fetchQcWorkOrdersBySample(), fetchQcWorkOrderTabUnfinishedCounts(), reload(), reloadTabCounts() (+4 more)
### Community 31 - "Community 31"
Cohesion: 0.13
Nodes (19): fetchCreateMenu(), fetchDeleteMenu(), fetchMenuTree(), fetchUpdateMenu(), postorder(), preorder(), applyTreeExpand(), handleAdd() (+11 more)
### Community 32 - "Community 32"
Cohesion: 0.1
Nodes (12): fetchOutboundReleaseMaterial(), fetchOutboundReleaseReviewDetail(), fetchOutboundReleaseReviewList(), fetchReleaseReviewList(), handleReset(), handleSearch(), handleTabChange(), handleToggleSelect() (+4 more)
### Community 32 - "Community 32"
### Community 33 - "Community 33"
Cohesion: 0.12
Nodes (15): addCopyButton(), highlightCode(), insertLineNumbers(), isBlockProcessed(), markBlockAsProcessed(), processBlock(), setupHighlightDirective(), setupRippleDirective() (+7 more)
### Community 33 - "Community 33"
Cohesion: 0.14
Nodes (12): displayPeople(), personLines(), personTitle(), showNodeComment(), signBadge(), signBadgeText(), statusText(), displayName() (+4 more)
### Community 34 - "Community 34"
Cohesion: 0.19
Nodes (15): fetchAttachmentDownloadUrl(), attachmentFullUrl(), ensureUniqueZipEntryName(), fetchAttachmentBlob(), getAttachmentExtension(), resolveAttachmentFileName(), sanitizeZipPathSegment(), applyInboundLabStorageCodePrefix() (+7 more)
Cohesion: 0.13
Nodes (18): fetchCellSampleTypeList(), fetchCreateCellSampleType(), fetchDeleteCellSampleType(), fetchUpdateCellSampleType(), handleAdd(), handleDelete(), handleDropdownCommand(), handleEdit() (+10 more)
### Community 35 - "Community 35"
Cohesion: 0.13
Nodes (8): chipTitle(), confirmPicker(), memberOptionLabel(), removeUser(), resolveUser(), signBadge(), signBadgeText(), updateSelect()
### Community 36 - "Community 36"
Cohesion: 0.2
Nodes (14): applyFlagToRule(), applySchema(), countRules(), getActiveRule(), getDesigner(), getSetupState(), onMessage(), readFlag() (+6 more)
### Community 37 - "Community 37"
Cohesion: 0.12
Nodes (12): fetchApproveTask(), fetchBusinessAllTasks(), fetchCompletedTasks(), fetchDesignerData(), fetchInstanceDetail(), fetchMyInstances(), fetchPendingTasks(), fetchProcessDefList() (+4 more)
### Community 38 - "Community 38"
Cohesion: 0.12
Nodes (6): setupOaConfirmationKit(), ensureOaKitMenu(), setupOaLeaveKit(), setupOaOvertimeKit(), setupOaResignationKit(), setupOaTripKit()
### Community 39 - "Community 39"
Cohesion: 0.16
Nodes (10): useTable(), useTableImpl(), getColumnChecks(), useTableColumns(), createErrorHandler(), createSmartDebounce(), defaultResponseAdapter(), extractPagination() (+2 more)
### Community 37 - "Community 37"
### Community 40 - "Community 40"
Cohesion: 0.27
Nodes (14): useChart(), useChartComponent(), useChartOps(), colourBlend(), getCssVar(), getDarkColor(), getLightColor(), handleElementThemeColor() (+6 more)
### Community 38 - "Community 38"
### Community 41 - "Community 41"
Cohesion: 0.33
Nodes (13): buildProtocolPaymentFlowSteps(), dash(), financeReceiptTime(), formatAmount(), hasFinanceReceipt(), hasFinanceRefund(), hasReceiptSubmit(), hasRefundSubmit() (+5 more)
### Community 42 - "Community 42"
Cohesion: 0.19
Nodes (6): fetchServiceOrderTxnList(), handleReset(), handleSearch(), handleTabChange(), loadData(), switchTab()
### Community 40 - "Community 40"
### Community 44 - "Community 44"
Cohesion: 0.27
Nodes (10): nodeSummary(), createDefaultFlow(), createEndNode(), createNode(), ensureFlowRoot(), newId(), normalizeCcAssigneeTypes(), removeChildNode() (+2 more)
### Community 41 - "Community 41"
Cohesion: 0.24
Nodes (8): fullFileUrl(), handlePreviewAttachment(), isVideoFile(), normalizeDisplayValue(), resolveReviewCellType(), resolveReviewQuantity(), resolveReviewSpecText(), uniqueJoined()
### Community 42 - "Community 42"
### Community 45 - "Community 45"
Cohesion: 0.31
Nodes (4): isSlotAvailable(), resolveStorageSlotRangeFill(), slotFacilityNodeId(), sortBoxSlots()
### Community 43 - "Community 43"
### Community 46 - "Community 46"
Cohesion: 0.25
Nodes (2): handleTouchEnd(), setTransition()
### Community 47 - "Community 47"
### Community 48 - "Community 48"
Cohesion: 0.28
Nodes (4): fetchMyProductionMaterialConsumptions(), handleReset(), handleSearch(), loadData()
### Community 51 - "Community 51"
Cohesion: 0.39
Nodes (6): isIgnorableScriptError(), normalizeErrorMessage(), registerPromiseErrorHandler(), registerResourceErrorHandler(), scriptErrorHandler(), setupErrorHandle()
### Community 48 - "Community 48"
### Community 52 - "Community 52"
Cohesion: 0.36
Nodes (1): TableHeightCalculator
### Community 50 - "Community 50"
### Community 54 - "Community 54"
Cohesion: 0.33
Nodes (2): logApiCryptoBootInfo(), maskSecret()
### Community 51 - "Community 51"
### Community 55 - "Community 55"
Cohesion: 0.67
Nodes (6): fileNameHint(), fileUrlHint(), getOaUploadDisplayName(), isOaUploadImageFile(), isOaUploadVideoFile(), mimeHint()
### Community 52 - "Community 52"
### Community 56 - "Community 56"
Cohesion: 0.38
Nodes (4): handleFocus(), handleInput(), parseDecimalToNumber(), sanitizeDecimalInput()
### Community 53 - "Community 53"
### Community 57 - "Community 57"
Cohesion: 0.29
Nodes (2): fetchLeaveDetail(), fetchLeaveList()
### Community 54 - "Community 54"
### Community 58 - "Community 58"
Cohesion: 0.4
Nodes (2): isUnfinishedQcWorkOrder(), resolveQcWorkOrderUnfinishedBadgeCount()
### Community 55 - "Community 55"
### Community 59 - "Community 59"
Cohesion: 0.47
Nodes (3): isPaymentDueWithinWarnWindow(), parsePaymentDueYmd(), startOfLocalDay()
### Community 56 - "Community 56"
### Community 60 - "Community 60"
Cohesion: 0.5
Nodes (2): formatProtocolDocDeleteConfirm(), formatProtocolDocSubject()
### Community 57 - "Community 57"
### Community 61 - "Community 61"
Cohesion: 0.5
Nodes (2): parseEquipmentIds(), syncEquipmentNamesFromOptions()
### Community 59 - "Community 59"
### Community 63 - "Community 63"
Cohesion: 0.5
Nodes (2): focusInput(), handleKeydown()
### Community 63 - "Community 63"
### Community 64 - "Community 64"
Cohesion: 0.4
Nodes (1): fetchQcMaterialAmountAuthUsers()
### Community 67 - "Community 67"
Cohesion: 0.67
Nodes (2): if(), logSidebarMenu()
### Community 65 - "Community 65"
### Community 69 - "Community 69"
Cohesion: 0.5
Nodes (1): fetchSampleSmsNotificationList()
### Community 66 - "Community 66"
Cohesion: 0.5
Nodes (1): fetchQcSmsList()
### Community 71 - "Community 71"
### Community 74 - "Community 74"
Cohesion: 1.0
Nodes (2): getSettingDefaults(), resetToDefaults()
### Community 74 - "Community 74"
### Community 76 - "Community 76"
Cohesion: 1.0
Nodes (2): copyTextToClipboard(), copyTextWithFallback()
Nodes (2): buildOvertimeKitChildren(), uniqueId()
### Community 77 - "Community 77"
Cohesion: 1.0
Nodes (2): buildLeaveKitChildren(), uniqueId()
### Community 80 - "Community 80"
Cohesion: 1.0
Nodes (2): buildConfirmationKitChildren(), uniqueId()
### Community 81 - "Community 81"
Cohesion: 1.0
Nodes (2): buildResignationKitChildren(), uniqueId()
### Community 82 - "Community 82"
Cohesion: 1.0
Nodes (2): copyTextToClipboard(), copyTextWithFallback()
### Community 86 - "Community 86"
Cohesion: 1.0
Nodes (2): getSourceProtocolAttachment(), normalizeAttachmentFiles()
### Community 88 - "Community 88"
### Community 97 - "Community 97"
Cohesion: 1.0
Nodes (2): emptyTabCounts(), useProductionWorkOrderTabStepCounts()
### Community 90 - "Community 90"
### Community 99 - "Community 99"
Cohesion: 1.0
Nodes (2): initialProgress(), useQcWorkOrderAttachmentExport()
### Community 91 - "Community 91"
### Community 100 - "Community 100"
Cohesion: 1.0
Nodes (2): emptyTabCounts(), useQcWorkOrderTabUnfinishedCounts()
## Knowledge Gaps
- **Thin community `Community 21`** (42 nodes): `WebSocketClient`, `.calculateReconnectDelay()`, `.clearAllTimers()`, `.clearConnectionTimers()`, `.clearTimer()`, `.close()`, `.closeCurrentSocketForReconnect()`, `.connect()`, `.connectionStatusText()`, `.constructor()`, `.destroyInstance()`, `.flushMessageQueue()`, `.getInstance()`, `.getReadyStateText()`, `.handleClose()`, `.handleConnectionTimeout()`, `.handleError()`, `.handleMessage()`, `.handleOpen()`, `.init()`, `.isWebSocketConnected()`, `.reconnect()`, `.resetHeartbeat()`, `.send()`, `.startHeartbeat()`, `.startPing()`, `TableCache`, `.cleanupExpired()`, `.clear()`, `.clearByTags()`, `.clearCurrentSearch()`, `.clearPagination()`, `.constructor()`, `.evictLRU()`, `.generateKey()`, `.generateTags()`, `.get()`, `.getStats()`, `.log()`, `.set()`, `index.ts`, `tableCache.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 43`** (9 nodes): `cleanupEventListeners()`, `handleTouchEnd()`, `handleTouchMove()`, `handleTouchStart()`, `handleWheelScroll()`, `if()`, `setTransition()`, `setupEventListeners()`, `index.vue`
- **Thin community `Community 46`** (9 nodes): `cleanupEventListeners()`, `handleTouchEnd()`, `handleTouchMove()`, `handleTouchStart()`, `handleWheelScroll()`, `if()`, `setTransition()`, `setupEventListeners()`, `index.vue`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 48`** (8 nodes): `TableHeightCalculator`, `.calculate()`, `.calculateOffset()`, `.calculatePaginationOffset()`, `.constructor()`, `.getHeaderHeight()`, `useTableHeight()`, `useTableHeight.ts`
- **Thin community `Community 52`** (8 nodes): `TableHeightCalculator`, `.calculate()`, `.calculateOffset()`, `.calculatePaginationOffset()`, `.constructor()`, `.getHeaderHeight()`, `useTableHeight()`, `useTableHeight.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 50`** (7 nodes): `App.vue`, `main.ts`, `refreshButtonAutoIcons()`, `refreshPanelTitleIcons()`, `logApiCryptoBootInfo()`, `maskSecret()`, `console.ts`
- **Thin community `Community 54`** (7 nodes): `App.vue`, `main.ts`, `refreshButtonAutoIcons()`, `refreshPanelTitleIcons()`, `logApiCryptoBootInfo()`, `maskSecret()`, `console.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 53`** (7 nodes): `fetchCreateLeave()`, `fetchDeleteLeave()`, `fetchLeaveDetail()`, `fetchLeaveList()`, `fetchSubmitLeave()`, `fetchUpdateLeave()`, `leave.ts`
- **Thin community `Community 57`** (7 nodes): `fetchCreateLeave()`, `fetchDeleteLeave()`, `fetchLeaveDetail()`, `fetchLeaveList()`, `fetchSubmitLeave()`, `fetchUpdateLeave()`, `leave.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 54`** (6 nodes): `formatQcWorkOrderUnfinishedBadgeCount()`, `isUnfinishedQcWorkOrder()`, `qcWorkOrderUnfinishedBadgeTitle()`, `resolveQcWorkOrderUnfinishedBadgeCount()`, `sumQcWorkOrderGroupUnfinishedBadgeCount()`, `qc-work-order-unfinished-badge.ts`
- **Thin community `Community 58`** (6 nodes): `formatQcWorkOrderUnfinishedBadgeCount()`, `isUnfinishedQcWorkOrder()`, `qcWorkOrderUnfinishedBadgeTitle()`, `resolveQcWorkOrderUnfinishedBadgeCount()`, `sumQcWorkOrderGroupUnfinishedBadgeCount()`, `qc-work-order-unfinished-badge.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 56`** (5 nodes): `formatProtocolDocBatchDeleteConfirm()`, `formatProtocolDocDeleteConfirm()`, `formatProtocolDocSubject()`, `getProtocolDocTypeLabel()`, `protocol-doc-label.ts`
- **Thin community `Community 60`** (5 nodes): `formatProtocolDocBatchDeleteConfirm()`, `formatProtocolDocDeleteConfirm()`, `formatProtocolDocSubject()`, `getProtocolDocTypeLabel()`, `protocol-doc-label.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 57`** (5 nodes): `equipmentOptionLabel()`, `joinEquipmentIds()`, `parseEquipmentIds()`, `syncEquipmentNamesFromOptions()`, `equipment-select.ts`
- **Thin community `Community 61`** (5 nodes): `equipmentOptionLabel()`, `joinEquipmentIds()`, `parseEquipmentIds()`, `syncEquipmentNamesFromOptions()`, `equipment-select.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 59`** (5 nodes): `focusInput()`, `handleKeydown()`, `if()`, `search()`, `index.vue`
- **Thin community `Community 63`** (5 nodes): `focusInput()`, `handleKeydown()`, `if()`, `search()`, `index.vue`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 63`** (4 nodes): `if()`, `logSidebarMenu()`, `index.vue`, `SidebarSubmenu.vue`
- **Thin community `Community 64`** (5 nodes): `fetchBatchRevokeQcMaterialAmountAuth()`, `fetchGrantQcMaterialAmountAuth()`, `fetchQcMaterialAmountAuthUsers()`, `fetchRevokeQcMaterialAmountAuth()`, `qc-material-amount-auth.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 65`** (4 nodes): `fetchGenerateSms()`, `fetchSampleSmsNotificationList()`, `fetchToggleSmsNotified()`, `sample-sms-notification.ts`
- **Thin community `Community 67`** (4 nodes): `if()`, `logSidebarMenu()`, `index.vue`, `SidebarSubmenu.vue`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 66`** (4 nodes): `fetchGenerateQcSms()`, `fetchQcSmsList()`, `fetchToggleQcSmsNotified()`, `qc-sms-notification.ts`
- **Thin community `Community 69`** (4 nodes): `fetchGenerateSms()`, `fetchSampleSmsNotificationList()`, `fetchToggleSmsNotified()`, `sample-sms-notification.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 71`** (3 nodes): `getSettingDefaults()`, `resetToDefaults()`, `setting.ts`
- **Thin community `Community 74`** (3 nodes): `getSettingDefaults()`, `resetToDefaults()`, `setting.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 74`** (3 nodes): `copyTextToClipboard()`, `copyTextWithFallback()`, `copy-text.ts`
- **Thin community `Community 76`** (3 nodes): `buildOvertimeKitChildren()`, `oa-overtime-kit-rule.ts`, `uniqueId()`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 77`** (3 nodes): `getSourceProtocolAttachment()`, `normalizeAttachmentFiles()`, `protocol-source-attachment.ts`
- **Thin community `Community 77`** (3 nodes): `buildLeaveKitChildren()`, `oa-leave-kit-rule.ts`, `uniqueId()`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 88`** (3 nodes): `emptyTabCounts()`, `useProductionWorkOrderTabStepCounts()`, `useProductionWorkOrderTabStepCounts.ts`
- **Thin community `Community 80`** (3 nodes): `buildConfirmationKitChildren()`, `oa-confirmation-kit-rule.ts`, `uniqueId()`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 90`** (3 nodes): `initialProgress()`, `useQcWorkOrderAttachmentExport()`, `useQcWorkOrderAttachmentExport.ts`
- **Thin community `Community 81`** (3 nodes): `buildResignationKitChildren()`, `oa-resignation-kit-rule.ts`, `uniqueId()`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 91`** (3 nodes): `emptyTabCounts()`, `useQcWorkOrderTabUnfinishedCounts()`, `useQcWorkOrderTabUnfinishedCounts.ts`
- **Thin community `Community 82`** (3 nodes): `copyTextToClipboard()`, `copyTextWithFallback()`, `copy-text.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 86`** (3 nodes): `getSourceProtocolAttachment()`, `normalizeAttachmentFiles()`, `protocol-source-attachment.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 97`** (3 nodes): `emptyTabCounts()`, `useProductionWorkOrderTabStepCounts()`, `useProductionWorkOrderTabStepCounts.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 99`** (3 nodes): `initialProgress()`, `useQcWorkOrderAttachmentExport()`, `useQcWorkOrderAttachmentExport.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
- **Thin community `Community 100`** (3 nodes): `emptyTabCounts()`, `useQcWorkOrderTabUnfinishedCounts()`, `useQcWorkOrderTabUnfinishedCounts.ts`
Too small to be a meaningful cluster - may be noise or needs more connections extracted.
## Suggested Questions
_Questions this graph is uniquely positioned to answer:_
- **Why does `push()` connect `Community 2` to `Community 0`, `Community 1`, `Community 3`, `Community 4`, `Community 6`, `Community 7`, `Community 8`, `Community 9`, `Community 10`, `Community 12`, `Community 14`, `Community 16`, `Community 17`, `Community 19`, `Community 21`, `Community 22`, `Community 23`, `Community 24`, `Community 28`, `Community 30`, `Community 33`, `Community 34`, `Community 35`, `Community 40`?**
_High betweenness centrality (0.312) - this node is a cross-community bridge._
- **Why does `get()` connect `Community 0` to `Community 1`, `Community 2`, `Community 3`, `Community 4`, `Community 5`, `Community 6`, `Community 7`, `Community 8`, `Community 9`, `Community 10`, `Community 11`, `Community 13`, `Community 14`, `Community 15`, `Community 17`, `Community 18`, `Community 19`, `Community 20`, `Community 24`, `Community 27`, `Community 29`, `Community 30`, `Community 31`, `Community 38`, `Community 42`, `Community 53`, `Community 65`, `Community 66`?**
_High betweenness centrality (0.253) - this node is a cross-community bridge._
- **Why does `emit()` connect `Community 13` to `Community 0`, `Community 1`, `Community 35`, `Community 4`, `Community 3`, `Community 18`, `Community 19`, `Community 20`, `Community 27`?**
_High betweenness centrality (0.045) - this node is a cross-community bridge._
- **Are the 299 inferred relationships involving `get()` (e.g. with `resolveStorageSlotRangeFill()` and `buildNodeCodePathFromFlat()`) actually correct?**
_`get()` has 299 INFERRED edges - model-reasoned connections that need verification._
- **Are the 96 inferred relationships involving `push()` (e.g. with `refreshQcMenuBadges()` and `collectLeafFacilityNodesInTreeOrder()`) actually correct?**
_`push()` has 96 INFERRED edges - model-reasoned connections that need verification._
- **Why does `push()` connect `Community 1` to `Community 0`, `Community 2`, `Community 3`, `Community 4`, `Community 5`, `Community 8`, `Community 9`, `Community 10`, `Community 12`, `Community 13`, `Community 14`, `Community 15`, `Community 16`, `Community 17`, `Community 19`, `Community 20`, `Community 21`, `Community 22`, `Community 25`, `Community 26`, `Community 28`, `Community 29`, `Community 30`, `Community 35`, `Community 44`?**
_High betweenness centrality (0.287) - this node is a cross-community bridge._
- **Why does `get()` connect `Community 0` to `Community 1`, `Community 3`, `Community 4`, `Community 5`, `Community 6`, `Community 7`, `Community 8`, `Community 9`, `Community 10`, `Community 11`, `Community 13`, `Community 14`, `Community 15`, `Community 16`, `Community 18`, `Community 19`, `Community 20`, `Community 26`, `Community 27`, `Community 28`, `Community 29`, `Community 30`, `Community 31`, `Community 32`, `Community 34`, `Community 37`, `Community 42`, `Community 45`, `Community 48`, `Community 57`, `Community 64`, `Community 69`?**
_High betweenness centrality (0.252) - this node is a cross-community bridge._
- **Why does `emit()` connect `Community 11` to `Community 35`, `Community 3`, `Community 37`, `Community 6`, `Community 5`, `Community 13`, `Community 16`, `Community 18`, `Community 26`?**
_High betweenness centrality (0.038) - this node is a cross-community bridge._
- **Are the 300 inferred relationships involving `get()` (e.g. with `resolveStorageSlotRangeFill()` and `buildNodeCodePathFromFlat()`) actually correct?**
_`get()` has 300 INFERRED edges - model-reasoned connections that need verification._
- **Are the 108 inferred relationships involving `push()` (e.g. with `refreshQcMenuBadges()` and `collectLeafFacilityNodesInTreeOrder()`) actually correct?**
_`push()` has 108 INFERRED edges - model-reasoned connections that need verification._
- **Are the 27 inferred relationships involving `emit()` (e.g. with `handleSubmit()` and `handleDialogClose()`) actually correct?**
_`emit()` has 27 INFERRED edges - model-reasoned connections that need verification._
- **Are the 20 inferred relationships involving `set()` (e.g. with `buildNodeCodePathFromFlat()` and `collectLeafFacilityNodesInTreeOrder()`) actually correct?**
web-admin/graphify-out/graph.html
+4 -4
View File
@@ -57,12 +57,12 @@
</div>
<div id="legend"></div>
</div>
<div id="stats">3202 nodes &middot; 4492 edges &middot; 368 communities</div>
<div id="stats">3345 nodes &middot; 4712 edges &middot; 382 communities</div>
</div>
<script>
const RAW_NODES = [{"id": "app_vue", "label": "App.vue", "color": {"background": "#4E79A7", "border": "#4E79A7", "highlight": {"background": "#ffffff", "border": "#4E79A7"}}, "size": 10.3, "font": {"size": 0, "color": "#ffffff"}, "title": "App.vue", "community": 50, "community_name": "Community 50", "source_file": "App.vue", "file_type": "code", "degree": 3}, {"id": "src_app_refreshbuttonautoicons", "label": "refreshButtonAutoIcons()", "color": {"background": "#4E79A7", "border": "#4E79A7", "highlight": {"background": "#ffffff", "border": "#4E79A7"}}, "size": 10.1, "font": {"size": 0, "color": "#ffffff"}, "title": "refreshButtonAutoIcons()", "community": 50, "community_name": "Community 50", "source_file": "App.vue", "file_type": "code", "degree": 1}, {"id": "src_app_refreshpaneltitleicons", "label": "refreshPanelTitleIcons()", "color": {"background": "#4E79A7", "border": "#4E79A7", "highlight": {"background": "#ffffff", "border": "#4E79A7"}}, "size": 10.1, "font": {"size": 0, "color": "#ffffff"}, "title": "refreshPanelTitleIcons()", "community": 50, "community_name": "Community 50", "source_file": "App.vue", "file_type": "code", "degree": 1}, {"id": "main_ts", "label": "main.ts", "color": {"background": "#4E79A7", "border": "#4E79A7", "highlight": {"background": "#ffffff", "border": "#4E79A7"}}, "size": 10.4, "font": {"size": 0, "color": "#ffffff"}, "title": "main.ts", "community": 50, "community_name": "Community 50", "source_file": "main.ts", "file_type": "code", "degree": 4}, {"id": "src_main_masksecret", "label": "maskSecret()", "color": {"background": "#4E79A7", "border": "#4E79A7", "highlight": {"background": "#ffffff", "border": "#4E79A7"}}, "size": 10.2, "font": {"size": 0, "color": "#ffffff"}, "title": "maskSecret()", "community": 50, "community_name": "Community 50", "source_file": "main.ts", "file_type": "code", "degree": 2}, {"id": "src_main_logapicryptobootinfo", "label": "logApiCryptoBootInfo()", "color": {"background": "#4E79A7", "border": "#4E79A7", "highlight": {"background": "#ffffff", "border": "#4E79A7"}}, "size": 10.2, "font": {"size": 0, "color": "#ffffff"}, "title": "logApiCryptoBootInfo()", "community": 50, "community_name": "Community 50", "source_file": "main.ts", "file_type": "code", "degree": 2}, {"id": "env_d_ts", "label": "env.d.ts", "color": {"background": "#59A14F", "border": "#59A14F", "highlight": {"background": "#ffffff", "border": "#59A14F"}}, "size": 10.0, "font": {"size": 0, "color": "#ffffff"}, "title": "env.d.ts", "community": 134, "community_name": "Community 134", "source_file": "env.d.ts", "file_type": "code", "degree": 0}, {"id": "shims_loose_d_ts", "label": "shims-loose.d.ts", "color": {"background": "#EDC948", "border": "#EDC948", "highlight": {"background": "#ffffff", "border": "#EDC948"}}, "size": 10.0, "font": {"size": 0, "color": "#ffffff"}, "title": "shims-loose.d.ts", "community": 135, "community_name": "Community 135", "source_file": "shims-loose.d.ts", "file_type": "code", "degree": 0}, {"id": "directives_index_ts", "label": "index.ts", "color": {"background": "#E15759", "border": "#E15759", "highlight": {"background": "#ffffff", "border": "#E15759"}}, "size": 10.1, "font": {"size": 0, "color": "#ffffff"}, "title": "index.ts", "community": 32, "community_name": "Community 32", "source_file": "directives/index.ts", "file_type": "code", "degree": 1}, {"id": "directives_index_setupglobdirectives", "label": "setupGlobDirectives()", "color": {"background": "#E15759", "border": "#E15759", "highlight": {"background": "#ffffff", "border": "#E15759"}}, "size": 10.5, "font": {"size": 0, "color": "#ffffff"}, "title": "setupGlobDirectives()", "community": 32, "community_name": "Community 32", "source_file": "directives/index.ts", "file_type": "code", "degree": 5}, {"id": "directives_core_roles_ts", "label": "roles.ts", "color": {"background": "#E15759", "border": "#E15759", "highlight": {"background": "#ffffff", "border": "#E15759"}}, "size": 10.3, "font": {"size": 0, "color": "#ffffff"}, "title": "roles.ts", "community": 32, "community_name": "Community 32", "source_file": "directives/core/roles.ts", "file_type": "code", "degree": 3}, {"id": "core_roles_checkrolepermission", "label": "checkRolePermission()", "color": {"background": "#E15759", "border": "#E15759", "highlight": {"background": "#ffffff", "border": "#E15759"}}, "size": 10.2, "font": {"size": 0, "color": "#ffffff"}, "title": "checkRolePermission()", "community": 32, "community_name": "Community 32", "source_file": "directives/core/roles.ts", "file_type": "code", "degree": 2}, {"id": "core_roles_removeelement", "label": "removeElement()", "color": {"background": "#E15759", "border": "#E15759", "highlight": {"background": "#ffffff", "border": "#E15759"}}, "size": 10.2, "font": {"size": 0, "color": "#ffffff"}, "title": "removeElement()", "community": 32, "community_name": "Community 32", "source_file": "directives/core/roles.ts", "file_type": "code", "degree": 2}, {"id": "core_roles_setuprolesdirective",Line truncated
const RAW_EDGES = [{"from": "app_vue", "to": "src_app_refreshbuttonautoicons", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "app_vue", "to": "src_app_refreshpaneltitleicons", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "app_vue", "to": "main_ts", "label": "imports_from", "title": "imports_from [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "main_ts", "to": "utils_sys_console_ts", "label": "imports_from", "title": "imports_from [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "main_ts", "to": "src_main_masksecret", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "main_ts", "to": "src_main_logapicryptobootinfo", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "src_main_masksecret", "to": "src_main_logapicryptobootinfo", "label": "calls", "title": "calls [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_index_ts", "to": "directives_index_setupglobdirectives", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_index_setupglobdirectives", "to": "core_auth_setupauthdirective", "label": "calls", "title": "calls [INFERRED]", "dashes": true, "width": 1, "color": {"opacity": 0.35}, "confidence": "INFERRED"}, {"from": "directives_index_setupglobdirectives", "to": "core_roles_setuprolesdirective", "label": "calls", "title": "calls [INFERRED]", "dashes": true, "width": 1, "color": {"opacity": 0.35}, "confidence": "INFERRED"}, {"from": "directives_index_setupglobdirectives", "to": "business_highlight_setuphighlightdirective", "label": "calls", "title": "calls [INFERRED]", "dashes": true, "width": 1, "color": {"opacity": 0.35}, "confidence": "INFERRED"}, {"from": "directives_index_setupglobdirectives", "to": "business_ripple_setuprippledirective", "label": "calls", "title": "calls [INFERRED]", "dashes": true, "width": 1, "color": {"opacity": 0.35}, "confidence": "INFERRED"}, {"from": "directives_core_roles_ts", "to": "core_roles_checkrolepermission", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_core_roles_ts", "to": "core_roles_removeelement", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_core_roles_ts", "to": "core_roles_setuprolesdirective", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "core_roles_checkrolepermission", "to": "core_roles_removeelement", "label": "calls", "title": "calls [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_core_auth_ts", "to": "core_auth_checkauthpermission", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_core_auth_ts", "to": "core_auth_removeelement", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_core_auth_ts", "to": "core_auth_setupauthdirective", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "core_auth_checkauthpermission", "to": "core_auth_removeelement", "label": "calls", "title": "calls [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_business_ripple_ts", "to": "business_ripple_setuprippledirective", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_business_highlight_ts", "to": "business_highlight_highlightcode", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_business_highlight_ts", "to": "business_highlight_insertlinenumbers", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_business_highlight_ts", "to": "business_highlight_addcopybutton", "label": "contains", "title": "contains [EXTRACTED]", "dLine truncated
const LEGEND = [{"cid": 0, "color": "#4E79A7", "label": "Community 0", "count": 477}, {"cid": 1, "color": "#F28E2B", "label": "Community 1", "count": 126}, {"cid": 2, "color": "#E15759", "label": "Community 2", "count": 123}, {"cid": 3, "color": "#76B7B2", "label": "Community 3", "count": 102}, {"cid": 4, "color": "#59A14F", "label": "Community 4", "count": 97}, {"cid": 5, "color": "#EDC948", "label": "Community 5", "count": 92}, {"cid": 6, "color": "#B07AA1", "label": "Community 6", "count": 92}, {"cid": 7, "color": "#FF9DA7", "label": "Community 7", "count": 90}, {"cid": 8, "color": "#9C755F", "label": "Community 8", "count": 90}, {"cid": 9, "color": "#BAB0AC", "label": "Community 9", "count": 89}, {"cid": 10, "color": "#4E79A7", "label": "Community 10", "count": 89}, {"cid": 11, "color": "#F28E2B", "label": "Community 11", "count": 84}, {"cid": 12, "color": "#E15759", "label": "Community 12", "count": 74}, {"cid": 13, "color": "#76B7B2", "label": "Community 13", "count": 74}, {"cid": 14, "color": "#59A14F", "label": "Community 14", "count": 66}, {"cid": 15, "color": "#EDC948", "label": "Community 15", "count": 64}, {"cid": 16, "color": "#B07AA1", "label": "Community 16", "count": 55}, {"cid": 17, "color": "#FF9DA7", "label": "Community 17", "count": 54}, {"cid": 18, "color": "#9C755F", "label": "Community 18", "count": 52}, {"cid": 19, "color": "#BAB0AC", "label": "Community 19", "count": 51}, {"cid": 20, "color": "#4E79A7", "label": "Community 20", "count": 46}, {"cid": 21, "color": "#F28E2B", "label": "Community 21", "count": 42}, {"cid": 22, "color": "#E15759", "label": "Community 22", "count": 41}, {"cid": 23, "color": "#76B7B2", "label": "Community 23", "count": 41}, {"cid": 24, "color": "#59A14F", "label": "Community 24", "count": 38}, {"cid": 25, "color": "#EDC948", "label": "Community 25", "count": 37}, {"cid": 26, "color": "#B07AA1", "label": "Community 26", "count": 37}, {"cid": 27, "color": "#FF9DA7", "label": "Community 27", "count": 36}, {"cid": 28, "color": "#9C755F", "label": "Community 28", "count": 36}, {"cid": 29, "color": "#BAB0AC", "label": "Community 29", "count": 35}, {"cid": 30, "color": "#4E79A7", "label": "Community 30", "count": 25}, {"cid": 31, "color": "#F28E2B", "label": "Community 31", "count": 24}, {"cid": 32, "color": "#E15759", "label": "Community 32", "count": 22}, {"cid": 33, "color": "#76B7B2", "label": "Community 33", "count": 20}, {"cid": 34, "color": "#59A14F", "label": "Community 34", "count": 20}, {"cid": 35, "color": "#EDC948", "label": "Community 35", "count": 20}, {"cid": 36, "color": "#B07AA1", "label": "Community 36", "count": 17}, {"cid": 37, "color": "#FF9DA7", "label": "Community 37", "count": 16}, {"cid": 38, "color": "#9C755F", "label": "Community 38", "count": 14}, {"cid": 39, "color": "#BAB0AC", "label": "Community 39", "count": 13}, {"cid": 40, "color": "#4E79A7", "label": "Community 40", "count": 13}, {"cid": 41, "color": "#F28E2B", "label": "Community 41", "count": 13}, {"cid": 42, "color": "#E15759", "label": "Community 42", "count": 9}, {"cid": 43, "color": "#76B7B2", "label": "Community 43", "count": 9}, {"cid": 44, "color": "#59A14F", "label": "Community 44", "count": 9}, {"cid": 45, "color": "#EDC948", "label": "Community 45", "count": 9}, {"cid": 46, "color": "#B07AA1", "label": "Community 46", "count": 9}, {"cid": 47, "color": "#FF9DA7", "label": "Community 47", "count": 8}, {"cid": 48, "color": "#9C755F", "label": "Community 48", "count": 8}, {"cid": 49, "color": "#BAB0AC", "label": "Community 49", "count": 8}, {"cid": 50, "color": "#4E79A7", "label": "Community 50", "count": 7}, {"cid": 51, "color": "#F28E2B", "label": "Community 51", "count": 7}, {"cid": 52, "color": "#E15759", "label": "Community 52", "count": 7}, {"cid": 53, "color": "#76B7B2", "label": "Community 53", "count": 7}, {"cid": 54, "color": "#59A14F", "label": "Community 54", "count": 6}, {"cid": 55, "color": "#EDC948", "label": "Community 55", "count": 6}, {"cid": 56, "color": "#B07AA1", "label": "Community 56", "count": 5}, {"cid": 57, "color": "#FF9DA7", "label": "Community 57", "count": 5}, {"cid": 58, "color": "#9C755F", "label": "Community 58", "count": 5}, {"cid": 59, "color": "#BAB0AC", "label": "Community 59", "count": 5}, {"cid": 60, "color": "#4E79A7", "label": "Community 60", "count": 5}, {"cid": 61, "color": "#F28E2B", "label": "Community 61", "count": 4}, {"cid": 62, "color": "#E15759", "label": "Community 62", "count": 4}, {"cid": 63, "color": "#76B7B2", "label": "Community 63", "count": 4}, {"cid": 64, "color": "#59A14F", "label": "Community 64", "count": 4}, {"cid": 65, "color": "#EDC948", "label": "Community 65", "count": 4}, {"cid": 66, "color": "#B07AA1", "label": "Community 66", "count": 4}, {"cid": 67, "color": "#FF9DA7", "label": "Community 67", "count": 4}, {"cid": 68, "color": "#9C755F", "label": "Community 68", "count": 4}, {"cid": 69, "color": "#BAB0AC", "label": "Community 69", "count": 4}, {"cid": 70, "color": "#4E79A7", "label": "Community 70", Line truncated
const RAW_NODES = [{"id": "app_vue", "label": "App.vue", "color": {"background": "#59A14F", "border": "#59A14F", "highlight": {"background": "#ffffff", "border": "#59A14F"}}, "size": 10.3, "font": {"size": 0, "color": "#ffffff"}, "title": "App.vue", "community": 54, "community_name": "Community 54", "source_file": "App.vue", "file_type": "code", "degree": 3}, {"id": "src_app_refreshbuttonautoicons", "label": "refreshButtonAutoIcons()", "color": {"background": "#59A14F", "border": "#59A14F", "highlight": {"background": "#ffffff", "border": "#59A14F"}}, "size": 10.1, "font": {"size": 0, "color": "#ffffff"}, "title": "refreshButtonAutoIcons()", "community": 54, "community_name": "Community 54", "source_file": "App.vue", "file_type": "code", "degree": 1}, {"id": "src_app_refreshpaneltitleicons", "label": "refreshPanelTitleIcons()", "color": {"background": "#59A14F", "border": "#59A14F", "highlight": {"background": "#ffffff", "border": "#59A14F"}}, "size": 10.1, "font": {"size": 0, "color": "#ffffff"}, "title": "refreshPanelTitleIcons()", "community": 54, "community_name": "Community 54", "source_file": "App.vue", "file_type": "code", "degree": 1}, {"id": "main_ts", "label": "main.ts", "color": {"background": "#59A14F", "border": "#59A14F", "highlight": {"background": "#ffffff", "border": "#59A14F"}}, "size": 10.4, "font": {"size": 0, "color": "#ffffff"}, "title": "main.ts", "community": 54, "community_name": "Community 54", "source_file": "main.ts", "file_type": "code", "degree": 4}, {"id": "src_main_masksecret", "label": "maskSecret()", "color": {"background": "#59A14F", "border": "#59A14F", "highlight": {"background": "#ffffff", "border": "#59A14F"}}, "size": 10.2, "font": {"size": 0, "color": "#ffffff"}, "title": "maskSecret()", "community": 54, "community_name": "Community 54", "source_file": "main.ts", "file_type": "code", "degree": 2}, {"id": "src_main_logapicryptobootinfo", "label": "logApiCryptoBootInfo()", "color": {"background": "#59A14F", "border": "#59A14F", "highlight": {"background": "#ffffff", "border": "#59A14F"}}, "size": 10.2, "font": {"size": 0, "color": "#ffffff"}, "title": "logApiCryptoBootInfo()", "community": 54, "community_name": "Community 54", "source_file": "main.ts", "file_type": "code", "degree": 2}, {"id": "env_d_ts", "label": "env.d.ts", "color": {"background": "#B07AA1", "border": "#B07AA1", "highlight": {"background": "#ffffff", "border": "#B07AA1"}}, "size": 10.0, "font": {"size": 0, "color": "#ffffff"}, "title": "env.d.ts", "community": 146, "community_name": "Community 146", "source_file": "env.d.ts", "file_type": "code", "degree": 0}, {"id": "shims_loose_d_ts", "label": "shims-loose.d.ts", "color": {"background": "#FF9DA7", "border": "#FF9DA7", "highlight": {"background": "#ffffff", "border": "#FF9DA7"}}, "size": 10.0, "font": {"size": 0, "color": "#ffffff"}, "title": "shims-loose.d.ts", "community": 147, "community_name": "Community 147", "source_file": "shims-loose.d.ts", "file_type": "code", "degree": 0}, {"id": "directives_index_ts", "label": "index.ts", "color": {"background": "#76B7B2", "border": "#76B7B2", "highlight": {"background": "#ffffff", "border": "#76B7B2"}}, "size": 10.1, "font": {"size": 0, "color": "#ffffff"}, "title": "index.ts", "community": 33, "community_name": "Community 33", "source_file": "directives/index.ts", "file_type": "code", "degree": 1}, {"id": "directives_index_setupglobdirectives", "label": "setupGlobDirectives()", "color": {"background": "#76B7B2", "border": "#76B7B2", "highlight": {"background": "#ffffff", "border": "#76B7B2"}}, "size": 10.5, "font": {"size": 0, "color": "#ffffff"}, "title": "setupGlobDirectives()", "community": 33, "community_name": "Community 33", "source_file": "directives/index.ts", "file_type": "code", "degree": 5}, {"id": "directives_core_roles_ts", "label": "roles.ts", "color": {"background": "#76B7B2", "border": "#76B7B2", "highlight": {"background": "#ffffff", "border": "#76B7B2"}}, "size": 10.3, "font": {"size": 0, "color": "#ffffff"}, "title": "roles.ts", "community": 33, "community_name": "Community 33", "source_file": "directives/core/roles.ts", "file_type": "code", "degree": 3}, {"id": "core_roles_checkrolepermission", "label": "checkRolePermission()", "color": {"background": "#76B7B2", "border": "#76B7B2", "highlight": {"background": "#ffffff", "border": "#76B7B2"}}, "size": 10.2, "font": {"size": 0, "color": "#ffffff"}, "title": "checkRolePermission()", "community": 33, "community_name": "Community 33", "source_file": "directives/core/roles.ts", "file_type": "code", "degree": 2}, {"id": "core_roles_removeelement", "label": "removeElement()", "color": {"background": "#76B7B2", "border": "#76B7B2", "highlight": {"background": "#ffffff", "border": "#76B7B2"}}, "size": 10.2, "font": {"size": 0, "color": "#ffffff"}, "title": "removeElement()", "community": 33, "community_name": "Community 33", "source_file": "directives/core/roles.ts", "file_type": "code", "degree": 2}, {"id": "core_roles_setuprolesdirective",Line truncated
const RAW_EDGES = [{"from": "app_vue", "to": "src_app_refreshbuttonautoicons", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "app_vue", "to": "src_app_refreshpaneltitleicons", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "app_vue", "to": "main_ts", "label": "imports_from", "title": "imports_from [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "main_ts", "to": "utils_sys_console_ts", "label": "imports_from", "title": "imports_from [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "main_ts", "to": "src_main_masksecret", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "main_ts", "to": "src_main_logapicryptobootinfo", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "src_main_masksecret", "to": "src_main_logapicryptobootinfo", "label": "calls", "title": "calls [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_index_ts", "to": "directives_index_setupglobdirectives", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_index_setupglobdirectives", "to": "core_auth_setupauthdirective", "label": "calls", "title": "calls [INFERRED]", "dashes": true, "width": 1, "color": {"opacity": 0.35}, "confidence": "INFERRED"}, {"from": "directives_index_setupglobdirectives", "to": "core_roles_setuprolesdirective", "label": "calls", "title": "calls [INFERRED]", "dashes": true, "width": 1, "color": {"opacity": 0.35}, "confidence": "INFERRED"}, {"from": "directives_index_setupglobdirectives", "to": "business_highlight_setuphighlightdirective", "label": "calls", "title": "calls [INFERRED]", "dashes": true, "width": 1, "color": {"opacity": 0.35}, "confidence": "INFERRED"}, {"from": "directives_index_setupglobdirectives", "to": "business_ripple_setuprippledirective", "label": "calls", "title": "calls [INFERRED]", "dashes": true, "width": 1, "color": {"opacity": 0.35}, "confidence": "INFERRED"}, {"from": "directives_core_roles_ts", "to": "core_roles_checkrolepermission", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_core_roles_ts", "to": "core_roles_removeelement", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_core_roles_ts", "to": "core_roles_setuprolesdirective", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "core_roles_checkrolepermission", "to": "core_roles_removeelement", "label": "calls", "title": "calls [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_core_auth_ts", "to": "core_auth_checkauthpermission", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_core_auth_ts", "to": "core_auth_removeelement", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_core_auth_ts", "to": "core_auth_setupauthdirective", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "core_auth_checkauthpermission", "to": "core_auth_removeelement", "label": "calls", "title": "calls [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_business_ripple_ts", "to": "business_ripple_setuprippledirective", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_business_highlight_ts", "to": "business_highlight_highlightcode", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_business_highlight_ts", "to": "business_highlight_insertlinenumbers", "label": "contains", "title": "contains [EXTRACTED]", "dashes": false, "width": 2, "color": {"opacity": 0.7}, "confidence": "EXTRACTED"}, {"from": "directives_business_highlight_ts", "to": "business_highlight_addcopybutton", "label": "contains", "title": "contains [EXTRACTED]", "dLine truncated
const LEGEND = [{"cid": 0, "color": "#4E79A7", "label": "Community 0", "count": 527}, {"cid": 1, "color": "#F28E2B", "label": "Community 1", "count": 128}, {"cid": 2, "color": "#E15759", "label": "Community 2", "count": 123}, {"cid": 3, "color": "#76B7B2", "label": "Community 3", "count": 119}, {"cid": 4, "color": "#59A14F", "label": "Community 4", "count": 111}, {"cid": 5, "color": "#EDC948", "label": "Community 5", "count": 101}, {"cid": 6, "color": "#B07AA1", "label": "Community 6", "count": 97}, {"cid": 7, "color": "#FF9DA7", "label": "Community 7", "count": 93}, {"cid": 8, "color": "#9C755F", "label": "Community 8", "count": 89}, {"cid": 9, "color": "#BAB0AC", "label": "Community 9", "count": 89}, {"cid": 10, "color": "#4E79A7", "label": "Community 10", "count": 82}, {"cid": 11, "color": "#F28E2B", "label": "Community 11", "count": 75}, {"cid": 12, "color": "#E15759", "label": "Community 12", "count": 71}, {"cid": 13, "color": "#76B7B2", "label": "Community 13", "count": 71}, {"cid": 14, "color": "#59A14F", "label": "Community 14", "count": 70}, {"cid": 15, "color": "#EDC948", "label": "Community 15", "count": 68}, {"cid": 16, "color": "#B07AA1", "label": "Community 16", "count": 51}, {"cid": 17, "color": "#FF9DA7", "label": "Community 17", "count": 47}, {"cid": 18, "color": "#9C755F", "label": "Community 18", "count": 46}, {"cid": 19, "color": "#BAB0AC", "label": "Community 19", "count": 45}, {"cid": 20, "color": "#4E79A7", "label": "Community 20", "count": 45}, {"cid": 21, "color": "#F28E2B", "label": "Community 21", "count": 42}, {"cid": 22, "color": "#E15759", "label": "Community 22", "count": 39}, {"cid": 23, "color": "#76B7B2", "label": "Community 23", "count": 37}, {"cid": 24, "color": "#59A14F", "label": "Community 24", "count": 37}, {"cid": 25, "color": "#EDC948", "label": "Community 25", "count": 36}, {"cid": 26, "color": "#B07AA1", "label": "Community 26", "count": 36}, {"cid": 27, "color": "#FF9DA7", "label": "Community 27", "count": 35}, {"cid": 28, "color": "#9C755F", "label": "Community 28", "count": 35}, {"cid": 29, "color": "#BAB0AC", "label": "Community 29", "count": 34}, {"cid": 30, "color": "#4E79A7", "label": "Community 30", "count": 25}, {"cid": 31, "color": "#F28E2B", "label": "Community 31", "count": 24}, {"cid": 32, "color": "#E15759", "label": "Community 32", "count": 24}, {"cid": 33, "color": "#76B7B2", "label": "Community 33", "count": 22}, {"cid": 34, "color": "#59A14F", "label": "Community 34", "count": 22}, {"cid": 35, "color": "#EDC948", "label": "Community 35", "count": 20}, {"cid": 36, "color": "#B07AA1", "label": "Community 36", "count": 19}, {"cid": 37, "color": "#FF9DA7", "label": "Community 37", "count": 19}, {"cid": 38, "color": "#9C755F", "label": "Community 38", "count": 17}, {"cid": 39, "color": "#BAB0AC", "label": "Community 39", "count": 17}, {"cid": 40, "color": "#4E79A7", "label": "Community 40", "count": 16}, {"cid": 41, "color": "#F28E2B", "label": "Community 41", "count": 14}, {"cid": 42, "color": "#E15759", "label": "Community 42", "count": 14}, {"cid": 43, "color": "#76B7B2", "label": "Community 43", "count": 13}, {"cid": 44, "color": "#59A14F", "label": "Community 44", "count": 13}, {"cid": 45, "color": "#EDC948", "label": "Community 45", "count": 9}, {"cid": 46, "color": "#B07AA1", "label": "Community 46", "count": 9}, {"cid": 47, "color": "#FF9DA7", "label": "Community 47", "count": 9}, {"cid": 48, "color": "#9C755F", "label": "Community 48", "count": 9}, {"cid": 49, "color": "#BAB0AC", "label": "Community 49", "count": 9}, {"cid": 50, "color": "#4E79A7", "label": "Community 50", "count": 9}, {"cid": 51, "color": "#F28E2B", "label": "Community 51", "count": 8}, {"cid": 52, "color": "#E15759", "label": "Community 52", "count": 8}, {"cid": 53, "color": "#76B7B2", "label": "Community 53", "count": 8}, {"cid": 54, "color": "#59A14F", "label": "Community 54", "count": 7}, {"cid": 55, "color": "#EDC948", "label": "Community 55", "count": 7}, {"cid": 56, "color": "#B07AA1", "label": "Community 56", "count": 7}, {"cid": 57, "color": "#FF9DA7", "label": "Community 57", "count": 7}, {"cid": 58, "color": "#9C755F", "label": "Community 58", "count": 6}, {"cid": 59, "color": "#BAB0AC", "label": "Community 59", "count": 6}, {"cid": 60, "color": "#4E79A7", "label": "Community 60", "count": 5}, {"cid": 61, "color": "#F28E2B", "label": "Community 61", "count": 5}, {"cid": 62, "color": "#E15759", "label": "Community 62", "count": 5}, {"cid": 63, "color": "#76B7B2", "label": "Community 63", "count": 5}, {"cid": 64, "color": "#59A14F", "label": "Community 64", "count": 5}, {"cid": 65, "color": "#EDC948", "label": "Community 65", "count": 5}, {"cid": 66, "color": "#B07AA1", "label": "Community 66", "count": 4}, {"cid": 67, "color": "#FF9DA7", "label": "Community 67", "count": 4}, {"cid": 68, "color": "#9C755F", "label": "Community 68", "count": 4}, {"cid": 69, "color": "#BAB0AC", "label": "Community 69", "count": 4}, {"cid": 70, "color": "#4E79A7", "label": "Community Line truncated
// HTML-escape helper — prevents XSS when injecting graph data into innerHTML
function esc(s) {
web-admin/graphify-out/graph.json
+7505 -3761
View File
File diff suppressed because it is too large. Load diff
web-admin/graphify-out/manifest.json
+49 -13
View File
@@ -1,6 +1,6 @@
{
"/Users/wuzilong/work/00code/zkxw/web-admin/src/App.vue": 1782893851.4905877,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/main.ts": 1785394417.9719267,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/main.ts": 1785412925.0546799,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/env.d.ts": 1781272556.3788364,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/shims-loose.d.ts": 1781272556.417826,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/directives/index.ts": 1781272556.3521712,
@@ -8,7 +8,7 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/directives/core/auth.ts": 1781272556.3503833,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/directives/business/ripple.ts": 1781272556.3509357,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/directives/business/highlight.ts": 1781272556.3516848,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/api.d.ts": 1785145511.8646278,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/api.d.ts": 1785404978.2452567,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/index.ts": 1781272556.36091,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/config/index.ts": 1781272556.3566036,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/component/chart.ts": 1781272556.3575494,
@@ -17,8 +17,8 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/common/index.ts": 1781272556.3597305,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/directive/directive.d.ts": 1781272556.3601494,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/api/api.d.ts": 1781272556.3606477,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/import/components.d.ts": 1785394386.4395301,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/import/auto-imports.d.ts": 1785393257.4811723,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/import/components.d.ts": 1785488603.6133275,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/import/auto-imports.d.ts": 1785488328.896075,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/store/index.ts": 1781272556.364766,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/types/router/index.ts": 1782394569.8806834,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/composables/useAttachmentActions.ts": 1783921717.4015942,
@@ -52,14 +52,22 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/chinese-numeral-parse.ts": 1782960575.662593,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/sample-production-reception-fields.ts": 1782806741.4880455,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-upload-file-type.ts": 1785145511.867549,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-owner-person-select-rule.ts": 1785401001.9203484,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-post.ts": 1785394335.3053484,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-trip-kit-runtime.ts": 1785412937.5821183,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-overtime-kit.ts": 1785488982.6957128,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-approval-print-related.ts": 1785145511.865531,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-material-ui.ts": 1781525352.6976836,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-work-order-tabs.ts": 1783326303.9709864,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-overtime-kit-rule.ts": 1785488986.9903543,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/rmb-upper.test.ts": 1785380467.5004647,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-work-order-unfinished-badge.ts": 1782878267.729195,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-money-field-rule.ts": 1785381038.6256208,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-kit-menu.ts": 1785488967.5941017,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-work-order-card-meta.ts": 1783340646.2664113,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-leave-hours.test.ts": 1785397672.8405652,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-trip-days.ts": 1785407077.9555745,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-leave-kit-rule.ts": 1785488985.2762377,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-work-order-category.ts": 1782393809.3917818,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/router.ts": 1781272556.3875713,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/production-mine-task-groups.ts": 1785209209.7549982,
@@ -69,9 +77,15 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/status-tag-registry.ts": 1785206796.3246918,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/production-work-order-card-meta.ts": 1785209080.8034942,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/fetch-paged-list.ts": 1781272556.3903377,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-owner-person.ts": 1785401005.1552768,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-receive-account.ts": 1785390573.9898896,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-trip-days.test.ts": 1785407049.2669108,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-overtime-kit-runtime.ts": 1785489676.7154438,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-confirmation-kit-rule.ts": 1785488986.1610565,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/decimal-input-format.ts": 1782807247.117702,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-confirmation-kit.ts": 1785488978.7074184,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/sort-order.ts": 1781272556.3913012,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-confirmation-kit-runtime.ts": 1785403486.5645103,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/void-type-dict.ts": 1782894802.0460823,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-work-order-attachment-export.ts": 1782962844.3685946,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-receive-account-value.ts": 1785390441.8286228,
@@ -79,22 +93,28 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/sample-reception-lab-storage-code.ts": 1782378453.1031013,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/outbound-qc-pilot-view-sections.ts": 1781566346.7618802,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-app-icons.ts": 1785383053.3847246,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-resignation-kit-rule.ts": 1785488987.364553,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-person-select-rule.ts": 1785385076.8703918,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-work-order-groups.ts": 1782400129.6394563,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-inspection-batch.ts": 1782569790.8550596,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/equipment-select.ts": 1781524048.96866,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-item-param-options.ts": 1782446792.147386,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/clinical-payment-flow-steps.ts": 1782806499.3105526,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-leave-hours.ts": 1785397673.1590223,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-leave-kit.ts": 1785488971.141004,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/production-work-order-step-badge.ts": 1783307221.345424,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-owner-field-defaults.ts": 1785401266.0298183,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-work-order-inbound-sample-cards.ts": 1783392689.28207,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/donation-standard-import-parse.ts": 1782960400.9073825,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-dept-select-rule.ts": 1785148503.1439052,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/copy-text.ts": 1781272556.4018052,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/tree-path.ts": 1781272556.402468,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/mask-sensitive.ts": 1781272556.4029639,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-confirmation-date.ts": 1785403063.4649312,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/sample-reception-view-sections.ts": 1783389099.9667985,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/production-labels.ts": 1783306730.912153,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-approval-print.ts": 1785394495.0739603,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-approval-print.ts": 1785412931.7636745,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-owner-dept-select-rule.ts": 1785401003.0360808,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/inbound-sample-special-mark.ts": 1782889894.1376855,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-receive-account-value.test.ts": 1785390443.3642433,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-person-value.ts": 1785384573.025628,
@@ -103,6 +123,7 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-related-approval-rule.ts": 1785145511.8673027,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-receive-account-rule.ts": 1785390573.9898922,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/production-menu-badge.ts": 1783307225.4832592,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-trip-itinerary.ts": 1785412591.4682207,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-post-value.ts": 1785394332.7419252,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/attachment-zip.ts": 1782875325.855345,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/numeric-input-parse.ts": 1782179343.5953708,
@@ -111,18 +132,24 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/cell-product-type.ts": 1782706056.1567264,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-person-value.test.ts": 1785384550.6125512,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/money-format.ts": 1782807264.1686463,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-resignation-kit.ts": 1785488983.542324,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-confirmation-date.test.ts": 1785403063.4077332,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/storage-slot-range-fill.test.ts": 1785235070.1222875,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/category-path-display.ts": 1781272556.411347,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-owner-dept.ts": 1785401008.00913,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/transfer-type-dict.ts": 1782713881.7742825,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/protocol-standard-import-parse.ts": 1783330000.923092,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/cell-product-spec.ts": 1782709946.3419836,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-money.ts": 1785381043.0856774,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-trip-kit-rule.ts": 1785488984.3917909,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-work-order-selection-expand.ts": 1783322120.2724662,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/protocol-payment-presets.ts": 1783337255.9745116,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-trip-kit.ts": 1785488974.8414037,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/qc-labels.ts": 1785206799.7537315,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/production-step-assignee.ts": 1782472559.244021,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/process-material-ui.ts": 1785243503.4279134,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/protocol-fq-params-change.ts": 1781687645.2065177,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-leave-kit-runtime.ts": 1785398692.446228,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-upload.ts": 1785145511.866446,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/protocol-payment-flow-steps.ts": 1782806499.3099828,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-related-approval.ts": 1785145511.866155,
@@ -130,6 +157,7 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/chinese-datetime-parse.ts": 1782958233.483039,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/production-task-editor-cache.ts": 1782602746.754815,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/protocol-pay-mode-switch.ts": 1785145536.399596,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-resignation-kit-runtime.ts": 1785405017.8343015,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-progress-person-lines.ts": 1785145511.8667505,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-form-create-person.ts": 1785385009.8220263,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/oa-post-select-rule.ts": 1785394334.9268312,
@@ -171,8 +199,8 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/http/error.ts": 1781272556.4091117,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/socket/index.ts": 1781272556.4146817,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/utils/router/sidebar-menu-filter.ts": 1781272556.4163456,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/oa-fc-host/App.vue": 1785382639.7856548,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/oa-fc-host/main.ts": 1785394403.4977336,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/oa-fc-host/App.vue": 1785412925.767365,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/oa-fc-host/main.ts": 1785412925.2420397,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/core/tables/art-table/index.vue": 1782893852.037499,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/core/tables/art-table-header/index.vue": 1782893852.0053234,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/core/forms/art-search-bar/index.vue": 1782893851.915658,
@@ -290,20 +318,28 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/common/decimal-input/index.vue": 1782893851.5090024,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaPostSelect.vue": 1785394386.0894492,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaFlowPreview.vue": 1785392987.9755206,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/oa-condition-fields.ts": 1785394420.3369272,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/oa-condition-fields.ts": 1785401042.1232235,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaPersonSelect.vue": 1785388355.4534001,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaOvertimeKit.vue": 1785404041.649327,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaApprovalPrintSheet.vue": 1785145511.6904423,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaReceiveAccountSelect.vue": 1785391747.3254373,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaLeaveKit.vue": 1785398262.9313874,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaPrintRelatedTree.vue": 1785145511.6928434,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaFcRow.vue": 1785145511.6907504,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaFormDesignerEmbed.vue": 1785145511.6925569,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaRelatedApproval.vue": 1785145511.6944861,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaProgressChain.vue": 1785392987.9652064,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaResignationKit.vue": 1785405000.8028867,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaConfirmationKit.vue": 1785403411.176012,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaOwnerPersonSelect.vue": 1785401010.5990565,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaDeptSelect.vue": 1785382264.265851,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaTripItinerary.vue": 1785489392.2403016,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaMoneyField.vue": 1785382264.3025115,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaFcUpload.vue": 1785145511.6912854,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaOwnerDeptSelect.vue": 1785401021.3290825,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/OaTripKit.vue": 1785412919.2794502,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/flow-tree/FlowBranch.vue": 1785392944.1165543,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/flow-tree/ConditionRuleEditor.vue": 1785394512.7601542,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/flow-tree/ConditionRuleEditor.vue": 1785401148.1066115,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/flow-tree/FlowDesigner.vue": 1785393373.1528535,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/components/oa-approval/flow-tree/types.ts": 1785392938.377587,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/hooks/index.ts": 1781272556.653748,
@@ -342,7 +378,7 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/api/chinaRegion.ts": 1781272556.6606348,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/api/storage-entry-sms-notification.ts": 1781272556.660898,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/api/business.ts": 1781750847.0646322,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/api/admin.ts": 1785210982.7418818,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/api/admin.ts": 1785404979.0600464,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/api/inbound-sample.ts": 1782889889.452178,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/api/ethnic.ts": 1781272556.6658764,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/api/research-donation-sample-collection.ts": 1781272556.6660974,
@@ -417,7 +453,7 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/system/post/index.vue": 1783326448.9210706,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/system/category/index.vue": 1783326448.9218316,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/system/express/index.vue": 1783326448.9225786,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/system/user/index.vue": 1785145511.8814483,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/system/user/index.vue": 1785404991.2602096,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/system/user/detail.vue": 1782893853.853974,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/system/user/modules/user-dialog.vue": 1782893853.9540384,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/system/user/modules/user-search.vue": 1782893853.8827589,
@@ -435,13 +471,13 @@
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/system/dict/index.vue": 1783326448.9326534,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/system/leave/index.vue": 1783326448.934463,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/receive-accounts/index.vue": 1785391037.6431305,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/start/index.vue": 1785393840.5768137,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/start/index.vue": 1785489685.411018,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/roles/index.vue": 1785145511.8723822,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/form-designer-spike/index.vue": 1785145511.870818,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/done/index.vue": 1785145511.870267,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/mine/index.vue": 1785145511.871705,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/designer/index.vue": 1785388029.9553413,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/instances/detail.vue": 1785145511.8713148,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/instances/detail.vue": 1785404089.5762446,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/cc/index.vue": 1785145511.8691218,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/apps/index.vue": 1785383059.156672,
"/Users/wuzilong/work/00code/zkxw/web-admin/src/views/oa-approval/pending/index.vue": 1785145511.8720067,
web-admin/src/api/admin.ts
+12
View File
@@ -833,6 +833,18 @@ export function fetchUpdatePostBoundUsers(postId: string, userIds: string[]) {
})
}
export function fetchPostBoundRoleIds(postId: string) {
return request.get<{ roleIds: string[] }>({ url: `/web/admin/posts/${postId}/roles` })
}
export function fetchUpdatePostBoundRoles(postId: string, roleIds: string[]) {
return request.put({
url: `/web/admin/posts/${postId}/roles`,
params: { roleIds },
showSuccessMessage: true
})
}
// ---------------------------------------------------------------------------
// 物品单位管理
// ---------------------------------------------------------------------------
web-admin/src/api/oaApproval.ts
+7 -69
View File
@@ -2,75 +2,6 @@ import request from '@/utils/http'
const BASE = '/web/admin/oa-approval'
// ---------------------------------------------------------------------------
// 工作流角色
// ---------------------------------------------------------------------------
export function fetchOaRoleList(params?: { keyword?: string; status?: string }) {
return request.get<{ list: any[] }>({
url: `${BASE}/roles`,
params
})
}
export function fetchEnsureOaRolePresets() {
return request.post<{ createdCount: number }>({
url: `${BASE}/roles/ensure-presets`,
showSuccessMessage: true
})
}
export function fetchCreateOaRole(data: {
roleName: string
roleCode: string
status?: string
orderNum?: number
remark?: string
}) {
return request.post({
url: `${BASE}/roles`,
data,
showSuccessMessage: true
})
}
export function fetchUpdateOaRole(
id: string,
data: Partial<{
roleName: string
status: string
orderNum: number
remark: string
}>
) {
return request.put({
url: `${BASE}/roles/${id}`,
data,
showSuccessMessage: true
})
}
export function fetchDeleteOaRole(id: string) {
return request.del({
url: `${BASE}/roles/${id}`,
showSuccessMessage: true
})
}
export function fetchOaRoleUsers(roleId: string) {
return request.get<{ list: any[] }>({
url: `${BASE}/roles/${roleId}/users`
})
}
export function fetchReplaceOaRoleUsers(roleId: string, userIds: string[]) {
return request.put<{ list: any[] }>({
url: `${BASE}/roles/${roleId}/users`,
data: { userIds },
showSuccessMessage: true
})
}
// ---------------------------------------------------------------------------
// 收款账户
// ---------------------------------------------------------------------------
@@ -187,6 +118,13 @@ export function fetchDeleteOaApp(id: string) {
})
}
export function fetchCopyOaApp(id: string) {
return request.post({
url: `${BASE}/apps/${id}/copy`,
showSuccessMessage: true
})
}
export function fetchOaAppDraft(appId: string) {
return request.get<any>({ url: `${BASE}/apps/${appId}/draft` })
}
web-admin/src/components/oa-approval/OaProgressChain.vue
+1 -1
View File
@@ -228,7 +228,7 @@
function resolveSourceText(src: string) {
const map: Record<string, string> = {
users: '指定成员',
oa_roles: '工作流角色',
posts: '职位',
dept_leader: '部门负责人',
direct_supervisor: '直属主管',
supervisor_fallback_dept_leader: '部门负责人（主管回退）',
web-admin/src/components/oa-approval/OaTripItinerary.vue
+89 -76
View File
@@ -83,72 +83,78 @@
/>
</div>
<div class="oa-trip-leg__field">
<label class="oa-trip-leg__label">开始日期</label>
<template v-if="disabled">
<span class="oa-trip-leg__readonly">{{ leg.startDate || '—' }}</span>
</template>
<el-date-picker
v-else
:model-value="leg.startDate || undefined"
type="date"
value-format="YYYY-MM-DD"
placeholder="选择日期"
@update:model-value="(v) => onScheduleChange(idx, 'startDate', v || '')"
/>
</div>
<div class="oa-trip-leg__field">
<label class="oa-trip-leg__label">开始时段</label>
<template v-if="disabled">
<span class="oa-trip-leg__readonly">{{ leg.startHalf || '—' }}</span>
</template>
<el-select
v-else
:model-value="leg.startHalf"
@update:model-value="(v) => onScheduleChange(idx, 'startHalf', String(v || ''))"
>
<el-option
v-for="opt in halfOpts"
:key="opt.value"
:label="opt.label"
:value="opt.value"
<div class="oa-trip-leg__row">
<div class="oa-trip-leg__field oa-trip-leg__field--date">
<label class="oa-trip-leg__label">开始日期</label>
<template v-if="disabled">
<span class="oa-trip-leg__readonly">{{ leg.startDate || '—' }}</span>
</template>
<el-date-picker
v-else
:model-value="leg.startDate || undefined"
type="date"
value-format="YYYY-MM-DD"
placeholder="选择日期"
@update:model-value="(v) => onScheduleChange(idx, 'startDate', v || '')"
/>
</el-select>
</div>
<div class="oa-trip-leg__field oa-trip-leg__field--half">
<label class="oa-trip-leg__label">开始时段</label>
<template v-if="disabled">
<span class="oa-trip-leg__readonly">{{ leg.startHalf || '—' }}</span>
</template>
<el-select
v-else
class="oa-trip-leg__half-select"
:model-value="leg.startHalf"
@update:model-value="(v) => onScheduleChange(idx, 'startHalf', String(v || ''))"
>
<el-option
v-for="opt in halfOpts"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
</div>
</div>
<div class="oa-trip-leg__field">
<label class="oa-trip-leg__label">结束日期</label>
<template v-if="disabled">
<span class="oa-trip-leg__readonly">{{ leg.endDate || '—' }}</span>
</template>
<el-date-picker
v-else
:model-value="leg.endDate || undefined"
type="date"
value-format="YYYY-MM-DD"
placeholder="选择日期"
@update:model-value="(v) => onScheduleChange(idx, 'endDate', v || '')"
/>
</div>
<div class="oa-trip-leg__field">
<label class="oa-trip-leg__label">结束时段</label>
<template v-if="disabled">
<span class="oa-trip-leg__readonly">{{ leg.endHalf || '—' }}</span>
</template>
<el-select
v-else
:model-value="leg.endHalf"
@update:model-value="(v) => onScheduleChange(idx, 'endHalf', String(v || ''))"
>
<el-option
v-for="opt in halfOpts"
:key="opt.value"
:label="opt.label"
:value="opt.value"
<div class="oa-trip-leg__row">
<div class="oa-trip-leg__field oa-trip-leg__field--date">
<label class="oa-trip-leg__label">结束日期</label>
<template v-if="disabled">
<span class="oa-trip-leg__readonly">{{ leg.endDate || '—' }}</span>
</template>
<el-date-picker
v-else
:model-value="leg.endDate || undefined"
type="date"
value-format="YYYY-MM-DD"
placeholder="选择日期"
@update:model-value="(v) => onScheduleChange(idx, 'endDate', v || '')"
/>
</el-select>
</div>
<div class="oa-trip-leg__field oa-trip-leg__field--half">
<label class="oa-trip-leg__label">结束时段</label>
<template v-if="disabled">
<span class="oa-trip-leg__readonly">{{ leg.endHalf || '—' }}</span>
</template>
<el-select
v-else
class="oa-trip-leg__half-select"
:model-value="leg.endHalf"
@update:model-value="(v) => onScheduleChange(idx, 'endHalf', String(v || ''))"
>
<el-option
v-for="opt in halfOpts"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
</div>
</div>
<div class="oa-trip-leg__field oa-trip-leg__field--duration">
@@ -383,16 +389,28 @@
.oa-trip-leg__grid {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 12px 16px;
grid-template-columns: minmax(0, 1fr);
gap: 12px;
}
.oa-trip-leg__row {
display: flex;
gap: 12px;
align-items: flex-start;
min-width: 0;
}
.oa-trip-leg__field {
min-width: 0;
}
.oa-trip-leg__field--duration {
grid-column: 1 / -1;
.oa-trip-leg__field--date {
flex: 1 1 auto;
}
.oa-trip-leg__field--half {
flex: 0 0 120px;
width: 120px;
}
.oa-trip-leg__label {
@@ -443,18 +461,13 @@
max-width: 100%;
}
.oa-trip-leg__half-select {
width: 120px;
max-width: 100%;
}
.oa-trip-leg :deep(.el-input__wrapper),
.oa-trip-leg :deep(.el-select__wrapper) {
min-height: 36px;
}
@media (max-width: 640px) {
.oa-trip-leg__grid {
grid-template-columns: 1fr;
}
.oa-trip-leg__field--duration {
grid-column: auto;
}
}
</style>
web-admin/src/components/oa-approval/flow-tree/FlowDesigner.vue
+97 -122
View File
@@ -156,109 +156,77 @@
</div>
</el-form-item>
<el-form-item v-if="showRolesPicker">
<el-form-item v-if="showPostsPicker">
<template #label>
工作流角色
<span class="form-label-tip">可多选，已选角色成员将作为本节点{{ editing.type === 'cc' ? '抄送' : '审批' }}人</span>
职位
<span class="form-label-tip">可多选，已选职位关联用户将作为本节点{{ editing.type === 'cc' ? '抄送' : '审批' }}人</span>
</template>
<div v-loading="roleLoading" class="member-picker">
<div v-loading="postLoading" class="member-picker">
<el-select
v-model="rolePickBuffer"
v-model="postPickBuffer"
filterable
clearable
:loading="roleLoading"
placeholder="搜索角色名称 / 编码，点击添加"
:loading="postLoading"
placeholder="搜索职位名称 / 编码，点击添加"
style="width: 100%"
popper-class="oa-flow-member-select-popper"
@change="onRolePick"
@change="onPostPick"
>
<el-option-group v-if="presetRoles.length" label="预置">
<el-option
v-for="r in presetRoles"
:key="r.id"
:label="roleOptionLabel(r)"
:value="r.id"
:disabled="(cfg.oaRoleIds || []).includes(r.id)"
>
<div class="member-option">
<span class="member-avatar" :style="{ background: avatarColor(r.id) }">
{{ avatarInitial(r.roleName) }}
<el-option
v-for="p in postOptions"
:key="p.id"
:label="postOptionLabel(p)"
:value="p.id"
:disabled="(cfg.postIds || []).includes(p.id)"
>
<div class="member-option">
<span class="member-avatar" :style="{ background: avatarColor(p.id) }">
{{ avatarInitial(p.postName) }}
</span>
<span class="member-option__meta">
<span class="member-option__name">{{ p.postName || '未命名' }}</span>
<span v-if="p.postCode" class="member-option__sub">
编码 {{ p.postCode }}
</span>
<span class="member-option__meta">
<span class="member-option__name">{{ r.roleName || '未命名' }}</span>
<span v-if="r.roleCode" class="member-option__sub">
编码 {{ r.roleCode }}
</span>
</span>
<el-tag
v-if="(cfg.oaRoleIds || []).includes(r.id)"
size="small"
type="info"
effect="plain"
class="member-option__tag"
>
已选
</el-tag>
</div>
</el-option>
</el-option-group>
<el-option-group v-if="customRoles.length" label="自定义">
<el-option
v-for="r in customRoles"
:key="r.id"
:label="roleOptionLabel(r)"
:value="r.id"
:disabled="(cfg.oaRoleIds || []).includes(r.id)"
>
<div class="member-option">
<span class="member-avatar" :style="{ background: avatarColor(r.id) }">
{{ avatarInitial(r.roleName) }}
</span>
<span class="member-option__meta">
<span class="member-option__name">{{ r.roleName || '未命名' }}</span>
<span v-if="r.roleCode" class="member-option__sub">
编码 {{ r.roleCode }}
</span>
</span>
<el-tag
v-if="(cfg.oaRoleIds || []).includes(r.id)"
size="small"
type="info"
effect="plain"
class="member-option__tag"
>
已选
</el-tag>
</div>
</el-option>
</el-option-group>
</span>
<el-tag
v-if="(cfg.postIds || []).includes(p.id)"
size="small"
type="info"
effect="plain"
class="member-option__tag"
>
已选
</el-tag>
</div>
</el-option>
</el-select>
<div
class="member-chips"
:class="{ 'is-empty': !(cfg.oaRoleIds && cfg.oaRoleIds.length) }"
:class="{ 'is-empty': !(cfg.postIds && cfg.postIds.length) }"
>
<template v-if="cfg.oaRoleIds && cfg.oaRoleIds.length">
<span v-for="id in cfg.oaRoleIds" :key="id" class="member-chip">
<template v-if="cfg.postIds && cfg.postIds.length">
<span v-for="id in cfg.postIds" :key="id" class="member-chip">
<span class="member-avatar member-avatar--sm" :style="{ background: avatarColor(id) }">
{{ avatarInitial(resolveRole(id)?.roleName) }}
{{ avatarInitial(resolvePost(id)?.postName) }}
</span>
<span class="member-chip__name" :title="roleChipTitle(id)">
{{ resolveRole(id)?.roleName || id }}
<span class="member-chip__name" :title="postChipTitle(id)">
{{ resolvePost(id)?.postName || id }}
</span>
<button
type="button"
class="member-chip__rm"
:aria-label="`移除 ${resolveRole(id)?.roleName || id}`"
@click="removeRole(id)"
:aria-label="`移除 ${resolvePost(id)?.postName || id}`"
@click="removePost(id)"
>
×
</button>
</span>
</template>
<template v-else>暂未选择角色，请从上方搜索添加</template>
<template v-else>暂未选择职位，请从上方搜索添加</template>
</div>
<p class="member-picked-count">已选 {{ cfg.oaRoleIds?.length || 0 }} 个角色</p>
<p class="member-picked-count">已选 {{ cfg.postIds?.length || 0 }} 个职位</p>
</div>
</el-form-item>
@@ -330,8 +298,7 @@
import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Plus, Close, Check, UserFilled } from '@element-plus/icons-vue'
import { fetchUserList } from '@/api/admin'
import { fetchOaRoleList } from '@/api/oaApproval'
import { fetchUserList, fetchPostList } from '@/api/admin'
import { MAX_ADMIN_LIST_PAGE_SIZE } from '@/utils/fetch-paged-list'
import type { ConditionCandidate } from '@/components/oa-approval/oa-condition-fields'
import ConditionRuleEditor from './ConditionRuleEditor.vue'
@@ -396,13 +363,13 @@
assigneeType: 'dept_leader',
assigneeTypes: [],
userIds: [],
oaRoleIds: [],
postIds: [],
signMode: 'or'
})
const assigneeTypeOptions: Array<{ label: string; value: AssigneeType }> = [
{ label: '指定成员', value: 'users' },
{ label: '工作流角色', value: 'oa_roles' },
{ label: '职位', value: 'posts' },
{ label: '部门负责人', value: 'dept_leader' },
{ label: '发起人主管', value: 'direct_supervisor' },
{ label: '发起人自选', value: 'initiator_select' }
@@ -412,9 +379,9 @@
if (editing.value?.type === 'cc') return (cfg.assigneeTypes || []).includes('users')
return cfg.assigneeType === 'users'
})
const showRolesPicker = computed(() => {
if (editing.value?.type === 'cc') return (cfg.assigneeTypes || []).includes('oa_roles')
return cfg.assigneeType === 'oa_roles'
const showPostsPicker = computed(() => {
if (editing.value?.type === 'cc') return (cfg.assigneeTypes || []).includes('posts')
return cfg.assigneeType === 'posts'
})
const drawerTitle = computed(() => {
@@ -435,19 +402,13 @@
return '配置流程节点'
})
const roleLoading = ref(false)
const postLoading = ref(false)
const userLoading = ref(false)
const roleOptions = ref<any[]>([])
type PostOption = { id: string; postName: string; postCode: string }
const postOptions = ref<PostOption[]>([])
const userOptions = ref<UserOption[]>([])
const memberPickBuffer = ref('')
const rolePickBuffer = ref('')
const presetRoles = computed(() =>
roleOptions.value.filter((r) => r.roleKind === 'preset' || ['GM', 'CHAIRMAN'].includes(r.roleCode))
)
const customRoles = computed(() =>
roleOptions.value.filter((r) => r.roleKind !== 'preset' && !['GM', 'CHAIRMAN'].includes(r.roleCode))
)
const postPickBuffer = ref('')
function avatarColor(id: string) {
let hash = 0
@@ -464,8 +425,8 @@
return userOptions.value.find((u) => u.id === id)
}
function resolveRole(id: string) {
return roleOptions.value.find((r) => r.id === id)
function resolvePost(id: string) {
return postOptions.value.find((p) => p.id === id)
}
function chipTitle(id: string) {
@@ -473,16 +434,16 @@
return u ? memberOptionLabel(u) : id
}
function roleOptionLabel(r: { roleName?: string; roleCode?: string }) {
const name = (r.roleName || '').trim() || '未命名'
const code = (r.roleCode || '').trim()
function postOptionLabel(p: { postName?: string; postCode?: string }) {
const name = (p.postName || '').trim() || '未命名'
const code = (p.postCode || '').trim()
if (code && code !== name) return `${name}（${code}）`
return name
}
function roleChipTitle(id: string) {
const r = resolveRole(id)
return r ? roleOptionLabel(r) : id
function postChipTitle(id: string) {
const p = resolvePost(id)
return p ? postOptionLabel(p) : id
}
function memberOptionLabel(u: UserOption) {
@@ -514,18 +475,18 @@
cfg.userIds = cfg.userIds.filter((x) => x !== id)
}
function onRolePick(id: string) {
function onPostPick(id: string) {
if (!id) return
if (!cfg.oaRoleIds) cfg.oaRoleIds = []
if (!cfg.oaRoleIds.includes(id)) cfg.oaRoleIds.push(id)
if (!cfg.postIds) cfg.postIds = []
if (!cfg.postIds.includes(id)) cfg.postIds.push(id)
nextTick(() => {
rolePickBuffer.value = ''
postPickBuffer.value = ''
})
}
function removeRole(id: string) {
if (!cfg.oaRoleIds) return
cfg.oaRoleIds = cfg.oaRoleIds.filter((x) => x !== id)
function removePost(id: string) {
if (!cfg.postIds) return
cfg.postIds = cfg.postIds.filter((x) => x !== id)
}
async function setAssigneeType(type: AssigneeType) {
@@ -542,19 +503,33 @@
cfg.assigneeTypes = cur
if (cur[0]) cfg.assigneeType = cur[0]
if (cur.includes('users')) await loadUsers()
if (cur.includes('oa_roles')) await loadRoles()
if (cur.includes('posts')) await loadPosts()
return
}
await setAssigneeType(type)
}
async function loadRoles() {
roleLoading.value = true
async function loadPosts() {
postLoading.value = true
try {
const res = await fetchOaRoleList({ status: '1' })
roleOptions.value = res?.list || []
const pageSize = MAX_ADMIN_LIST_PAGE_SIZE
const raw: any[] = []
let page = 1
for (;;) {
const res = await fetchPostList({ page, pageSize })
const list = (res?.list || []).filter((p: any) => p.status === '1')
raw.push(...list)
if ((res?.list || []).length < pageSize) break
if (typeof res?.total === 'number' && raw.length >= res.total) break
page += 1
}
postOptions.value = raw.map((p) => ({
id: p.id,
postName: p.postName || '',
postCode: p.postCode || ''
}))
} finally {
roleLoading.value = false
postLoading.value = false
}
}
@@ -684,18 +659,18 @@
cfg.assigneeType = ac.assigneeType || 'dept_leader'
}
cfg.userIds = [...(ac.userIds || [])]
cfg.oaRoleIds = [...(ac.oaRoleIds || [])]
cfg.postIds = [...(ac.postIds || [])]
cfg.signMode = ac.signMode || 'or'
memberPickBuffer.value = ''
rolePickBuffer.value = ''
if (showUsersPicker.value) await loadUsers()
if (showRolesPicker.value) await loadRoles()
if (showPostsPicker.value) await loadPosts()
drawerVisible.value = true
}
async function onAssigneeTypeChange() {
if (cfg.assigneeType === 'users' && !userOptions.value.length) await loadUsers()
if (cfg.assigneeType === 'oa_roles' && !roleOptions.value.length) await loadRoles()
if (cfg.assigneeType === 'posts' && !postOptions.value.length) await loadPosts()
}
function onDefaultChange(idx: number, v: boolean) {
@@ -750,21 +725,21 @@
ElMessage.warning('已勾选指定成员，请选择至少一名成员')
return
}
if (types.includes('oa_roles') && !(cfg.oaRoleIds || []).length) {
ElMessage.warning('已勾选工作流角色，请选择至少一个角色')
if (types.includes('posts') && !(cfg.postIds || []).length) {
ElMessage.warning('已勾选职位，请选择至少一个职位')
return
}
live.approverConfig = {
assigneeTypes: types,
assigneeType: types[0],
userIds: [...(cfg.userIds || [])],
oaRoleIds: [...(cfg.oaRoleIds || [])]
postIds: [...(cfg.postIds || [])]
}
} else if (live.type === 'approval') {
live.approverConfig = {
assigneeType: cfg.assigneeType,
userIds: cfg.assigneeType === 'users' ? [...(cfg.userIds || [])] : undefined,
oaRoleIds: cfg.assigneeType === 'oa_roles' ? [...(cfg.oaRoleIds || [])] : undefined,
postIds: cfg.assigneeType === 'posts' ? [...(cfg.postIds || [])] : undefined,
signMode: cfg.signMode || 'or'
}
}
web-admin/src/components/oa-approval/flow-tree/types.ts
+8 -9
View File
@@ -2,7 +2,7 @@ export type FlowNodeType = 'start' | 'approval' | 'cc' | 'condition' | 'end'
export type AssigneeType =
| 'users'
| 'oa_roles'
| 'posts'
| 'dept_leader'
| 'direct_supervisor'
| 'initiator_select'
@@ -13,8 +13,7 @@ export interface ApproverConfig {
/** 抄送人：多选选人方式（优先）。审批人：不使用 */
assigneeTypes?: AssigneeType[]
userIds?: string[]
oaRoleIds?: string[]
oaRoleCodes?: string[]
postIds?: string[]
signMode?: 'or' | 'and'
}
@@ -126,7 +125,7 @@ export function ensureFlowRoot(raw: unknown): FlowNode {
const VALID_ASSIGNEE: AssigneeType[] = [
'users',
'oa_roles',
'posts',
'dept_leader',
'direct_supervisor',
'initiator_select'
@@ -134,7 +133,7 @@ const VALID_ASSIGNEE: AssigneeType[] = [
const ASSIGNEE_LABEL: Record<AssigneeType, string> = {
users: '指定成员',
oa_roles: '工作流角色',
posts: '职位',
dept_leader: '发起人部门负责人',
direct_supervisor: '发起人的主管',
initiator_select: '发起人自选'
@@ -170,8 +169,8 @@ export function summarizeApprover(cfg?: ApproverConfig, nodeType?: FlowNodeType)
const n = cfg?.userIds?.length || 0
return n ? `${base}（${n}人）` : `${base}（未选）`
}
if (t === 'oa_roles') {
const n = (cfg?.oaRoleIds?.length || 0) + (cfg?.oaRoleCodes?.length || 0)
if (t === 'posts') {
const n = cfg?.postIds?.length || 0
return n ? `${base}（已选${n}）` : `${base}（未选）`
}
return base
@@ -185,8 +184,8 @@ export function summarizeApprover(cfg?: ApproverConfig, nodeType?: FlowNodeType)
const n = cfg.userIds?.length || 0
return n ? `${base}（${n}人）` : `${base}（未选）`
}
if (cfg.assigneeType === 'oa_roles') {
const n = (cfg.oaRoleIds?.length || 0) + (cfg.oaRoleCodes?.length || 0)
if (cfg.assigneeType === 'posts') {
const n = cfg.postIds?.length || 0
return n ? `${base}（已选${n}）` : `${base}（未选）`
}
const sign =
web-admin/src/router/modules/sqxp.ts
-11
View File
@@ -1374,17 +1374,6 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
menuCode: 'oa:apps:list'
}
},
{
id: 'OA000000000000000000000000000102',
name: 'OaApprovalRoles',
path: 'roles',
component: '/oa-approval/roles/index',
meta: {
title: '工作流角色',
keepAlive: true,
menuCode: 'oa:roles:list'
}
},
{
id: 'OA000000000000000000000000000108',
name: 'OaApprovalReceiveAccounts',
web-admin/src/utils/oa-confirmation-kit-rule.ts
+1 -1
View File
@@ -161,7 +161,7 @@ function buildConfirmationKitChildren() {
export const confirmationKitDragRule = {
menu: 'kit' as const,
icon: 'icon-user',
icon: 'icon-idcard',
label: '转正',
name: 'confirmationKit',
input: false,
web-admin/src/utils/oa-form-create-confirmation-kit.ts
+2 -8
View File
@@ -1,5 +1,6 @@
import FcDesigner from '@form-create/designer'
import OaConfirmationKit from '@/components/oa-approval/OaConfirmationKit.vue'
import { ensureOaKitMenu } from '@/utils/oa-form-create-kit-menu'
import { confirmationKitDragRule } from '@/utils/oa-confirmation-kit-rule'
const FLAG = '__oaConfirmationKitConfigured'
@@ -9,14 +10,7 @@ export function setupOaConfirmationKit(formCreate?: {
}) {
if ((FcDesigner as any)[FLAG]) return
// kit 菜单可能已由请假套件注册；幂等再调一次无妨
if (typeof FcDesigner.addMenu === 'function') {
try {
FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
} catch {
/* already */
}
}
ensureOaKitMenu()
FcDesigner.component('confirmationKit', OaConfirmationKit)
if (typeof formCreate?.component === 'function') {
web-admin/src/utils/oa-form-create-kit-menu.ts
+16
View File
@@ -0,0 +1,16 @@
import FcDesigner from '@form-create/designer'
const FLAG = '__oaKitMenuConfigured'
/**
* 确保「套件」左侧菜单只注册一次。
* 全局 FcDesigner.addMenu 会无条件 push，多套件各自 addMenu 会导致同名分组重复，
* 进而 appendMenuItem 把每个拖拽规则挂到所有同名分组上（N 套件 × N 分组）。
*/
export function ensureOaKitMenu() {
if ((FcDesigner as any)[FLAG]) return
if (typeof FcDesigner.addMenu === 'function') {
FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
}
;(FcDesigner as any)[FLAG] = true
}
web-admin/src/utils/oa-form-create-leave-kit.ts
+2 -3
View File
@@ -1,5 +1,6 @@
import FcDesigner from '@form-create/designer'
import OaLeaveKit from '@/components/oa-approval/OaLeaveKit.vue'
import { ensureOaKitMenu } from '@/utils/oa-form-create-kit-menu'
import { leaveKitDragRule } from '@/utils/oa-leave-kit-rule'
const FLAG = '__oaLeaveKitConfigured'
@@ -7,9 +8,7 @@ const FLAG = '__oaLeaveKitConfigured'
export function setupOaLeaveKit(formCreate?: { component?: (name: string, c: unknown) => void }) {
if ((FcDesigner as any)[FLAG]) return
if (typeof FcDesigner.addMenu === 'function') {
FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
}
ensureOaKitMenu()
FcDesigner.component('leaveKit', OaLeaveKit)
if (typeof formCreate?.component === 'function') {
web-admin/src/utils/oa-form-create-overtime-kit.ts
+2 -7
View File
@@ -1,5 +1,6 @@
import FcDesigner from '@form-create/designer'
import OaOvertimeKit from '@/components/oa-approval/OaOvertimeKit.vue'
import { ensureOaKitMenu } from '@/utils/oa-form-create-kit-menu'
import { overtimeKitDragRule } from '@/utils/oa-overtime-kit-rule'
const FLAG = '__oaOvertimeKitConfigured'
@@ -7,13 +8,7 @@ const FLAG = '__oaOvertimeKitConfigured'
export function setupOaOvertimeKit(formCreate?: { component?: (name: string, c: unknown) => void }) {
if ((FcDesigner as any)[FLAG]) return
if (typeof FcDesigner.addMenu === 'function') {
try {
FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
} catch {
/* kit menu may already exist */
}
}
ensureOaKitMenu()
FcDesigner.component('overtimeKit', OaOvertimeKit)
if (typeof formCreate?.component === 'function') {
web-admin/src/utils/oa-form-create-resignation-kit.ts
+2 -7
View File
@@ -1,5 +1,6 @@
import FcDesigner from '@form-create/designer'
import OaResignationKit from '@/components/oa-approval/OaResignationKit.vue'
import { ensureOaKitMenu } from '@/utils/oa-form-create-kit-menu'
import { resignationKitDragRule } from '@/utils/oa-resignation-kit-rule'
const FLAG = '__oaResignationKitConfigured'
@@ -9,13 +10,7 @@ export function setupOaResignationKit(formCreate?: {
}) {
if ((FcDesigner as any)[FLAG]) return
if (typeof FcDesigner.addMenu === 'function') {
try {
FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
} catch {
/* already */
}
}
ensureOaKitMenu()
FcDesigner.component('resignationKit', OaResignationKit)
if (typeof formCreate?.component === 'function') {
web-admin/src/utils/oa-form-create-trip-kit.ts
+2 -7
View File
@@ -1,5 +1,6 @@
import FcDesigner from '@form-create/designer'
import OaTripKit from '@/components/oa-approval/OaTripKit.vue'
import { ensureOaKitMenu } from '@/utils/oa-form-create-kit-menu'
import { tripKitDragRule } from '@/utils/oa-trip-kit-rule'
const FLAG = '__oaTripKitConfigured'
@@ -7,13 +8,7 @@ const FLAG = '__oaTripKitConfigured'
export function setupOaTripKit(formCreate?: { component?: (name: string, c: unknown) => void }) {
if ((FcDesigner as any)[FLAG]) return
if (typeof FcDesigner.addMenu === 'function') {
try {
FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
} catch {
/* kit menu may already exist */
}
}
ensureOaKitMenu()
FcDesigner.component('tripKit', OaTripKit)
if (typeof formCreate?.component === 'function') {
web-admin/src/utils/oa-leave-kit-rule.ts
+1 -1
View File
@@ -96,7 +96,7 @@ function buildLeaveKitChildren() {
/** FormCreate Designer DragRule：请假套件 */
export const leaveKitDragRule = {
menu: 'kit' as const,
icon: 'icon-date',
icon: 'icon-askforleave',
label: '请假',
name: 'leaveKit',
input: false,
web-admin/src/utils/oa-overtime-kit-rule.ts
+1 -1
View File
@@ -84,7 +84,7 @@ function buildOvertimeKitChildren() {
/** FormCreate Designer DragRule：加班套件 */
export const overtimeKitDragRule = {
menu: 'kit' as const,
icon: 'icon-date',
icon: 'icon-time',
label: '加班',
name: 'overtimeKit',
input: false,
web-admin/src/utils/oa-overtime-kit-runtime.ts
+83 -3
View File
@@ -1,4 +1,9 @@
/** 加班套件运行时：时长仅手动填写，补齐数字框左对齐 */
/** 加班套件运行时：时长仅手动填写，补齐数字框左对齐；加班人默认当前登录人 */
import {
buildCurrentOwnerPerson,
type OwnerUserSnapshot
} from '@/utils/oa-owner-field-defaults'
function asRules(schema: unknown): Record<string, unknown>[] {
if (Array.isArray(schema)) return schema.filter((r) => r && typeof r === 'object') as any
@@ -11,12 +16,88 @@ function asRules(schema: unknown): Record<string, unknown>[] {
return []
}
function walk(rules: Record<string, unknown>[], out: Record<string, unknown>[]) {
for (const r of rules) {
out.push(r)
if (Array.isArray(r.children)) {
walk(r.children as any, out)
}
const props = r.props as any
if (props && Array.isArray(props.rule)) walk(props.rule, out)
}
}
export type OvertimeKitBinding = {
personField?: string
durationField?: string
}
function resolveBinding(kit: Record<string, unknown>): OvertimeKitBinding {
const props = (kit.props && typeof kit.props === 'object' ? kit.props : {}) as Record<
string,
any
>
let personField = props.personField ? String(props.personField) : undefined
let durationField = props.durationField ? String(props.durationField) : undefined
const children = (
Array.isArray(kit.children)
? kit.children
: Array.isArray(props.rule)
? props.rule
: []
) as Record<string, any>[]
for (const c of children) {
if (!c?.field) continue
const sem = String(c.props?._fc_kit_field || '')
if (sem === 'overtimePerson' && !personField) personField = String(c.field)
if (sem === 'overtimeDuration' && !durationField) durationField = String(c.field)
}
return { personField, durationField }
}
export function listOvertimeKitBindings(schema: unknown): OvertimeKitBinding[] {
const flat: Record<string, unknown>[] = []
walk(asRules(schema), flat)
return flat.filter((r) => String(r.type || '') === 'overtimeKit').map(resolveBinding)
}
function isEmptyPersonValue(raw: unknown): boolean {
if (raw == null || raw === '') return true
if (Array.isArray(raw)) return raw.length === 0
if (typeof raw === 'object') {
const o = raw as Record<string, unknown>
return !String(o.id || '').trim()
}
return false
}
/**
* 发起页：加班人字段为空时写入当前登录人（人员组件为多选，值为数组）。
*/
export function applyOvertimeKitDefaults(
schema: unknown,
formData: Record<string, unknown>,
user: OwnerUserSnapshot | null | undefined
): Record<string, unknown> {
const data = { ...formData }
const person = buildCurrentOwnerPerson(user)
if (!person) return data
for (const kit of listOvertimeKitBindings(schema)) {
const f = kit.personField
if (f && isEmptyPersonValue(data[f])) {
data[f] = [person]
}
}
return data
}
function resolveDurationField(kit: Record<string, unknown>): string | undefined {
const binding = resolveBinding(kit)
if (binding.durationField) return binding.durationField
const props = (kit.props && typeof kit.props === 'object' ? kit.props : {}) as Record<
string,
any
>
if (props.durationField) return String(props.durationField)
const children = (
Array.isArray(kit.children)
? kit.children
@@ -26,7 +107,6 @@ function resolveDurationField(kit: Record<string, unknown>): string | undefined
) as Record<string, any>[]
for (const c of children) {
if (!c?.field) continue
if (String(c.props?._fc_kit_field || '') === 'overtimeDuration') return String(c.field)
const t = String(c.type || '')
if ((t === 'inputNumber' || t === 'number') && String(c.title || '').includes('时长')) {
return String(c.field)
web-admin/src/utils/oa-resignation-kit-rule.ts
+1 -1
View File
@@ -90,7 +90,7 @@ function buildResignationKitChildren() {
export const resignationKitDragRule = {
menu: 'kit' as const,
icon: 'icon-user',
icon: 'icon-transfer',
label: '离职',
name: 'resignationKit',
input: false,
web-admin/src/utils/oa-trip-kit-rule.ts
+1 -1
View File
@@ -124,7 +124,7 @@ function buildTripKitChildren() {
/** FormCreate Designer DragRule：出差套件 */
export const tripKitDragRule = {
menu: 'kit' as const,
icon: 'icon-date',
icon: 'icon-businesstrip',
label: '出差',
name: 'tripKit',
input: false,
web-admin/src/views/oa-approval/apps/index.vue
+12 -1
View File
@@ -103,6 +103,9 @@
<el-dropdown-item command="edit">
<el-icon><Edit /></el-icon>编辑基础
</el-dropdown-item>
<el-dropdown-item command="copy">
<el-icon><CopyDocument /></el-icon>复制
</el-dropdown-item>
<el-dropdown-item command="delete" divided>
<el-icon><Delete /></el-icon>删除
</el-dropdown-item>
@@ -275,10 +278,12 @@
Upload,
Folder,
Search,
Refresh
Refresh,
CopyDocument
} from '@element-plus/icons-vue'
import { fetchUploadAttachment } from '@/api/business'
import {
fetchCopyOaApp,
fetchCreateOaApp,
fetchCreateOaGroup,
fetchDeleteOaApp,
@@ -494,9 +499,15 @@
function onMore(cmd: string, row: any) {
if (cmd === 'publish') handlePublish(row)
if (cmd === 'edit') handleEdit(row)
if (cmd === 'copy') handleCopy(row)
if (cmd === 'delete') handleDelete(row)
}
async function handleCopy(row: any) {
await fetchCopyOaApp(row.id)
await loadData()
}
async function handleDelete(row: any) {
await ElMessageBox.confirm(`确定删除应用「${row.appName}」吗？`, '提示', { type: 'warning' })
await fetchDeleteOaApp(row.id)
web-admin/src/views/oa-approval/roles/index.vue
-767
View File
@@ -1,767 +0,0 @@
<!-- OA 工作流角色（非 sys_role） -->
<!-- eslint-disable vue/no-v-model-argument -->
<template>
<div class="page-container">
<section class="panel">
<div class="panel-top">
<h2 class="title-bar-heading">工作流角色</h2>
</div>
<div class="filter-block">
<el-form :model="searchForm" class="filter-form" @submit.prevent>
<div class="filter-grid">
<el-form-item label="关键词">
<el-input
v-model="searchForm.keyword"
placeholder="角色名称/编码"
clearable
@keyup.enter="handleSearch"
/>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="searchForm.status" placeholder="请选择" clearable>
<el-option label="启用" value="1" />
<el-option label="停用" value="0" />
</el-select>
</el-form-item>
</div>
<div class="filter-actions-row">
<div class="filter-actions-end">
<el-button class="btn-ghost" @click="handleReset">
<el-icon><RefreshLeft /></el-icon>重置
</el-button>
<el-button class="btn-main" type="primary" @click="handleSearch">
<el-icon><Search /></el-icon>搜索
</el-button>
</div>
</div>
</el-form>
</div>
<div class="list-toolbar">
<div class="list-toolbar-row">
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>
新增角色
</el-button>
</div>
</div>
<div class="list-body list-wrap">
<el-table
class="list-table"
:data="tableData"
v-loading="loading"
stripe
row-key="id"
@selection-change="(rows: any[]) => (selectedRows = rows)"
>
<el-table-column type="selection" min-width="55" align="center" header-align="center" />
<el-table-column
type="index"
label="序号"
min-width="68"
align="center"
header-align="center"
/>
<el-table-column
prop="roleName"
label="角色名称"
min-width="140"
align="left"
header-align="left"
/>
<el-table-column
prop="roleCode"
label="编码"
min-width="120"
align="center"
header-align="center"
/>
<el-table-column
prop="roleKind"
label="类型"
min-width="100"
align="center"
header-align="center"
>
<template #default="{ row }">
<el-tag :type="row.roleKind === 'preset' ? 'primary' : 'info'" size="small">
{{ row.roleKind === 'preset' ? '预置' : '自定义' }}
</el-tag>
</template>
</el-table-column>
<el-table-column
prop="memberCount"
label="成员数"
min-width="90"
align="center"
header-align="center"
/>
<el-table-column
prop="status"
label="状态"
min-width="90"
align="center"
header-align="center"
>
<template #default="{ row }">
<el-tag :type="row.status === '1' ? 'success' : 'info'" size="small">
{{ row.status === '1' ? '启用' : '停用' }}
</el-tag>
</template>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
min-width="170"
align="center"
header-align="center"
>
<template #default="{ row }">{{ formatDisplayOrDash(row.createTime) }}</template>
</el-table-column>
<el-table-column
label="操作"
min-width="280"
fixed="right"
align="center"
header-align="center"
>
<template #default="{ row }">
<div style="display: flex; justify-content: center; gap: 8px">
<el-button class="btn-op-item primary" @click="handleMembers(row)">
<el-icon><User /></el-icon>成员
</el-button>
<el-button class="btn-op-item" @click="handleEdit(row)">
<el-icon><Edit /></el-icon>编辑
</el-button>
<el-button
class="btn-op-item"
:disabled="row.roleKind === 'preset'"
@click="handleDelete(row)"
>
<el-icon><Delete /></el-icon>删除
</el-button>
</div>
</template>
</el-table-column>
</el-table>
</div>
<el-dialog
v-model="dialogVisible"
:title="dialogTitle"
width="560px"
class="dialog-form-layout"
align-center
append-to-body
modal-class="protocol-dialog-mask"
destroy-on-close
:close-on-click-modal="false"
>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-position="top"
class="oa-role-dialog-form"
scroll-to-error
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
>
<div class="form-grid-2">
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="formData.roleName" placeholder="如：财务审批" maxlength="100" />
</el-form-item>
<el-form-item label="角色编码" prop="roleCode">
<el-input
v-model="formData.roleCode"
placeholder="如：FINANCE"
maxlength="64"
:disabled="isEdit"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="formData.status" placeholder="请选择">
<el-option label="启用" value="1" />
<el-option label="停用" value="0" />
</el-select>
</el-form-item>
<el-form-item label="备注" class="form-col-span-2">
<el-input v-model="formData.remark" type="textarea" :rows="2" placeholder="可选" />
</el-form-item>
</div>
</el-form>
<template #footer>
<el-button class="btn-ghost" @click="dialogVisible = false">
<el-icon><Close /></el-icon>
取消
</el-button>
<el-button class="btn-main" type="primary" :loading="submitLoading" @click="handleSubmit">
<el-icon><Check /></el-icon>
确定
</el-button>
</template>
</el-dialog>
<el-dialog
v-model="memberVisible"
:title="`成员管理 · ${memberRole?.roleName || ''}`"
width="640px"
class="dialog-form-layout"
align-center
append-to-body
modal-class="protocol-dialog-mask"
destroy-on-close
:close-on-click-modal="false"
>
<el-form label-position="top">
<el-form-item>
<template #label>
绑定用户
<span class="form-label-tip">可多选，已选成员将展示在下方列表</span>
</template>
<div v-loading="memberLoading" class="member-picker">
<el-select
v-model="memberPickBuffer"
filterable
clearable
:loading="memberLoading"
placeholder="搜索姓名 / 工号，点击添加"
style="width: 100%"
popper-class="oa-role-member-select-popper"
@change="onMemberPick"
>
<el-option
v-for="u in userOptions"
:key="u.id"
:label="memberOptionLabel(u)"
:value="u.id"
:disabled="memberUserIds.includes(u.id)"
>
<div class="member-option">
<span class="member-avatar" :style="{ background: avatarColor(u.id) }">
{{ avatarInitial(u.nickName) }}
</span>
<span class="member-option__meta">
<span class="member-option__name">{{ u.nickName || '未命名' }}</span>
<span v-if="memberOptionSub(u)" class="member-option__sub">
{{ memberOptionSub(u) }}
</span>
</span>
<el-tag
v-if="memberUserIds.includes(u.id)"
size="small"
type="info"
effect="plain"
class="member-option__tag"
>
已选
</el-tag>
</div>
</el-option>
</el-select>
<div
class="member-chips"
:class="{ 'is-empty': !memberUserIds.length }"
>
<template v-if="memberUserIds.length">
<span v-for="id in memberUserIds" :key="id" class="member-chip">
<span
class="member-avatar member-avatar--sm"
:style="{ background: avatarColor(id) }"
>
{{ avatarInitial(resolveUser(id)?.nickName) }}
</span>
<span class="member-chip__name" :title="chipTitle(id)">
{{ resolveUser(id)?.nickName || id }}
</span>
<button
type="button"
class="member-chip__rm"
:aria-label="`移除 ${resolveUser(id)?.nickName || id}`"
@click="removeMember(id)"
>
×
</button>
</span>
</template>
<template v-else>暂未选择成员，请从上方搜索添加</template>
</div>
<p class="member-picked-count">已选 {{ memberUserIds.length }} 人</p>
</div>
</el-form-item>
</el-form>
<template #footer>
<el-button class="btn-ghost" @click="memberVisible = false">
<el-icon><Close /></el-icon>
取消
</el-button>
<el-button
class="btn-main"
type="primary"
:loading="memberSubmitLoading"
@click="handleMemberSubmit"
>
<el-icon><Check /></el-icon>
确定
</el-button>
</template>
</el-dialog>
</section>
</div>
</template>
<script setup lang="ts">
import { formatDisplayOrDash } from '@/utils/datetime-display'
import { nextTick, onMounted, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import {
Plus,
Close,
Check,
Edit,
Delete,
User,
RefreshLeft,
Search
} from '@element-plus/icons-vue'
import { fetchUserList } from '@/api/admin'
import {
fetchCreateOaRole,
fetchDeleteOaRole,
fetchOaRoleList,
fetchOaRoleUsers,
fetchReplaceOaRoleUsers,
fetchUpdateOaRole
} from '@/api/oaApproval'
import { MAX_ADMIN_LIST_PAGE_SIZE } from '@/utils/fetch-paged-list'
import { watchDebounced } from '@vueuse/core'
defineOptions({ name: 'OaApprovalRoles' })
const searchForm = reactive({ keyword: '', status: '' })
const tableData = ref<any[]>([])
const selectedRows = ref<any[]>([])
const loading = ref(false)
const dialogVisible = ref(false)
const dialogTitle = ref('新增工作流角色')
const isEdit = ref(false)
const editingId = ref<string | null>(null)
const submitLoading = ref(false)
const formRef = ref()
const formData = reactive({
roleName: '',
roleCode: '',
status: '1',
remark: ''
})
const formRules = {
roleName: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
roleCode: [{ required: true, message: '请输入角色编码', trigger: 'blur' }],
status: [{ required: true, message: '请选择状态', trigger: 'change' }]
}
type UserOption = { id: string; nickName: string; userNo: string }
const AVATAR_COLORS = [
'#059669',
'#0ea5e9',
'#8b5cf6',
'#d97706',
'#ef4444',
'#14b8a6',
'#6366f1',
'#ec4899'
]
const memberVisible = ref(false)
const memberRole = ref<any>(null)
const memberUserIds = ref<string[]>([])
const memberPickBuffer = ref('')
const memberLoading = ref(false)
const memberSubmitLoading = ref(false)
const userOptions = ref<UserOption[]>([])
function avatarColor(id: string) {
let hash = 0
for (let i = 0; i < id.length; i++) hash = (hash * 31 + id.charCodeAt(i)) >>> 0
return AVATAR_COLORS[hash % AVATAR_COLORS.length]
}
function avatarInitial(name?: string) {
const t = (name || '?').trim()
return t ? t.slice(0, 1) : '?'
}
function resolveUser(id: string) {
return userOptions.value.find((u) => u.id === id)
}
function memberOptionLabel(u: UserOption) {
const name = (u.nickName || '').trim() || '未命名'
const no = (u.userNo || '').trim()
if (no && no !== name) return `${name}（${no}）`
return name
}
function memberOptionSub(u: UserOption) {
const name = (u.nickName || '').trim()
const no = (u.userNo || '').trim()
if (!no || no === name) return ''
return `账号 ${no}`
}
function chipTitle(id: string) {
const u = resolveUser(id)
return u ? memberOptionLabel(u) : id
}
function onMemberPick(id: string) {
if (!id) return
if (!memberUserIds.value.includes(id)) {
memberUserIds.value = [...memberUserIds.value, id]
}
nextTick(() => {
memberPickBuffer.value = ''
})
}
function removeMember(id: string) {
memberUserIds.value = memberUserIds.value.filter((x) => x !== id)
}
async function loadData() {
loading.value = true
try {
const res = await fetchOaRoleList({
keyword: searchForm.keyword || undefined,
status: searchForm.status || undefined
})
tableData.value = res?.list || []
} finally {
loading.value = false
}
}
function handleSearch() {
loadData()
}
function handleReset() {
searchForm.keyword = ''
searchForm.status = ''
loadData()
}
function resetForm() {
formData.roleName = ''
formData.roleCode = ''
formData.status = '1'
formData.remark = ''
editingId.value = null
}
function handleAdd() {
isEdit.value = false
dialogTitle.value = '新增工作流角色'
resetForm()
dialogVisible.value = true
formRef.value?.clearValidate?.()
}
function handleEdit(row: any) {
isEdit.value = true
dialogTitle.value = '编辑工作流角色'
editingId.value = row.id
formData.roleName = row.roleName || ''
formData.roleCode = row.roleCode || ''
formData.status = row.status || '1'
formData.remark = row.remark || ''
dialogVisible.value = true
formRef.value?.clearValidate?.()
}
async function handleSubmit() {
await formRef.value?.validate?.()
submitLoading.value = true
try {
if (isEdit.value && editingId.value) {
await fetchUpdateOaRole(editingId.value, {
roleName: formData.roleName.trim(),
status: formData.status,
remark: formData.remark?.trim() || undefined
})
} else {
await fetchCreateOaRole({
roleName: formData.roleName.trim(),
roleCode: formData.roleCode.trim().toUpperCase(),
status: formData.status,
remark: formData.remark?.trim() || undefined
})
}
dialogVisible.value = false
await loadData()
} finally {
submitLoading.value = false
}
}
async function handleDelete(row: any) {
if (row.roleKind === 'preset') {
ElMessage.warning('预置角色不可删除')
return
}
await ElMessageBox.confirm(`确定删除工作流角色「${row.roleName}」吗？`, '提示', {
type: 'warning'
})
await fetchDeleteOaRole(row.id)
await loadData()
}
async function loadUserOptions() {
const pageSize = MAX_ADMIN_LIST_PAGE_SIZE
const raw: any[] = []
let page = 1
for (;;) {
const res = await fetchUserList({ page, pageSize, status: '1' })
const list = res?.list || []
raw.push(...list)
if (list.length < pageSize) break
if (typeof res?.total === 'number' && raw.length >= res.total) break
page += 1
}
userOptions.value = raw.map((u) => ({
id: u.id,
nickName: u.nickName || '',
userNo: u.userNo || ''
}))
}
async function handleMembers(row: any) {
memberRole.value = row
memberPickBuffer.value = ''
memberUserIds.value = []
memberVisible.value = true
memberLoading.value = true
try {
await loadUserOptions()
const res = await fetchOaRoleUsers(row.id)
memberUserIds.value = (res?.list || []).map((x: any) => x.userId)
} finally {
memberLoading.value = false
}
}
async function handleMemberSubmit() {
if (!memberRole.value?.id) return
memberSubmitLoading.value = true
try {
await fetchReplaceOaRoleUsers(memberRole.value.id, memberUserIds.value)
memberVisible.value = false
await loadData()
} finally {
memberSubmitLoading.value = false
}
}
watchDebounced(
searchForm,
() => {
loadData()
},
{ debounce: 300, deep: true }
)
onMounted(() => {
loadData()
})
</script>
<style scoped lang="scss">
.oa-role-dialog-form {
:deep(.el-form-item) {
margin-bottom: 0;
}
}
.member-picker {
width: 100%;
}
.member-chips {
display: flex;
flex-wrap: wrap;
gap: 8px;
min-height: 44px;
margin-top: 12px;
padding: 12px;
background: #f8fafc;
border: 1px dashed #cbd5e1;
border-radius: 8px;
&.is-empty {
align-items: center;
justify-content: center;
color: var(--mint-text-muted, #94a3b8);
font-size: 13px;
}
}
.member-chip {
display: inline-flex;
gap: 8px;
align-items: center;
max-width: 100%;
padding: 4px 8px 4px 4px;
background: #fff;
border: 1px solid var(--mint-border, #e2e8f0);
border-radius: 999px;
}
.member-chip__name {
max-width: 120px;
overflow: hidden;
font-size: 13px;
font-weight: 500;
white-space: nowrap;
text-overflow: ellipsis;
}
.member-chip__rm {
display: grid;
flex-shrink: 0;
place-items: center;
width: 20px;
height: 20px;
padding: 0;
color: var(--mint-text-muted, #64748b);
font-size: 14px;
line-height: 1;
background: #f1f5f9;
border: 0;
border-radius: 50%;
cursor: pointer;
&:hover {
color: #dc2626;
background: #fee2e2;
}
}
.member-picked-count {
margin: 8px 0 0;
color: var(--mint-text-muted, #94a3b8);
font-size: 12px;
}
.member-avatar {
display: inline-flex;
flex-shrink: 0;
align-items: center;
justify-content: center;
width: 36px;
height: 36px;
color: #fff;
font-size: 13px;
font-weight: 700;
line-height: 1;
text-align: center;
border-radius: 50%;
&--sm {
width: 28px;
height: 28px;
font-size: 11px;
}
}
</style>
<!-- 下拉挂 body，须非 scoped -->
<style lang="scss">
.oa-role-member-select-popper {
.el-select-dropdown__list {
padding: 8px;
}
.el-select-dropdown__item {
height: auto !important;
min-height: 56px;
margin-bottom: 8px;
padding: 10px 12px !important;
line-height: normal !important;
border-radius: 8px;
&:last-child {
margin-bottom: 0;
}
&.is-disabled {
opacity: 0.55;
}
&.hover,
&:hover {
background: var(--primary-bg, #ecfdf5);
}
}
.member-option {
display: flex;
gap: 12px;
align-items: center;
width: 100%;
min-height: 36px;
}
.member-option__meta {
display: flex;
flex: 1;
flex-direction: column;
gap: 2px;
justify-content: center;
min-width: 0;
}
.member-option__name {
overflow: hidden;
color: var(--mint-text, #0f172a);
font-size: 13px;
font-weight: 600;
white-space: nowrap;
text-overflow: ellipsis;
}
.member-option__sub {
overflow: hidden;
color: var(--mint-text-muted, #64748b);
font-size: 12px;
white-space: nowrap;
text-overflow: ellipsis;
}
.member-option__tag {
flex-shrink: 0;
margin-left: auto;
}
.member-avatar {
display: inline-flex;
flex-shrink: 0;
align-items: center;
justify-content: center;
width: 36px;
height: 36px;
color: #fff;
font-size: 13px;
font-weight: 700;
line-height: 1;
text-align: center;
border-radius: 50%;
}
}
</style>
web-admin/src/views/oa-approval/start/index.vue
+11 -1
View File
@@ -171,7 +171,7 @@
listLeaveKitBindings,
markLeaveDurationManual
} from '@/utils/oa-leave-kit-runtime'
import { ensureOvertimeKitRuleProps } from '@/utils/oa-overtime-kit-runtime'
import { applyOvertimeKitDefaults, ensureOvertimeKitRuleProps } from '@/utils/oa-overtime-kit-runtime'
import { applyResignationKitDefaults } from '@/utils/oa-resignation-kit-runtime'
import {
applyConfirmationKitDateLinkage,
@@ -395,6 +395,11 @@
data,
(userStore.info || userStore.getUserInfo) as any
)
data = applyOvertimeKitDefaults(
{ rule: formRule.value },
data,
(userStore.info || userStore.getUserInfo) as any
)
const linked = applyConfirmationKitDateLinkage({ rule: formRule.value }, data)
formData.value = linked.data
confirmationKitPrevSnapshot = { ...linked.data }
@@ -635,6 +640,11 @@
{ ...(old?.formDataJson || {}) },
(userStore.info || userStore.getUserInfo) as any
)
formData.value = applyOvertimeKitDefaults(
{ rule: formRule.value },
formData.value,
(userStore.info || userStore.getUserInfo) as any
)
} catch {
/* 预填失败仍可手工填 */
}
web-admin/src/views/operations/storage-facility/index.vue
+6 -8
View File
@@ -404,7 +404,7 @@
</el-form-item>
<el-form-item>
<template #label>
节点编号<span class="form-label-tip">可选，与名称共用序号</span>
节点编号<span class="form-label-tip">编号 = 前缀 + 序号 + 后缀；前缀后缀都空时 = 序号</span>
</template>
<div class="storage-name-compose">
<div class="storage-compose-field storage-compose-field--affix">
@@ -1585,7 +1585,7 @@
nameSuffix: '',
startNum: 1,
endNum: 10,
padWidth: 2,
padWidth: 0,
codePrefix: '',
codeSuffix: '',
nodeType: 'box',
@@ -1619,16 +1619,14 @@
if (count > 200) {
return { count: 0, samples: [] as Array<{ name: string; code: string }> }
}
const genCode = !!(batchChildForm.codePrefix.trim() || batchChildForm.codeSuffix.trim())
const samples: Array<{ name: string; code: string }> = []
const showMax = Math.min(count, 12)
for (let i = 0; i < showMax; i++) {
const num = start + i
const seq = formatBatchSeq(num, batchChildForm.padWidth)
const name = `${batchChildForm.namePrefix}${seq}${batchChildForm.nameSuffix}`.trim()
const code = genCode
? `${batchChildForm.codePrefix}${seq}${batchChildForm.codeSuffix}`.trim()
: ''
// 前缀、后缀都空时，节点编号即为序号（含补零）
const code = `${batchChildForm.codePrefix}${seq}${batchChildForm.codeSuffix}`.trim()
samples.push({ name: name || '（空名称）', code })
}
return { count, samples }
@@ -1685,7 +1683,7 @@
nameSuffix: '',
startNum: 1,
endNum: 10,
padWidth: 2,
padWidth: 0,
codePrefix: '',
codeSuffix: '',
nodeType: data.nodeType === 'facility' ? 'layer' : 'box',
@@ -1739,7 +1737,7 @@
nameSuffix: '',
startNum: 1,
endNum: 10,
padWidth: 2,
padWidth: 0,
codePrefix: '',
codeSuffix: '',
nodeType: 'box',
web-admin/src/views/system/post/index.vue
+124 -5
View File
@@ -103,17 +103,21 @@
</el-table-column>
<el-table-column
label="操作"
min-width="160"
min-width="320"
fixed="right"
align="center"
header-align="center"
>
<template #default="{ row }">
<div style="display: flex; justify-content: center; gap: 8px">
<div style="display: flex; justify-content: center; gap: 8px; flex-wrap: wrap">
<el-button class="btn-op-item primary" @click="handlePostBindUsers(row)">
<el-icon><User /></el-icon>
关联用户
</el-button>
<el-button class="btn-op-item" @click="handlePostBindRoles(row)">
<el-icon><Key /></el-icon>
角色配置
</el-button>
<el-dropdown trigger="hover" @command="(cmd: string) => handleDropdownCommand(cmd, row)">
<el-button class="btn-op-item">
<el-icon><More /></el-icon>
@@ -308,6 +312,58 @@
</template>
</el-dialog>
<!-- 角色配置 -->
<el-dialog
v-model="postRoleDialogVisible"
title="角色配置"
width="560px"
class="dialog-form-layout"
align-center
append-to-body
modal-class="protocol-dialog-mask"
destroy-on-close
:close-on-click-modal="false"
>
<DialogFormBody :loading="postRoleLoading">
<p v-if="postRolePostName" class="post-bind-subtitle">
职位：<strong>{{ postRolePostName }}</strong>
</p>
<el-form label-position="top">
<el-form-item label="关联角色">
<el-select
v-model="postRoleCheckedIds"
multiple
filterable
placeholder="请选择角色"
style="width: 100%"
>
<el-option
v-for="item in postRoleOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
</DialogFormBody>
<template #footer>
<el-button class="btn-ghost" @click="postRoleDialogVisible = false">
<el-icon><Close /></el-icon>
取消
</el-button>
<el-button
class="btn-main"
type="primary"
@click="handlePostRoleSubmit"
:loading="postRoleSubmitLoading"
>
<el-icon><Check /></el-icon>
确定
</el-button>
</template>
</el-dialog>
<SystemViewDialog
v-model:visible="viewVisible"
:title="viewRow?.postName || '职位详情'"
@@ -328,6 +384,7 @@
Close,
Check,
User,
Key,
View,
Edit,
Delete,
@@ -349,7 +406,10 @@
fetchDeptTree,
fetchUserList,
fetchPostBoundUserIds,
fetchUpdatePostBoundUsers
fetchUpdatePostBoundUsers,
fetchPostBoundRoleIds,
fetchUpdatePostBoundRoles,
fetchRoleList
} from '@/api/admin'
defineOptions({ name: 'SystemPost' })
@@ -385,6 +445,7 @@
const viewVisible = ref(false)
const viewRow = ref<Api.Post.PostItem | null>(null)
const viewBoundUserNames = ref<string[]>([])
const viewBoundRoleNames = ref<string[]>([])
const viewSections = computed(() => {
const row = viewRow.value
if (!row) return []
@@ -404,6 +465,12 @@
]
}
]
if (viewBoundRoleNames.value.length > 0) {
sections.push({
title: '关联角色',
fields: [{ label: '已关联角色', value: viewBoundRoleNames.value.join('、'), span: true }]
})
}
if (viewBoundUserNames.value.length > 0) {
sections.push({
title: '关联用户',
@@ -415,16 +482,68 @@
async function handleView(row: Api.Post.PostItem) {
viewRow.value = row
viewBoundUserNames.value = []
viewBoundRoleNames.value = []
viewVisible.value = true
try {
const [boundRes] = await Promise.all([fetchPostBoundUserIds(row.id), fetchDeptTree()])
const [boundRes, roleRes] = await Promise.all([
fetchPostBoundUserIds(row.id),
fetchPostBoundRoleIds(row.id)
])
const roleIds = roleRes?.roleIds || []
if (roleIds.length > 0) {
const roleListRes = await fetchRoleList({ page: 1, pageSize: 100 })
const idToName = new Map(
(roleListRes?.list || []).map((r: any) => [r.id, r.roleName || r.id])
)
viewBoundRoleNames.value = roleIds.map((id: string) => idToName.get(id) || id)
}
const boundIds = boundRes?.userIds || []
if (boundIds.length === 0) return
const users = await fetchAllUsersForPostBind()
const idToName = new Map(users.map((u) => [u.id, u.nickName || u.userNo || u.id]))
viewBoundUserNames.value = boundIds.map((id: string) => idToName.get(id) || id)
} catch (e) {
console.error('加载关联用户失败:', e)
console.error('加载职位关联信息失败:', e)
}
}
// ---- 角色配置弹窗 ----
const postRoleDialogVisible = ref(false)
const postRoleLoading = ref(false)
const postRoleSubmitLoading = ref(false)
const postRolePostId = ref('')
const postRolePostName = ref('')
const postRoleCheckedIds = ref<string[]>([])
const postRoleOptions = ref<Array<{ label: string; value: string }>>([])
async function handlePostBindRoles(row: Api.Post.PostItem) {
postRolePostId.value = row.id
postRolePostName.value = row.postName || row.postCode || ''
postRoleCheckedIds.value = []
postRoleDialogVisible.value = true
postRoleLoading.value = true
try {
const [boundRes, roleListRes] = await Promise.all([
fetchPostBoundRoleIds(row.id),
fetchRoleList({ page: 1, pageSize: 100 })
])
postRoleCheckedIds.value = [...(boundRes?.roleIds || [])]
postRoleOptions.value = (roleListRes?.list || []).map((r: any) => ({
label: r.roleName || r.id,
value: r.id
}))
} finally {
postRoleLoading.value = false
}
}
async function handlePostRoleSubmit() {
postRoleSubmitLoading.value = true
try {
await fetchUpdatePostBoundRoles(postRolePostId.value, [...postRoleCheckedIds.value])
postRoleDialogVisible.value = false
} finally {
postRoleSubmitLoading.value = false
}
}
web-admin/src/views/system/user/index.vue
+51 -4
View File
@@ -361,6 +361,7 @@
<el-select
v-model="formData.roleIds"
multiple
filterable
placeholder="请选择角色"
style="width: 100%"
>
@@ -372,6 +373,22 @@
/>
</el-select>
</el-form-item>
<el-form-item label="职位" style="grid-column: 1 / -1">
<el-select
v-model="formData.postIds"
multiple
filterable
placeholder="请选择职位"
style="width: 100%"
>
<el-option
v-for="item in postOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" style="grid-column: 1 / -1">
<el-input v-model="formData.remark" type="textarea" :rows="2" placeholder="可选" />
</el-form-item>
@@ -426,12 +443,14 @@
fetchDeleteUser,
fetchResetPassword,
fetchDeptTree,
fetchRoleOptions
fetchRoleOptions,
fetchPostList
} from '@/api/admin'
import { buildPathLabelMapFromTreeRoots } from '@/utils/tree-path'
import { resolveUserAvatarFromInfo } from '@/utils/user-avatar'
const roleOptions = ref<Array<{ label: string; value: string }>>([])
const postOptions = ref<Array<{ label: string; value: string }>>([])
async function loadRoleOptions() {
try {
@@ -441,6 +460,18 @@
}
}
async function loadPostOptions() {
try {
const res = await fetchPostList({ page: 1, pageSize: 100 })
postOptions.value = (res?.list || []).map((p) => ({
label: p.postName || p.postCode || p.id,
value: p.id
}))
} catch {
postOptions.value = []
}
}
defineOptions({ name: 'SystemUser' })
const deptKeyword = ref('')
@@ -489,6 +520,15 @@
return labels.length ? labels.join('、') : '—'
}
function formatUserPostDisplay(row: Api.User.UserItem) {
const ids = row.postIds || []
if (!ids.length) return '—'
const labels = ids
.map((id) => postOptions.value.find((o) => o.value === id)?.label)
.filter((name): name is string => Boolean(name))
return labels.length ? labels.join('、') : '—'
}
const searchForm = reactive<{ keyword: string; status: string }>({ keyword: '', status: '' })
const tableData = ref<Api.User.UserItem[]>([])
const selectedRows = ref<Api.User.UserItem[]>([])
@@ -518,7 +558,8 @@
status: '1',
orderNum: 0,
remark: '',
roleIds: [] as string[]
roleIds: [] as string[],
postIds: [] as string[]
})
const supervisorUserOptions = ref<Api.User.UserItem[]>([])
@@ -627,6 +668,7 @@
formData.orderNum = 0
formData.remark = ''
formData.roleIds = []
formData.postIds = []
supervisorUserOptions.value = []
editingId.value = null
}
@@ -667,6 +709,7 @@
formData.orderNum = detail.orderNum ?? 0
formData.remark = detail.remark || ''
formData.roleIds = detail.roleIds ? [...detail.roleIds] : []
formData.postIds = detail.postIds ? [...detail.postIds] : []
if (formData.supervisorUserId) {
await remoteSearchSupervisorUsers(detail.nickName || '')
if (!supervisorUserOptions.value.some((u) => u.id === formData.supervisorUserId)) {
@@ -701,7 +744,8 @@
status: formData.status,
orderNum: formData.orderNum,
remark: formData.remark?.trim() || undefined,
roleIds: [...formData.roleIds]
roleIds: [...formData.roleIds],
postIds: [...formData.postIds]
})
} else {
await fetchCreateUser({
@@ -719,7 +763,8 @@
status: formData.status,
orderNum: formData.orderNum,
remark: formData.remark?.trim() || undefined,
roleIds: formData.roleIds.length ? formData.roleIds : undefined
roleIds: formData.roleIds.length ? formData.roleIds : undefined,
postIds: formData.postIds.length ? formData.postIds : undefined
})
}
dialogVisible.value = false
@@ -838,6 +883,7 @@
tagType: row.status === '1' ? 'success' : 'info'
},
{ label: '角色', value: formatUserRoleDisplay(row), span: true },
{ label: '职位', value: formatUserPostDisplay(row), span: true },
{ label: '创建时间', value: row.createTime },
{ label: '备注', value: row.remark, span: true }
]
@@ -868,6 +914,7 @@
loadDeptTree()
loadData()
loadRoleOptions()
loadPostOptions()
})
</script>
待同步到生产的sql脚本
+56 -405
View File
@@ -1,423 +1,74 @@
-- OA 审批（钉钉交互）增量脚本 — 2026-07-14
-- 执行前请备份；可重复执行时注意 IGNORE 语义（部分语句非幂等）
-- docs/sql/oa_receive_account.sql
CREATE TABLE IF NOT EXISTS `oa_receive_account` (
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
`account_type` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'alipay/personal/corporate',
`account_name` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '户名',
`account_no` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '账号',
`bank_name` varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '银行',
`bank_province` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '省',
`bank_city` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '市',
`bank_branch` varchar(256) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支行',
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记：0-正常 1-已删除',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_ora_tenant` (`tenant_no`,`del_flag`) USING BTREE,
KEY `idx_ora_type` (`tenant_no`,`account_type`,`del_flag`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA收款账户';
-- ---------------------------------------------------------------------------
-- 1. 组织字段：直属主管 / 部门负责人用户 ID
-- ---------------------------------------------------------------------------
ALTER TABLE sys_user
ADD COLUMN supervisor_user_id VARCHAR(64) NULL COMMENT '直属主管用户ID' AFTER dept_id;
ALTER TABLE sys_dept
ADD COLUMN leader_user_id VARCHAR(64) NULL COMMENT '部门负责人用户ID' AFTER status;
-- ---------------------------------------------------------------------------
-- 2. OA 审批核心表
-- ---------------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS oa_app_group (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
group_name VARCHAR(100) NOT NULL COMMENT '分组名称',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_app_group_tenant (tenant_no, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA审批分组';
CREATE TABLE IF NOT EXISTS oa_app (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
group_id VARCHAR(64) NULL COMMENT '分组ID',
app_name VARCHAR(50) NOT NULL COMMENT '表单/应用名称',
icon_url VARCHAR(512) NULL COMMENT '图标',
description VARCHAR(100) NULL COMMENT '表单说明',
initiator_scope VARCHAR(32) NOT NULL DEFAULT 'all' COMMENT '发起范围 all/users',
initiator_user_ids TEXT NULL COMMENT '指定发起人JSON数组',
admin_scope VARCHAR(32) NOT NULL DEFAULT 'all_oa_admin' COMMENT '管理员范围',
admin_user_ids TEXT NULL COMMENT '指定管理员JSON数组',
status CHAR(1) NOT NULL DEFAULT '1' COMMENT '1启用 0停用',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_app_tenant (tenant_no, del_flag),
KEY idx_oa_app_group (group_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA审批应用';
CREATE TABLE IF NOT EXISTS oa_app_version (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
app_id VARCHAR(64) NOT NULL COMMENT '应用ID',
version_no INT NOT NULL COMMENT '版本号',
status VARCHAR(16) NOT NULL DEFAULT 'draft' COMMENT 'draft/published',
is_latest_published CHAR(1) NOT NULL DEFAULT '0' COMMENT '是否最新已发布',
form_schema_json LONGTEXT NULL COMMENT '表单Schema JSON',
flow_tree_json LONGTEXT NULL COMMENT '流程树 JSON',
advanced_settings_json TEXT NULL COMMENT '高级设置 JSON',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_app_ver_app (app_id, status, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA审批应用版本';
CREATE TABLE IF NOT EXISTS oa_role (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
role_name VARCHAR(100) NOT NULL COMMENT '角色名称',
role_code VARCHAR(64) NOT NULL COMMENT '角色编码',
role_kind VARCHAR(16) NOT NULL DEFAULT 'custom' COMMENT 'custom/preset',
status CHAR(1) NOT NULL DEFAULT '1' COMMENT '1启用 0停用',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
UNIQUE KEY uk_oa_role_tenant_code (tenant_no, role_code, del_flag),
KEY idx_oa_role_tenant (tenant_no, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA工作流角色';
CREATE TABLE IF NOT EXISTS oa_role_user (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
oa_role_id VARCHAR(64) NOT NULL COMMENT '工作流角色ID',
user_id VARCHAR(64) NOT NULL COMMENT '用户ID',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_role_user_role (oa_role_id, del_flag),
KEY idx_oa_role_user_user (user_id, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA工作流角色成员';
CREATE TABLE IF NOT EXISTS oa_instance (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
app_id VARCHAR(64) NOT NULL COMMENT '应用ID',
app_version_id VARCHAR(64) NOT NULL COMMENT '锁定的已发布版本ID',
title VARCHAR(200) NULL COMMENT '实例标题',
initiator_user_id VARCHAR(64) NOT NULL COMMENT '发起人',
initiator_dept_id VARCHAR(64) NULL COMMENT '发起人部门',
form_data_json LONGTEXT NULL COMMENT '表单数据 JSON',
status VARCHAR(32) NOT NULL DEFAULT 'running' COMMENT 'running/completed/rejected/cancelled',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_inst_tenant (tenant_no, del_flag),
KEY idx_oa_inst_initiator (initiator_user_id, status),
KEY idx_oa_inst_app (app_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA审批实例';
CREATE TABLE IF NOT EXISTS oa_task (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
instance_id VARCHAR(64) NOT NULL COMMENT '实例ID',
node_key VARCHAR(64) NULL COMMENT '节点key',
node_name VARCHAR(200) NULL COMMENT '节点名称',
task_type VARCHAR(16) NOT NULL DEFAULT 'approval' COMMENT 'approval/cc',
assignee_user_id VARCHAR(64) NOT NULL COMMENT '处理人',
status VARCHAR(32) NOT NULL DEFAULT 'pending' COMMENT 'pending/approved/rejected/done',
comment_text VARCHAR(512) NULL COMMENT '意见',
resolve_source VARCHAR(64) NULL COMMENT '解析来源如 supervisor_fallback_dept_leader',
sign_mode VARCHAR(8) NULL COMMENT 'or/and',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_task_assignee (assignee_user_id, status, del_flag),
KEY idx_oa_task_instance (instance_id, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA审批任务';
CREATE TABLE IF NOT EXISTS oa_relation (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
from_instance_id VARCHAR(64) NOT NULL COMMENT '本实例ID',
to_instance_id VARCHAR(64) NOT NULL COMMENT '被关联实例ID',
field_key VARCHAR(64) NULL COMMENT '表单字段key',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_rel_from (from_instance_id, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA关联审批';
-- 预置工作流角色（按租户手工或应用启动 ensure；此处示例 zkxw）
-- INSERT 由后端 ensure_presets 幂等完成，避免 UUID 硬编码冲突
-- ---------------------------------------------------------------------------
-- 3. 菜单说明
-- ---------------------------------------------------------------------------
-- 侧栏路由已写入：
-- - web-admin/src/router/modules/sqxp.ts
-- - backend/app/api/menu.py（STATIC_MENU_TREE）
-- 角色权限用的 sys_menu 注册见：
-- docs/sql/patch_2026-07-15_oa_approval_sys_menu.sql
-- （含 OA审批 节点插入，以及旧「工作流管理」伪删除）
-- =============================================================================
-- OA 审批菜单注册 + 旧「工作流管理」伪删除
-- 日期：2026-07-15
-- 说明：
-- 1. 在「系统管理」顶级（TOP...00005）下注册「OA审批」及三级页面菜单，
-- id / path / component / perms 与 web-admin sqxp.ts、backend menu.py 对齐。
-- 2. 伪删除旧「工作流管理」二级及其三级菜单（OA 已替代），并清理角色菜单关联。
-- =============================================================================
SET NAMES utf8mb4;
-- ---------------------------------------------------------------------------
-- 1. 伪删除旧「工作流管理」及其子菜单
-- ---------------------------------------------------------------------------
UPDATE `sys_menu`
SET `del_flag` = 1,
`update_time` = NOW()
WHERE `del_flag` = 0
AND (
`id` = 'WKF00000000000000000000000000001'
OR `parent_id` = 'WKF00000000000000000000000000001'
OR `id` IN (
'10000000000000000000000000000wf01',
'10000000000000000000000000000wf02',
'10000000000000000000000000000wf03',
'10000000000000000000000000000wf04',
'10000000000000000000000000000wf05'
)
);
DELETE FROM `sys_role_menu`
WHERE `menu_id` IN (
'WKF00000000000000000000000000001',
'10000000000000000000000000000wf01',
'10000000000000000000000000000wf02',
'10000000000000000000000000000wf03',
'10000000000000000000000000000wf04',
'10000000000000000000000000000wf05'
);
-- ---------------------------------------------------------------------------
-- 2. 注册「OA审批」二级目录（挂在系统管理顶级下）
-- ---------------------------------------------------------------------------
INSERT INTO `sys_menu` (
`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`,
`is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`,
`create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
)
SELECT
'OA000000000000000000000000000001', 'OA审批', 'TOP00000000000000000000000000005', 'M',
'oa-approval', NULL, NULL,
1, '1', '1', 'zkxw', 2, '钉钉式 OA 审批（替代旧工作流管理）',
) SELECT
'OA000000000000000000000000000108', '收款账户管理', 'OA000000000000000000000000000001',
'C', 'receive-accounts', '/oa-approval/receive-accounts/index', 'oa:receive-accounts:list',
1, '1', '1', 'zkxw', 10, 'OA收款账户主数据',
NULL, '', NOW(), NULL, NOW(), 0
FROM DUAL
WHERE NOT EXISTS (
SELECT 1 FROM `sys_menu` WHERE `id` = 'OA000000000000000000000000000001'
SELECT 1 FROM `sys_menu` WHERE `id` = 'OA000000000000000000000000000108' AND `del_flag` = 0
);
-- 若曾假删过同 id，则恢复
UPDATE `sys_menu`
SET `del_flag` = 0,
`menu_name` = 'OA审批',
`parent_id` = 'TOP00000000000000000000000000005',
`menu_type` = 'M',
`path` = 'oa-approval',
`component` = NULL,
`perms` = NULL,
`visible` = '1',
`status` = '1',
`order_num` = 2,
`update_time` = NOW()
WHERE `id` = 'OA000000000000000000000000000001';
-- docs/sql/sys_post_role.sql
-- 职位-角色关联：职位可绑定多个角色，用户经职位继承角色权限（与直接角色取并集）
CREATE TABLE IF NOT EXISTS `sys_post_role` (
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
`post_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '职位ID',
`role_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '角色ID',
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记：0-正常 1-已删除',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_spr_post` (`tenant_no`,`post_id`,`del_flag`) USING BTREE,
KEY `idx_spr_role` (`tenant_no`,`role_id`,`del_flag`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='职位-角色关联';
-- ---------------------------------------------------------------------------
-- 3. 注册 OA 三级菜单（可见页 + 隐藏详情/设计页）
-- ---------------------------------------------------------------------------
INSERT INTO `sys_menu` (
`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`,
`is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`,
`create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
)
SELECT * FROM (
SELECT 'OA000000000000000000000000000101' AS id, '审批管理' AS menu_name,
'OA000000000000000000000000000001' AS parent_id, 'C' AS menu_type,
'apps' AS path, '/oa-approval/apps/index' AS component, 'oa:apps:list' AS perms,
1 AS is_frame, '1' AS visible, '1' AS status, 'zkxw' AS tenant_no, 1 AS order_num,
NULL AS remark, NULL AS create_by, '' AS create_dept_id, NOW() AS create_time,
NULL AS update_by, NOW() AS update_time, 0 AS del_flag
UNION ALL
SELECT 'OA000000000000000000000000000102', '工作流角色',
'OA000000000000000000000000000001', 'C',
'roles', '/oa-approval/roles/index', 'oa:roles:list',
1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000103', '发起审批',
'OA000000000000000000000000000001', 'C',
'start', '/oa-approval/start/index', 'oa:start',
1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000104', '待办中心',
'OA000000000000000000000000000001', 'C',
'pending', '/oa-approval/pending/index', 'oa:pending',
1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000105', '已办中心',
'OA000000000000000000000000000001', 'C',
'done', '/oa-approval/done/index', 'oa:done',
1, '1', '1', 'zkxw', 5, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000106', '我发起的',
'OA000000000000000000000000000001', 'C',
'mine', '/oa-approval/mine/index', 'oa:mine',
1, '1', '1', 'zkxw', 6, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000107', '抄送我的',
'OA000000000000000000000000000001', 'C',
'cc', '/oa-approval/cc/index', 'oa:cc',
1, '1', '1', 'zkxw', 7, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000201', '审批设计',
'OA000000000000000000000000000001', 'C',
'designer/:id', '/oa-approval/designer/index', 'oa:designer',
1, '0', '1', 'zkxw', 8, '隐藏页：从审批管理进入', NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000202', '审批详情',
'OA000000000000000000000000000001', 'C',
'instances/:id', '/oa-approval/instances/detail', 'oa:instance:detail',
1, '0', '1', 'zkxw', 9, '隐藏页：从任务/列表进入', NULL, '', NOW(), NULL, NOW(), 0
) AS t
WHERE NOT EXISTS (
SELECT 1 FROM `sys_menu` m WHERE m.`id` = t.id
);
-- 幂等：已存在则同步字段并取消伪删除
UPDATE `sys_menu` m
JOIN (
SELECT 'OA000000000000000000000000000101' AS id, '审批管理' AS menu_name, 'apps' AS path,
'/oa-approval/apps/index' AS component, 'oa:apps:list' AS perms, '1' AS visible, 1 AS order_num
UNION ALL SELECT 'OA000000000000000000000000000102', '工作流角色', 'roles', '/oa-approval/roles/index', 'oa:roles:list', '1', 2
UNION ALL SELECT 'OA000000000000000000000000000103', '发起审批', 'start', '/oa-approval/start/index', 'oa:start', '1', 3
UNION ALL SELECT 'OA000000000000000000000000000104', '待办中心', 'pending', '/oa-approval/pending/index', 'oa:pending', '1', 4
UNION ALL SELECT 'OA000000000000000000000000000105', '已办中心', 'done', '/oa-approval/done/index', 'oa:done', '1', 5
UNION ALL SELECT 'OA000000000000000000000000000106', '我发起的', 'mine', '/oa-approval/mine/index', 'oa:mine', '1', 6
UNION ALL SELECT 'OA000000000000000000000000000107', '抄送我的', 'cc', '/oa-approval/cc/index', 'oa:cc', '1', 7
UNION ALL SELECT 'OA000000000000000000000000000201', '审批设计', 'designer/:id', '/oa-approval/designer/index', 'oa:designer', '0', 8
UNION ALL SELECT 'OA000000000000000000000000000202', '审批详情', 'instances/:id', '/oa-approval/instances/detail', 'oa:instance:detail', '0', 9
) s ON m.id = s.id
SET m.`del_flag` = 0,
m.`parent_id` = 'OA000000000000000000000000000001',
m.`menu_type` = 'C',
m.`menu_name` = s.menu_name,
m.`path` = s.path,
m.`component` = s.component,
m.`perms` = s.perms,
m.`visible` = s.visible,
m.`status` = '1',
m.`order_num` = s.order_num,
m.`update_time` = NOW();
-- docs/sql/sys_user_hire_probation.sql
-- 用户表补齐入职日期、试用期月数（转正套件主数据）
ALTER TABLE `sys_user`
ADD COLUMN `hire_date` date DEFAULT NULL COMMENT '入职日期' AFTER `phone_no`,
ADD COLUMN `probation_months` int(11) DEFAULT NULL COMMENT '试用期月数' AFTER `hire_date`;
-- OA 审批菜单重命名：待处理 → 待办中心，已处理 → 已办中心
-- 已执行过 patch_2026-07-15_oa_approval_sys_menu.sql 的环境可单独跑本脚本。
UPDATE `sys_menu`
SET `menu_name` = '待办中心',
`update_time` = NOW()
WHERE `id` = 'OA000000000000000000000000000104'
AND `del_flag` = 0;
UPDATE `sys_menu`
SET `menu_name` = '已办中心',
`update_time` = NOW()
WHERE `id` = 'OA000000000000000000000000000105'
AND `del_flag` = 0;
-- docs/sql/sys_user_last_work_day.sql
-- 用户表补齐最后工作日（离职套件主数据）
ALTER TABLE `sys_user`
ADD COLUMN `last_work_day` date DEFAULT NULL COMMENT '最后工作日' AFTER `probation_months`;
-- OA 审批进度多轮 + 打回 + 撤销重提关联
-- MySQL 5.7 / utf8mb4
ALTER TABLE oa_instance
ADD COLUMN source_instance_id VARCHAR(64) NULL COMMENT '撤销重提所关联的原实例ID' AFTER status,
ADD COLUMN current_round INT NOT NULL DEFAULT 1 COMMENT '当前提交轮次，从1起' AFTER source_instance_id;
-- status 语义：running / returned / completed / rejected / cancelled
-- returned = 已打回，待发起人修改再提交
ALTER TABLE oa_task
ADD COLUMN round_no INT NOT NULL DEFAULT 1 COMMENT '所属提交轮次' AFTER sign_mode;
CREATE TABLE IF NOT EXISTS oa_instance_event (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
instance_id VARCHAR(64) NOT NULL COMMENT '实例ID',
round_no INT NOT NULL DEFAULT 1 COMMENT '轮次',
event_type VARCHAR(32) NOT NULL COMMENT 'submit/return/withdraw/complete/reject_end',
actor_user_id VARCHAR(64) NULL COMMENT '操作人',
task_id VARCHAR(64) NULL COMMENT '关联任务（打回时）',
node_key VARCHAR(64) NULL COMMENT '节点key',
comment_text VARCHAR(512) NULL COMMENT '意见',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_evt_inst (instance_id, del_flag, create_time)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA实例操作事件（进度轴）';
-- ---------------------------------------------------------------------------
-- OA 表排序规则对齐 sys_user（utf8mb4_unicode_ci）— 2026-07-17
-- 修复：成员弹窗 JOIN oa_role_user / sys_user 报 Illegal mix of collations
-- ---------------------------------------------------------------------------
ALTER TABLE oa_app_group CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
ALTER TABLE oa_app CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
ALTER TABLE oa_app_version CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
ALTER TABLE oa_role CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
ALTER TABLE oa_role_user CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
ALTER TABLE oa_instance CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
ALTER TABLE oa_task CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
ALTER TABLE oa_relation CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
ALTER TABLE oa_instance_event CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;