diff --git a/client/src/pages/ProjectsPage.tsx b/client/src/pages/ProjectsPage.tsx
index 0c72da34..a52d6a8c 100644
--- a/client/src/pages/ProjectsPage.tsx
+++ b/client/src/pages/ProjectsPage.tsx
@@ -14,8 +14,7 @@ import { useAuth } from "../auth/AuthContext";
import { hasAnyPermission } from "../auth/permissions";
import { DateTextInput } from "../components/common/DateTextInput";
import { StatusBadge } from "../components/common/StatusBadge";
-import { FilterBar, ListWorkspace, StatStrip, WorkspaceHeader, WorkspaceNotice } from "../components/patterns/ListWorkspace";
-import { MetricCard } from "../components/patterns/MetricCard";
+import { FilterBar, ListWorkspace, WorkspaceHeader, WorkspaceNotice } from "../components/patterns/ListWorkspace";
import { SectionPanel } from "../components/patterns/SectionPanel";
import { Button } from "../components/ui/button";
import { Input } from "../components/ui/input";
@@ -123,20 +122,6 @@ export function ProjectsPage() {
});
}, [projectItems, showTrialData]);
const hiddenTrialProjectCount = projectItems.length - visibleProjectItems.length;
- const projectStats = useMemo(() => {
- return visibleProjectItems.reduce(
- (acc, item) => {
- acc.total += 1;
- if (item.status === "active") {
- acc.active += 1;
- }
- acc.overdueMilestones += item.counts.overdueMilestones;
- acc.openRisks += item.counts.openRisks;
- return acc;
- },
- { total: 0, active: 0, overdueMilestones: 0, openRisks: 0 },
- );
- }, [visibleProjectItems]);
const createMutation = useMutation({
mutationFn: () =>
@@ -188,7 +173,6 @@ export function ProjectsPage() {
);
diff --git a/client/src/pages/PurchaseRequestsPage.tsx b/client/src/pages/PurchaseRequestsPage.tsx
index 193ef4f9..d0f52613 100644
--- a/client/src/pages/PurchaseRequestsPage.tsx
+++ b/client/src/pages/PurchaseRequestsPage.tsx
@@ -1,7 +1,7 @@
import { useEffect, useMemo, useRef, useState } from "react";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { Link, useSearchParams } from "react-router-dom";
-import { Archive, ArrowRight, Clock3, FilePenLine, RotateCcw, Wrench } from "lucide-react";
+import { Wrench } from "lucide-react";
import { toast } from "sonner";
import { isApiError } from "../api/types";
import { mapApiErrorMessage } from "../api/errorMessages";
@@ -117,48 +117,6 @@ function statusOptions(): Array<{ value: PurchaseRequestStatus | ""; label: stri
];
}
-const PURCHASE_TASK_STATUS_OPTIONS = [
- {
- value: "rejected",
- title: "退回待补材料",
- idleNote: "暂无被退回的采购",
- activeNote: "按审批意见补材料后重新提交",
- icon: RotateCcw,
- accentClass: "border-red-200 bg-red-50 text-red-700",
- },
- {
- value: "draft",
- title: "草稿待完善",
- idleNote: "还没有采购草稿",
- activeNote: "继续补供应商、明细和附件",
- icon: FilePenLine,
- accentClass: "border-amber-200 bg-amber-50 text-amber-700",
- },
- {
- value: "reviewing",
- title: "审批中进度",
- idleNote: "暂无审批中的采购",
- activeNote: "查看当前节点和审批进度",
- icon: Clock3,
- accentClass: "border-sky-200 bg-sky-50 text-sky-700",
- },
- {
- value: "approved",
- title: "待验收 / 归档",
- idleNote: "暂无已通过待跟进采购",
- activeNote: "核对到货并登记 PO / 合同摘要",
- icon: Archive,
- accentClass: "border-emerald-200 bg-emerald-50 text-emerald-700",
- },
-] satisfies Array<{
- value: PurchaseRequestStatus;
- title: string;
- idleNote: string;
- activeNote: string;
- icon: typeof RotateCcw;
- accentClass: string;
-}>;
-
function formatPurchaseCurrency(value: string | number | null | undefined, currencyCode = "CNY") {
const amount = Number(value ?? 0);
if (!Number.isFinite(amount)) {
@@ -486,26 +444,6 @@ export function PurchaseRequestsPage() {
}),
});
- const draftSummaryQuery = useQuery({
- queryKey: ["purchase-requests", "task-summary", "mine", "draft"],
- queryFn: () => fetchPurchaseRequests({ status: "draft", mine: true, page: 1, pageSize: 1 }),
- });
-
- const rejectedSummaryQuery = useQuery({
- queryKey: ["purchase-requests", "task-summary", "mine", "rejected"],
- queryFn: () => fetchPurchaseRequests({ status: "rejected", mine: true, page: 1, pageSize: 1 }),
- });
-
- const reviewingSummaryQuery = useQuery({
- queryKey: ["purchase-requests", "task-summary", "mine", "reviewing"],
- queryFn: () => fetchPurchaseRequests({ status: "reviewing", mine: true, page: 1, pageSize: 1 }),
- });
-
- const approvedSummaryQuery = useQuery({
- queryKey: ["purchase-requests", "task-summary", "mine", "approved"],
- queryFn: () => fetchPurchaseRequests({ status: "approved", mine: true, page: 1, pageSize: 1 }),
- });
-
const detailQuery = useQuery({
enabled: Boolean(selectedId),
queryKey: ["purchase-requests", "detail", selectedId],
@@ -534,22 +472,6 @@ export function PurchaseRequestsPage() {
}
}, [searchParams, selectedId]);
- useEffect(() => {
- if (selectedId) {
- if (detailQuery.isLoading) {
- return;
- }
- if (!detailQuery.isError) {
- return;
- }
- }
-
- const nextId = listQuery.data?.items?.[0]?.id ?? "";
- if (nextId !== selectedId) {
- setSelectedId(nextId);
- }
- }, [detailQuery.isError, detailQuery.isLoading, listQuery.data?.items, selectedId]);
-
useEffect(() => {
const currentId = searchParams.get("id") ?? "";
if (!selectedId && !currentId) {
@@ -645,12 +567,6 @@ export function PurchaseRequestsPage() {
const totalPages = Math.max(1, Math.ceil((listQuery.data?.total ?? 0) / PAGE_SIZE));
const purchaseItems = listQuery.data?.items ?? [];
- const taskSummaryTotalByStatus = {
- draft: draftSummaryQuery.data?.total,
- rejected: rejectedSummaryQuery.data?.total,
- reviewing: reviewingSummaryQuery.data?.total,
- approved: approvedSummaryQuery.data?.total,
- };
const hasAdvancedFilters = Boolean(supplierFilter || legalEntityFilter || costCenterFilter || (canViewAll && !mine));
const canShowLedgerTools =
canViewAll ||
@@ -1000,15 +916,6 @@ export function PurchaseRequestsPage() {
}
};
- function focusPurchaseStatus(nextStatus: PurchaseRequestStatus | "") {
- setStatus(nextStatus);
- setMine(true);
- setSupplierFilter("");
- setLegalEntityFilter("");
- setCostCenterFilter("");
- setPage(1);
- }
-
const erpTrack = erpTrackQuery.data ?? null;
const canRetryErp = Boolean(canIntegrationManage && erpTrack?.permissions.canRetry);
const showArchiveSection = Boolean(detail && (detail.status === "approved" || archiveOrder));
@@ -1033,9 +940,7 @@ export function PurchaseRequestsPage() {
{downloadReasonDialog}
{formError}
-
+
) : null}
-
- {PURCHASE_TASK_STATUS_OPTIONS.map((item) => {
- const Icon = item.icon;
- const count = taskSummaryTotalByStatus[item.value];
- const active = status === item.value && mine && !hasAdvancedFilters;
- const displayCount = typeof count === "number" ? count : "-";
-
- return (
-
- );
- })}
-
-
-
-
采购记录
+
-
+
采购单列表
@@ -1296,9 +1163,6 @@ export function PurchaseRequestsPage() {
{evidenceHint.label}
-
- 下一步：{resolvePurchaseNextStep(item)}
-
);
@@ -1318,7 +1182,7 @@ export function PurchaseRequestsPage() {
金额 / 供应商
项目 / 合同
状态 / 证据
-
下一步
+
操作
@@ -1329,12 +1193,8 @@ export function PurchaseRequestsPage() {
{
- setSelectedId(item.id);
- setHydratedDetailId("");
- }}
>
-
+
@@ -1368,11 +1228,7 @@ export function PurchaseRequestsPage() {
{evidenceHint.label}
-
- {resolvePurchaseNextStep(item)}
-
- {!selectedId ? (
-
- 请先在左侧选择采购单，或新建一张采购草稿。
-
- ) : null}
-
{selectedId && detailQuery.isLoading ?
: null}
{selectedId && detailQuery.isError ? (
@@ -2199,6 +2050,7 @@ export function PurchaseRequestsPage() {
) : null}
{
await page.goto("/projects");
await expect(page.getByRole("heading", { name: "项目", exact: true })).toBeVisible();
- await expect(page.getByText("默认只看我负责/我参与")).toBeVisible();
- await expect(page.getByText("新建项目")).toHaveCount(0);
+ await expect(page.getByPlaceholder("搜索项目编号、项目名、客户名")).toBeVisible();
+ await expect(page.getByRole("button", { name: "创建项目" })).toHaveCount(0);
await page.getByRole("button", { name: "台账工具" }).click();
- await expect(page.getByText("新建项目")).toBeVisible();
+ await expect(page.getByRole("button", { name: "创建项目" })).toBeVisible();
await page.goto("/projects/project-wave3");
await expect(page.getByRole("heading", { name: /HYB-W3/ })).toBeVisible();
@@ -1099,7 +1099,7 @@ test("Wave3 PC 详情和通知中心视觉截图", async ({ page }) => {
await page.goto("/contracts-registry?projectId=project-wave3");
await expect(page.getByRole("heading", { name: "合同台账", exact: true })).toBeVisible();
- await expect(page.getByTestId("contracts-registry-summary")).toBeVisible();
+ await expect(page.getByTestId("contracts-registry-row")).toBeVisible();
await expect(page.getByRole("button", { name: "导出 CSV" })).toHaveCount(0);
await page.getByRole("button", { name: "台账工具" }).click();
await expect(page.getByTestId("contracts-ledger-tools")).toBeVisible();
diff --git a/client/tests/e2e/pc-finance-admin-visual-wave4.spec.ts b/client/tests/e2e/pc-finance-admin-visual-wave4.spec.ts
index 836217f5..dda6632b 100644
--- a/client/tests/e2e/pc-finance-admin-visual-wave4.spec.ts
+++ b/client/tests/e2e/pc-finance-admin-visual-wave4.spec.ts
@@ -1001,7 +1001,7 @@ async function capture(page: Page, name: string) {
const pages = [
{ path: "/payment-batches", summary: "payment-batches-summary", proof: "text=批次列表", screenshot: "01-payment-batches" },
- { path: "/ap-operations", summary: "ap-operations-summary", proof: "text=异常付款", screenshot: "02-ap-operations" },
+ { path: "/ap-operations", proof: "text=异常付款", screenshot: "02-ap-operations", expectStatusStrip: false },
{ path: "/invoice-pool", summary: "invoice-pool-summary", proof: "data-testid=invoice-pool-table", screenshot: "03-invoice-pool" },
{ path: "/system/approval-rules", summary: "approval-rules-summary", proof: "data-testid=approval-rules-table", screenshot: "04-approval-rules" },
{ path: "/people", summary: "people-summary", proof: "data-testid=people-table", screenshot: "05-people" },
@@ -1023,9 +1023,13 @@ test("PC 财务与管理页 Wave4-5 视觉冒烟", async ({ page }) => {
for (const target of pages) {
await page.goto(target.path);
- await expect(page.getByTestId(target.summary)).toBeVisible();
+ if ("summary" in target) {
+ await expect(page.getByTestId(target.summary)).toBeVisible();
+ }
await expect(page.locator(target.proof).first()).toBeVisible();
- await expect(page.locator(".finance-status-strip").first()).toBeVisible();
+ if (!("expectStatusStrip" in target) || target.expectStatusStrip !== false) {
+ await expect(page.locator(".finance-status-strip").first()).toBeVisible();
+ }
await capture(page, target.screenshot);
}
});
diff --git a/client/tests/e2e/procurement-flow.spec.ts b/client/tests/e2e/procurement-flow.spec.ts
index 08bcef30..524d9099 100644
--- a/client/tests/e2e/procurement-flow.spec.ts
+++ b/client/tests/e2e/procurement-flow.spec.ts
@@ -106,7 +106,7 @@ test("E2E 采购主链路：员工提单→经理审批→财务归档", async (
await page.getByRole("combobox").first().selectOption("approved");
const purchaseRow = page.getByRole("row").filter({ hasText: requestNo }).first();
await expect(purchaseRow).toBeVisible({ timeout: 30_000 });
- await purchaseRow.click();
+ await purchaseRow.getByTestId("purchase-row-open").click();
await expect(page.getByTestId("purchase-archive-po-no")).toBeVisible();
await expect(page.getByTestId("purchase-status-hint")).toContainText("已通过", { timeout: 30_000 });
diff --git a/client/tests/e2e/r103-cross-page-ui-consistency.spec.ts b/client/tests/e2e/r103-cross-page-ui-consistency.spec.ts
index a197e4b5..b86351d2 100644
--- a/client/tests/e2e/r103-cross-page-ui-consistency.spec.ts
+++ b/client/tests/e2e/r103-cross-page-ui-consistency.spec.ts
@@ -348,9 +348,9 @@ test.describe("R103 cross page UI consistency", () => {
await expect(page.locator("header").filter({ hasText: "业务" }).getByText("采购申请")).toBeVisible();
await expect(page.getByRole("heading", { name: "采购申请" })).toBeVisible();
- await expect(page.getByTestId("purchase-task-card-draft")).toBeVisible();
+ await expect(page.getByTestId("purchase-requests-table")).toBeVisible();
await expect(page.getByTestId("purchase-ledger-tools")).toBeVisible();
- await expect(page.getByTestId("purchase-row-next-step")).toContainText("继续完善材料并提交");
+ await expect(page.getByTestId("purchase-row-next-step")).toHaveCount(0);
await expect(page.getByText("付款处理")).toHaveCount(0);
await expect(page.getByText("/purchase-requests")).toHaveCount(0);
await expect(page.getByTestId("purchase-attachment-upload")).toHaveText("上传附件");