diff --git a/client/src/api/apOperations.ts b/client/src/api/apOperations.ts index 4277e65e..ce3ccc80 100644 --- a/client/src/api/apOperations.ts +++ b/client/src/api/apOperations.ts @@ -74,6 +74,7 @@ export type FinanceLedgerItem = { owner: { id: string; employeeNo: string; name: string } | null; submitter: { id: string; employeeNo: string; name: string } | null; department: { id: string; name: string } | null; + project: { id: string; projectNo: string | null; name: string } | null; payment: { status: FinanceLedgerPaymentStatus; paymentVoucherNo: string | null; diff --git a/client/src/pages/ApOperationsPage.tsx b/client/src/pages/ApOperationsPage.tsx index 821573fc..5b0af12b 100644 --- a/client/src/pages/ApOperationsPage.tsx +++ b/client/src/pages/ApOperationsPage.tsx @@ -760,7 +760,7 @@ export function ApOperationsPage() {
搜索
{ setLedgerSearch(event.target.value); @@ -793,6 +793,7 @@ export function ApOperationsPage() { 报销单 申请人 / 部门 + 项目 金额 审批状态 付款状态 @@ -813,6 +814,10 @@ export function ApOperationsPage() {
{item.owner?.name ?? item.submitter?.name ?? "-"}
{item.department?.name ?? "-"}
+ +
{item.project?.name ?? "-"}
+
{item.project?.projectNo ?? "未关联项目"}
+ {item.totalAmount} @@ -851,7 +856,7 @@ export function ApOperationsPage() { )) ) : ( - + 当前筛选下暂无财务台账记录。 diff --git a/client/tests/e2e/biz8-ap-ledger-project.spec.ts b/client/tests/e2e/biz8-ap-ledger-project.spec.ts new file mode 100644 index 00000000..fbbca49f --- /dev/null +++ b/client/tests/e2e/biz8-ap-ledger-project.spec.ts @@ -0,0 +1,225 @@ +import { expect, test, type Page, type Route } from "@playwright/test"; + +function envelope(data: unknown) { + return { requestId: "mock-biz8-ap-ledger-project", data }; +} + +async function fulfillJson(route: Route, data: unknown, status = 200) { + await route.fulfill({ + status, + contentType: "application/json", + body: JSON.stringify(envelope(data)), + }); +} + +const financeMe = { + id: "employee-biz8-finance", + employeeNo: "F-BIZ8", + name: "测试财务", + phone: "13800000000", + email: "finance@hyinda.com", + departmentId: "dept-finance", + directManagerId: null, + status: "active", + notificationPushEnabled: true, + roleCodes: ["finance"], + profileCompleteness: { + hasEmergencyContact: true, + hasBankAccount: true, + hasAvatar: false, + hasIdNumber: false, + score: 60, + }, + wecomBinding: null, +}; + +function navigationItem(key: string, href: string, label: string, icon: string) { + return { key, href, label, icon, placement: "main", permissionCodes: [], featureFlagKey: null }; +} + +function financeLedgerItem() { + return { + id: "reimbursement-biz8-project", + formNumber: "BX20260513001", + reimbursementDate: "2026-05-13", + status: "approved", + totalAmount: "1688.00", + description: "项目差旅报销", + owner: { id: "employee-biz8-owner", employeeNo: "E-BIZ8", name: "测试员工" }, + submitter: { id: "employee-biz8-owner", employeeNo: "E-BIZ8", name: "测试员工" }, + department: { id: "dept-rd", name: "研发部" }, + project: { id: "project-biz8", projectNo: "PJ-2026-001", name: "交付项目" }, + payment: { + status: "unpaid", + paymentVoucherNo: null, + paymentDate: null, + paymentChannel: null, + paidAt: null, + paidBy: null, + }, + invoice: { + status: "bound", + counts: { + total: 2, + pendingOcr: 0, + ocrFailed: 0, + available: 0, + bound: 2, + archived: 0, + usedComplete: 0, + }, + }, + attachmentCount: 1, + createdAt: "2026-05-13T08:00:00.000Z", + updatedAt: "2026-05-13T09:00:00.000Z", + }; +} + +async function mockApis(page: Page, ledgerQueries: string[]) { + await page.route((url) => url.pathname.startsWith("/api/"), async (route) => { + const request = route.request(); + const url = new URL(request.url()); + const path = url.pathname; + + if (path === "/api/auth/sso/providers") { + await fulfillJson(route, []); + return; + } + + if (path === "/api/auth/wecom/config") { + await fulfillJson(route, { + enabled: false, + entryEnabled: false, + oauthEnabled: false, + corpId: "", + agentId: "", + loginUrl: null, + bindEnabled: false, + defaultReturnTo: "/portal", + status: "disabled", + statusReasons: [], + }); + return; + } + + if (path === "/api/auth/login" || path === "/api/auth/refresh") { + await route.fulfill({ + status: 200, + contentType: "application/json", + headers: { "set-cookie": "has_session=1; Path=/; SameSite=Lax" }, + body: JSON.stringify(envelope({ accessToken: "mock-biz8-token", expiresIn: 900, mustChangePassword: false })), + }); + return; + } + + if (path === "/api/me") { + await fulfillJson(route, financeMe); + return; + } + + if (path === "/api/system/navigation") { + await fulfillJson(route, { + workspace: { + id: "workspace-biz8", + persisted: true, + profile: "small_team_internal", + orgMode: "single_company", + primaryEntryMode: "password", + notificationStrategy: "in_app", + devicePriority: "desktop", + moduleVisibility: {}, + createdAt: null, + updatedAt: null, + updatedBy: null, + }, + sections: { + main: [navigationItem("portal", "/portal", "工作台", "home_app_logo")], + admin: [], + backup: [navigationItem("ap", "/ap-operations", "AP 运营", "account_balance_wallet")], + }, + }); + return; + } + + if (path === "/api/portal") { + await fulfillJson(route, { + me: financeMe, + workspace: null, + navigation: [], + cards: [], + pendingTasks: { count: 0, href: "/workflow/tasks" }, + notifications: [], + quickLinks: [], + projectSummary: null, + riskSummary: null, + recentActivities: [], + }); + return; + } + + if (path === "/api/ap-operations") { + await fulfillJson(route, { + summary: { + pendingPaymentCount: 0, + partialMatchCount: 0, + exceptionCount: 0, + budgetOverspendCount: 0, + }, + pendingPaymentBatches: [], + failedPaymentBatchItems: [], + exceptionRiskFlags: [], + budgetOverspendRisks: [], + partialMatchItems: [], + }); + return; + } + + if (path === "/api/ap-operations/reimbursement-ledger") { + ledgerQueries.push(url.searchParams.get("q") ?? ""); + await fulfillJson(route, { + page: 1, + pageSize: 20, + total: 1, + items: [financeLedgerItem()], + }); + return; + } + + if (path === "/api/payment-batches") { + await fulfillJson(route, { items: [] }); + return; + } + + if (path === "/api/risk-flags") { + await fulfillJson(route, { items: [] }); + return; + } + + await fulfillJson(route, { message: `unhandled mock api: ${path}` }, 404); + }); +} + +async function loginAsFinance(page: Page) { + await page.goto("/login"); + const accountLoginButton = page.getByRole("button", { name: "使用账号密码登录" }); + if (await accountLoginButton.isVisible({ timeout: 1_000 }).catch(() => false)) { + await accountLoginButton.click(); + } + await page.getByTestId("login-identifier").fill("finance@hyinda.com"); + await page.getByTestId("login-password").fill("password"); + await page.getByTestId("login-submit").click(); + await page.waitForURL(/\/portal/, { timeout: 30_000 }); +} + +test("BIZ8 AP 财务台账展示项目并支持项目关键字搜索", async ({ page }) => { + const ledgerQueries: string[] = []; + await mockApis(page, ledgerQueries); + await loginAsFinance(page); + + await page.goto("/ap-operations"); + await expect(page.getByTestId("finance-ledger-table")).toContainText("交付项目"); + await expect(page.getByTestId("finance-ledger-table")).toContainText("PJ-2026-001"); + + await page.getByPlaceholder("单号、姓名、部门、项目").fill("PJ-2026-001"); + await expect.poll(() => ledgerQueries).toContain("PJ-2026-001"); +}); diff --git a/issues/2026-05-13_18-23-53-biz8-finance-ocr-project.csv b/issues/2026-05-13_18-23-53-biz8-finance-ocr-project.csv index eafb3fb2..08b84737 100644 --- a/issues/2026-05-13_18-23-53-biz8-finance-ocr-project.csv +++ b/issues/2026-05-13_18-23-53-biz8-finance-ocr-project.csv @@ -7,8 +7,8 @@ BIZ8-4,样票脱敏和授权规则,"定义真实 OCR 和批量回归所需样票 BIZ8-5,批量样票回归设计,"设计 OCR 批量样票回归，区分 mock、真实 provider、pending OCR 和失败重试。","1) mock 与真实 provider 结论分离；2) pending OCR 不等于失败或通过；3) 阈值和样本数清楚；4) 失败有复核路径。","流程级验证：node scripts/qa/check-pending-ocr.mjs --thresholds=2,5,10；真实样票缺失时记录 SKIP。",node|manual,DONE,DONE,DONE,scripts/qa|docs/需求-报销发票OCR规约.md,"[""BIZ8-4""]",已在 docs/试运行与自动化验证手册.md 增加 BIZ8 批量样票 OCR 回归设计，区分 mock、pending 扫描、单张真实 OCR 和批量真实 OCR；node scripts/qa/check-pending-ocr.mjs 阈值 2/5/10 输出 [pending-ocr][SKIP] missing DATABASE_URL，按规则记录为非阻断 SKIP；当前无授权样票和凭据，未执行真实批量 OCR。 BIZ8-6,OCR 异步终态体验,"优化或验证 OCR 异步处理中、成功、失败、pending 和重试的页面体验。","1) 异步状态可解释；2) 用户知道是否需要等待或重试；3) 失败不阻塞无关流程；4) 移动端不重叠。","流程级验证：上传发票 -> 观察 OCR pending/success/failure -> PC 和移动查看报销详情状态。",playwright|node|manual,DONE,DONE,DONE,server/src|client/src|docs/产品设计规则.md,"[""BIZ8-5""]",npx playwright test tests/e2e/r111-invoice-reimbursement-guard.spec.ts --workers=1 --reporter=list 通过 2 tests；覆盖 PC 发票上传后 pending 轮询并自动添加、企业微信移动端 pending 提示、识别失败发票显示可删除后重新上传、图片附件分离和移动布局指标；未改业务代码或页面代码。 BIZ8-7,重复票据例外流程,"设计重复票据发现后的例外处理流程，避免误拦截合法场景或放过风险。","1) 重复提示清楚；2) 人工例外有权限和记录；3) 不绕过财务复核；4) 审计可追溯。","流程级验证：提交重复票据 -> 检查拦截或例外路径 -> 财务复核 -> 查看审计记录。",node|playwright|manual,DONE,DONE,DONE,server/src|client/src|docs/报销发票附件规则.md,"[""BIZ8-2""]",npm test -- tests/unit/invoiceGovernance.dedup.test.js tests/unit/routes/invoicePool.upload.test.js 通过 2 files 11 tests，覆盖重复可用票据复用、他人或已使用票据阻断和可理解提示；一次性 Fastify 注入验证 /api/invoice-pool/:id/override-duplicate 无 expense.finance.override_duplicate 权限返回 403，有权限时写 is_duplicate_override、原单号、原因和 INVOICE_DUPLICATE_OVERRIDDEN 审计；未改业务代码。 -BIZ8-8,财务台账扫读性,"提升财务台账的扫读性，优先解决状态、金额、申请人、项目和票据提示的扫描效率。","1) 财务能快速识别待处理项；2) 状态和金额不混乱；3) 权限不泄露；4) PC 和移动布局可用。","流程级验证：财务查看台账 -> 筛选或扫读待付款报销 -> 检查状态、金额、申请人和票据提示。",playwright|npm|manual,TODO,TODO,TODO,client/src|server/src|docs/产品设计规则.md,"[""BIZ8-1""]",待批准方案：当前 AP 财务台账已有状态 金额 申请人 付款 发票 附件；缺项目字段 项目搜索 项目导出；批准后仅增强报销台账读取链路 server/src/services/financeLedger.js client/src/api/apOperations.ts client/src/pages/ApOperationsPage.tsx；加入 project select/map 类型 表格字段 搜索条件和导出字段；不改付款状态机 不引入 ERP 不改移动入口；验证 server 相关单测 client typecheck/build 和 AP Playwright。 -BIZ8-9,付款和导出增强,"增强或验证财务付款标记和导出路径，保证权限、状态和审计一致。","1) 只有财务可执行付款或导出；2) 状态转换合法；3) 导出不泄露无权限数据；4) 操作可追溯。","流程级验证：财务付款或导出 -> 普通员工和管理员直连复核 -> 检查状态和权限。",node|bash|manual,TODO,TODO,TODO,server/src|client/src|server/scripts,"[""BIZ8-8""]",待批准方案：BIZ8-9 先作为 BIZ8-8 的导出和权限回归承接；导出补项目字段并复核现有 AP export 权限；付款标记只验证现有付款批次和报销付款状态一致性 不新增 ERP 实时集成 不新增付款状态机；如需直接付款按钮必须另给状态机和回滚方案。 +BIZ8-8,财务台账扫读性,"提升财务台账的扫读性，优先解决状态、金额、申请人、项目和票据提示的扫描效率。","1) 财务能快速识别待处理项；2) 状态和金额不混乱；3) 权限不泄露；4) PC 和移动布局可用。","流程级验证：财务查看台账 -> 筛选或扫读待付款报销 -> 检查状态、金额、申请人和票据提示。",playwright|npm|manual,DONE,DONE,DONE,client/src|server/src|docs/产品设计规则.md,"[""BIZ8-1""]",完成：财务台账读取链路补 project select/map；关键字搜索支持项目编号和名称；AP 台账表格展示项目名称和项目编号；AP 导出财务台账段增加项目列；不改付款状态机 不改权限 不引入 ERP 不改移动入口；验证 prisma validate 通过；node --check financeLedger apOperations exports 通过；server unit 2 files 3 tests passed；client typecheck/build 通过；Playwright biz8-ap-ledger-project 1 passed。 +BIZ8-9,付款和导出增强,"增强或验证财务付款标记和导出路径，保证权限、状态和审计一致。","1) 只有财务可执行付款或导出；2) 状态转换合法；3) 导出不泄露无权限数据；4) 操作可追溯。","流程级验证：财务付款或导出 -> 普通员工和管理员直连复核 -> 检查状态和权限。",node|bash|manual,TODO,TODO,TODO,server/src|client/src|server/scripts,"[""BIZ8-8""]",待批准方案：BIZ8-8 已完成 AP 财务台账项目列和导出项目列；BIZ8-9 剩余工作聚焦现有 AP export 权限 付款批次和报销付款状态一致性回归；不新增 ERP 实时集成 不新增付款状态机；如需直接付款按钮必须另给状态机和回滚方案。 BIZ8-10,费用提示轻量规则,"设计轻量费用提示规则，作为填报辅助而非重预算控制。","1) 提示不阻断合法报销；2) 规则来源清楚；3) 不承诺预算控制；4) 用户可理解。","流程级验证：填写不同金额或类型报销 -> 检查费用提示 -> 提交和审批不被误阻断。",manual|playwright,DONE,DONE,DONE,docs/报销发票附件规则.md|client/src|server/src,"[""BIZ8-1""]",已在 docs/需求-报销发票OCR规约.md 增加 BIZ8 费用提示轻量规则，明确材料提示、金额提示、费用标准 warn、费用标准 block 和预算提示边界；npm test -- tests/unit/services/expenseStandards.check.test.js tests/unit/routes/reimbursements.expense-standards.test.js 通过 2 files 9 tests，覆盖 warn 不阻断、block 阻断和 manual_review 优先级；未改业务代码。 BIZ8-11,项目关联增强,"增强报销、采购或合同与项目轻管理的关联，保持轻量不扩展成重型项目管理。","1) 项目选择和展示清楚；2) 无项目时可解释；3) 项目权限不泄露；4) 不扩展复杂 WBS。","流程级验证：创建或选择项目 -> 提交报销/采购 -> 财务或负责人查看关联 -> 检查权限。",node|playwright|manual,TODO,TODO,TODO,docs/需求-项目轻管理规约.md|server/src|client/src,"[""BIZ8-1""]",待批准方案：报销和合同已有项目关联；采购模型缺 project_id 且项目详情页无采购摘要；批准后需 Prisma migration 给 purchase_requests 增 nullable project_id 和索引 relation；后端采购创建/更新/详情/列表补项目字段并校验项目可读和未归档；前端采购表单/详情/列表补项目选择与展示；项目详情补采购摘要；必须 reviewer 和权限回归；继续冻结复杂 WBS 预算控制和 ERP。 BIZ8-12,移动端业务入口评估,"评估报销、OCR、财务和项目轻量能力在移动端和企业微信入口的可用性。","1) 移动入口不重复；2) 企业微信入口回 OA；3) 财务敏感能力不误暴露；4) 新增入口进入移动矩阵。","流程级验证：员工和财务角色在移动端进入业务入口 -> 检查报销/OCR/项目状态和权限。",playwright|manual,TODO,TODO,TODO,client/src|docs/产品设计规则.md|docs/trialrun/真机公网测试清单.md,"[""BIZ8-8"",""BIZ8-11""]",真机验证不能被自动化替代。 diff --git a/server/src/services/financeLedger.js b/server/src/services/financeLedger.js index 535cda22..9e7fe4ec 100644 --- a/server/src/services/financeLedger.js +++ b/server/src/services/financeLedger.js @@ -67,6 +67,8 @@ function buildFinanceLedgerWhere(filters = {}) { OR: [ { form_number: { contains: query, mode: "insensitive" } }, { description: { contains: query, mode: "insensitive" } }, + { project: { is: { project_no: { contains: query, mode: "insensitive" } } } }, + { project: { is: { name: { contains: query, mode: "insensitive" } } } }, { owner: { name: { contains: query, mode: "insensitive" } } }, { owner: { employee_no: { contains: query, mode: "insensitive" } } }, { submitter: { name: { contains: query, mode: "insensitive" } } }, @@ -95,6 +97,7 @@ const FINANCE_LEDGER_SELECT = { owner: { select: { id: true, employee_no: true, name: true } }, submitter: { select: { id: true, employee_no: true, name: true } }, department: { select: { id: true, name: true } }, + project: { select: { id: true, project_no: true, name: true } }, paid_by_employee: { select: { id: true, employee_no: true, name: true } }, invoice_pool_items: { select: { @@ -162,6 +165,13 @@ function mapFinanceLedgerItem(item) { owner: mapEmployee(item.owner), submitter: mapEmployee(item.submitter), department: item.department ? { id: item.department.id, name: item.department.name } : null, + project: item.project + ? { + id: item.project.id, + projectNo: item.project.project_no, + name: item.project.name, + } + : null, payment: { status: item.status === "paid" ? "paid" : "unpaid", paymentVoucherNo: item.payment_voucher_no ?? null, @@ -243,6 +253,7 @@ const FINANCE_LEDGER_EXPORT_HEADERS = Object.freeze([ "报销单号", "申请人", "部门", + "项目", "金额", "审批状态", "付款状态", @@ -262,6 +273,7 @@ function mapFinanceLedgerExportRow(item) { item.formNumber ?? item.id, item.owner?.name ?? item.submitter?.name ?? "", item.department?.name ?? "", + item.project ? [item.project.projectNo, item.project.name].filter(Boolean).join(" ") : "", item.totalAmount, reimbursementStatusLabel(item.status), paymentStatusLabel(item.payment.status), diff --git a/server/tests/unit/routes/exports.apOperations.test.js b/server/tests/unit/routes/exports.apOperations.test.js index 6eaec13b..44667905 100644 --- a/server/tests/unit/routes/exports.apOperations.test.js +++ b/server/tests/unit/routes/exports.apOperations.test.js @@ -106,6 +106,7 @@ function buildFinanceLedgerItem(overrides = {}) { owner: { id: ACTOR_ID, employee_no: "E001", name: "张三" }, submitter: { id: ACTOR_ID, employee_no: "E001", name: "张三" }, department: { id: "dept-1", name: "财务部" }, + project: { id: "project-1", project_no: "PJ-001", name: "交付项目" }, paid_by_employee: { id: ACTOR_ID, employee_no: "F001", name: "财务" }, invoice_pool_items: [{ id: "invoice-1", status: "archived", archived_reason: "used_complete" }], _count: { attachments: 1, invoice_pool_items: 1 }, @@ -217,6 +218,7 @@ describe("ap operations export route", () => { expect(response.body).toContain("待付款批次"); expect(response.body).toContain("财务台账"); expect(response.body).toContain("BX-20260406-001"); + expect(response.body).toContain("交付项目"); expect(response.body).toContain("异常付款项"); expect(response.body).toContain("风险标记"); expect(response.body).toContain("对账异常"); diff --git a/server/tests/unit/services/financeLedger.test.js b/server/tests/unit/services/financeLedger.test.js new file mode 100644 index 00000000..b4327080 --- /dev/null +++ b/server/tests/unit/services/financeLedger.test.js @@ -0,0 +1,22 @@ +const { + FINANCE_LEDGER_EXPORT_HEADERS, + buildFinanceLedgerWhere, +} = require("../../../src/services/financeLedger"); + +describe("finance ledger service", () => { + it("includes project fields in keyword search and export headers", () => { + const where = buildFinanceLedgerWhere({ q: "交付项目" }); + + expect(where).toEqual({ + AND: [ + { + OR: expect.arrayContaining([ + { project: { is: { project_no: { contains: "交付项目", mode: "insensitive" } } } }, + { project: { is: { name: { contains: "交付项目", mode: "insensitive" } } } }, + ]), + }, + ], + }); + expect(FINANCE_LEDGER_EXPORT_HEADERS).toContain("项目"); + }); +});