diff --git a/docs/superpowers/plans/2026-07-30-oa-confirmation-kit.md b/docs/superpowers/plans/2026-07-30-oa-confirmation-kit.md index 6923a7bc..89ee5d5f 100644 --- a/docs/superpowers/plans/2026-07-30-oa-confirmation-kit.md +++ b/docs/superpowers/plans/2026-07-30-oa-confirmation-kit.md @@ -1,6 +1,8 @@ # OA Confirmation Kit(转正套件)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. +> +> **Status:** Tasks 1–6 implemented on `master` (2026-07-30). **Goal:** 补齐用户入职日期/试用期主数据;在审批套件 Tab 增加转正套件(9 子字段、可显隐、发起默认、转正日联动);审批全部通过后回写发起人六项主数据。 diff --git a/docs/superpowers/specs/2026-07-30-oa-confirmation-kit-design.md b/docs/superpowers/specs/2026-07-30-oa-confirmation-kit-design.md index 07378173..0f6f0408 100644 --- a/docs/superpowers/specs/2026-07-30-oa-confirmation-kit-design.md +++ b/docs/superpowers/specs/2026-07-30-oa-confirmation-kit-design.md @@ -1,7 +1,7 @@ # OA 表单设计 · 转正套件(Confirmation Kit)设计文档 **日期**: 2026-07-30 -**状态**: 待实现 +**状态**: 已实现(计划见 `docs/superpowers/plans/2026-07-30-oa-confirmation-kit.md`) **范围**: `web-admin` 用户管理主数据补齐;审批设计器「套件」Tab 转正套件;发起/详情运行时默认与联动;`backend` 审批通过后回写发起人 `sys_user` **界面模式**: 对齐请假套件与 FormCreate 控件库;视觉 Fresh Mint **前置**: diff --git a/web-admin/src/utils/oa-approval-print.ts b/web-admin/src/utils/oa-approval-print.ts index ed157add..faee5104 100644 --- a/web-admin/src/utils/oa-approval-print.ts +++ b/web-admin/src/utils/oa-approval-print.ts @@ -95,7 +95,9 @@ const SKIP_RULE_TYPES = new Set([ 'space', 'divider', 'html', - 'vanCellGroup' + 'vanCellGroup', + 'leaveKit', + 'confirmationKit' ]) export function resolveStamp(status: string | undefined | null): { @@ -243,13 +245,13 @@ async function walkRules( continue } - if (type === 'dept') { + if (type === 'dept' || type === 'ownerDept') { const text = formatDeptDisplay(value) out.push({ label, text: text || '-' }) continue } - if (type === 'person') { + if (type === 'person' || type === 'ownerPerson') { const text = formatPersonDisplay(value) out.push({ label, text: text || '-' }) continue