收敛审批动作面板并清理层叠遗留 [approval-action-panel-kiss-layering]
这个提交包含在：
@@ -358,6 +358,77 @@ test.describe("R7E 审批动作二次确认", () => {
|
||||
await expect.poll(() => actionCalls.return).toBe(1);
|
||||
});
|
||||
|
||||
for (const scenario of [
|
||||
{
|
||||
entityType: "leave",
|
||||
label: "请假",
|
||||
detail: { leaveRequest: pendingTaskDetail.leaveRequest },
|
||||
expectedText: "R7E 审批动作确认",
|
||||
},
|
||||
{
|
||||
entityType: "attendance_correction",
|
||||
label: "补卡",
|
||||
detail: {
|
||||
attendanceCorrection: {
|
||||
id: "attendance-confirm-1", status: "reviewing", kind: "missed_punch", workDate: "2026-09-02",
|
||||
missedPunchAt: "09:05", startAt: null, endAt: null, locationSummary: "公司", compensationPolicy: "按实际打卡修正",
|
||||
reason: "忘记打卡", owner: { id: "employee-confirm-applicant", employeeNo: "E-confirm", name: "陈工程" },
|
||||
},
|
||||
},
|
||||
expectedText: "忘记打卡",
|
||||
},
|
||||
{
|
||||
entityType: "purchase_request",
|
||||
label: "采购",
|
||||
detail: {
|
||||
purchaseRequest: {
|
||||
id: "purchase-confirm-1", requestNo: "CG-CONFIRM-001", title: "办公用品采购", status: "reviewing",
|
||||
totalAmount: "800.00", currencyCode: "CNY", expectedDeliveryDate: "2026-09-10", reason: "补充日常库存",
|
||||
applicant: { id: "employee-confirm-applicant", employeeNo: "E-confirm", name: "陈工程" },
|
||||
supplier: { id: "supplier-confirm", name: "合成供应商" }, legalEntity: { id: "entity-confirm", name: "示例公司" },
|
||||
costCenter: { id: "cost-center-confirm", name: "研发中心" },
|
||||
},
|
||||
},
|
||||
expectedText: "办公用品采购",
|
||||
},
|
||||
{
|
||||
entityType: "travel_request",
|
||||
label: "差旅",
|
||||
detail: {
|
||||
travelRequest: {
|
||||
id: "travel-confirm-1", requestNo: "CL-CONFIRM-001", status: "reviewing", tripType: "domestic",
|
||||
startDate: "2026-09-10", endDate: "2026-09-12", estimatedAmount: "1800.00", purpose: "客户现场交流",
|
||||
applicant: { id: "employee-confirm-applicant", employeeNo: "E-confirm", name: "陈工程" },
|
||||
legalEntity: { id: "entity-confirm", name: "示例公司" }, costCenter: { id: "cost-center-confirm", name: "研发中心" },
|
||||
},
|
||||
},
|
||||
expectedText: "客户现场交流",
|
||||
},
|
||||
]) {
|
||||
test(`1280px ${scenario.label}审批保持通用详情与动作可达`, async ({ page }) => {
|
||||
const taskDetail = {
|
||||
...pendingTaskDetail,
|
||||
workflowInstance: { ...pendingTaskDetail.workflowInstance, entityType: scenario.entityType },
|
||||
reimbursement: null,
|
||||
leaveRequest: null,
|
||||
attendanceCorrection: null,
|
||||
purchaseRequest: null,
|
||||
travelRequest: null,
|
||||
...scenario.detail,
|
||||
};
|
||||
await mockWorkflowConfirmApis(page, { taskDetail });
|
||||
await page.setViewportSize({ width: 1280, height: 800 });
|
||||
await login(page, MANAGER);
|
||||
await page.goto(`/workflow/tasks/${pendingTask.id}`);
|
||||
|
||||
await expect(page.getByTestId("workflow-task-summary")).toContainText(scenario.expectedText);
|
||||
await expect(page.getByRole("heading", { name: "处理历史" })).toBeVisible();
|
||||
await expect(page.getByTestId("workflow-task-action-panel")).toBeVisible();
|
||||
await expect(page.getByTestId("workflow-task-approve")).toBeEnabled();
|
||||
expect(await page.evaluate(() => document.documentElement.scrollWidth <= document.documentElement.clientWidth + 2)).toBe(true);
|
||||
});
|
||||
}
|
||||
|
||||
test("PC 报销审批同屏展示证据、引用退回意见且不暴露维护动作", async ({ page }) => {
|
||||
const reimbursementId = "bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb";
|
||||
const taskDetail = {
|
||||
@@ -437,13 +508,18 @@ test.describe("R7E 审批动作二次确认", () => {
|
||||
await expect(page.getByTestId("reimbursement-amount-summary")).toContainText("¥180.00");
|
||||
await expect(page.getByText("报销总额与明细汇总不一致，请联系管理员")).toHaveCount(0);
|
||||
await expect(page.getByText("明细金额无法完整核对，请联系管理员")).toHaveCount(0);
|
||||
const actionPanel = page.getByTestId("workflow-task-action-panel");
|
||||
await expect(actionPanel.getByText("完整内容已就绪", { exact: true })).toHaveCount(0);
|
||||
await expect(actionPanel.getByText(/^节点：/)).toHaveCount(0);
|
||||
await expect(actionPanel.getByText(/^状态：/)).toHaveCount(0);
|
||||
await expect(actionPanel.getByText(/^审批角色：/)).toHaveCount(0);
|
||||
await expect(page.getByTestId("workflow-task-approve")).toBeEnabled();
|
||||
await expect(page.getByTestId("workflow-task-return-toggle")).toBeEnabled();
|
||||
await expect(page.getByTestId("workflow-task-reject-toggle")).toBeEnabled();
|
||||
await expect(page.getByTestId("workflow-task-transfer-menu-item")).toBeEnabled();
|
||||
await expect(page.getByTestId("reimbursement-workflow-history").locator(".detail-timeline-item")).toHaveCount(6);
|
||||
await expect(page.getByRole("heading", { name: "处理历史" })).toHaveCount(1);
|
||||
const actionBox = await page.getByTestId("workflow-task-action-panel").boundingBox();
|
||||
const actionBox = await actionPanel.boundingBox();
|
||||
const historyBox = await page.getByTestId("reimbursement-workflow-history").boundingBox();
|
||||
expect(actionBox).not.toBeNull();
|
||||
expect(historyBox).not.toBeNull();
|
||||
@@ -474,7 +550,7 @@ test.describe("R7E 审批动作二次确认", () => {
|
||||
workflowInstance: {
|
||||
...pendingTaskDetail.workflowInstance,
|
||||
entityType: "reimbursement",
|
||||
contextData: { standardViolations: [], budgetCheck: null, budgetCheckStatus: "not_applicable", parseStatus: "ready" },
|
||||
contextData: { standardViolations: [], budgetCheck: null, budgetCheckStatus: "available", parseStatus: "ready" },
|
||||
},
|
||||
reimbursement: {
|
||||
id: "bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb", formNumber: "BX-FAIL-001", status: "reviewing",
|
||||
@@ -487,7 +563,7 @@ test.describe("R7E 审批动作二次确认", () => {
|
||||
|
||||
await login(page, MANAGER);
|
||||
await page.goto(`/workflow/tasks/${pendingTask.id}`);
|
||||
await expect(page.getByRole("alert")).toContainText("服务暂不可用");
|
||||
await expect(page.getByRole("alert")).toContainText("报销内容未加载完整，暂不能审批，请刷新后重试");
|
||||
await expect(page.getByTestId("workflow-task-approve")).toBeDisabled();
|
||||
await expect(page.getByTestId("workflow-task-return-toggle")).toBeDisabled();
|
||||
await expect(page.getByTestId("workflow-task-reject-toggle")).toBeDisabled();
|
||||
@@ -501,7 +577,7 @@ test.describe("R7E 审批动作二次确认", () => {
|
||||
workflowInstance: {
|
||||
...pendingTaskDetail.workflowInstance,
|
||||
entityType: "reimbursement",
|
||||
contextData: { standardViolations: [], budgetCheck: null, budgetCheckStatus: "not_applicable", parseStatus: "ready" },
|
||||
contextData: { standardViolations: [], budgetCheck: null, budgetCheckStatus: "available", parseStatus: "ready" },
|
||||
},
|
||||
reimbursement: {
|
||||
id: reimbursementId,
|
||||
@@ -549,6 +625,7 @@ test.describe("R7E 审批动作二次确认", () => {
|
||||
await page.goto(`/mobile/approvals/${pendingTask.id}`);
|
||||
|
||||
await expect(page.getByTestId("reimbursement-amount-summary")).toContainText("¥100.00");
|
||||
await expect(page.locator("#reimbursement-workspace-snapshot")).toHaveCount(0);
|
||||
await expect(page.getByTestId("reimbursement-workflow-history").locator(".detail-timeline-item")).toHaveCount(6);
|
||||
const assertMobileGeometry = async () => {
|
||||
expect(await page.evaluate(() => document.documentElement.scrollWidth <= document.documentElement.clientWidth + 2)).toBe(true);
|
||||
@@ -627,7 +704,15 @@ test.describe("R7E 审批动作二次确认", () => {
|
||||
await page.goto(`/workflow/tasks/${pendingTask.id}`);
|
||||
|
||||
await expect(page.getByTestId("reimbursement-amount-summary")).toContainText("¥100.00");
|
||||
await expect(page.getByRole("alert").filter({ hasText: scenario.expectedMessage })).toBeVisible();
|
||||
await expect(page.locator("#reimbursement-workspace-snapshot")).toHaveCount(0);
|
||||
const blockReason = page.getByTestId("reimbursement-approval-block-reason");
|
||||
await expect(blockReason).toHaveText(scenario.expectedMessage);
|
||||
const primaryAction = page.getByTestId("workflow-task-approve");
|
||||
const blockReasonBox = await blockReason.boundingBox();
|
||||
const primaryActionBox = await primaryAction.boundingBox();
|
||||
expect(blockReasonBox).not.toBeNull();
|
||||
expect(primaryActionBox).not.toBeNull();
|
||||
expect(blockReasonBox!.y + blockReasonBox!.height).toBeLessThanOrEqual(primaryActionBox!.y);
|
||||
await expect(page.getByText("差额", { exact: true })).toHaveCount(0);
|
||||
await expect(page.getByTestId("workflow-task-approve")).toBeDisabled();
|
||||
await expect(page.getByTestId("workflow-task-return-toggle")).toBeDisabled();
|
||||
|
||||
在新工单中引用
屏蔽一个用户