修复:支持员工按完整目标号码批量叫号
问题:批量叫号仅按数量输入,员工无法直接叫到 0002x 号段。 实现:允许输入完整目标号码,按待叫队列换算连续数量,保持 FIFO,并拦截非法目标和超上限操作。 验证:前端 68 项测试、类型检查和生产构建通过。
This commit is contained in:
@@ -239,6 +239,55 @@ describe("StaffPage scene-focused H5", () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("can call through a full target number beyond the 0001x range", async () => {
|
||||||
|
const callNext = vi.spyOn(api, "callNext").mockResolvedValueOnce({
|
||||||
|
batch: {
|
||||||
|
id: "batch-2",
|
||||||
|
batch_number: 5,
|
||||||
|
status: "CALLED",
|
||||||
|
called_at: "2026-07-10T09:03:00Z",
|
||||||
|
ticket_count: 13,
|
||||||
|
people_count: 28,
|
||||||
|
tickets: [{ id: "called-25", ticket_number: "00025", status: "CALLED", party_size: 2 }],
|
||||||
|
},
|
||||||
|
revision: 9,
|
||||||
|
device_results: [{ channel: "SIMULATOR", status: "SUCCESS" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
renderScene("/staff");
|
||||||
|
const targetInput = screen.getByRole("textbox", { name: "叫到号码" });
|
||||||
|
expect(targetInput).toHaveValue("00014");
|
||||||
|
|
||||||
|
fireEvent.change(targetInput, { target: { value: "00025" } });
|
||||||
|
fireEvent.click(screen.getByRole("button", { name: "批量叫号" }));
|
||||||
|
|
||||||
|
await waitFor(() => expect(callNext).toHaveBeenCalledWith("project-1", 8, "TICKET", 13, expect.any(String)));
|
||||||
|
} finally {
|
||||||
|
callNext.mockRestore();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects a target outside the waiting queue or beyond the configured batch limit", () => {
|
||||||
|
const callNext = vi.spyOn(api, "callNext");
|
||||||
|
try {
|
||||||
|
renderScene("/staff");
|
||||||
|
const targetInput = screen.getByRole("textbox", { name: "叫到号码" });
|
||||||
|
|
||||||
|
fireEvent.change(targetInput, { target: { value: "00040" } });
|
||||||
|
fireEvent.click(screen.getByRole("button", { name: "批量叫号" }));
|
||||||
|
expect(callNext).not.toHaveBeenCalled();
|
||||||
|
expect(screen.getByRole("alert")).toHaveTextContent("请输入当前待叫队列中的完整目标号码");
|
||||||
|
|
||||||
|
fireEvent.change(targetInput, { target: { value: "00033" } });
|
||||||
|
fireEvent.click(screen.getByRole("button", { name: "批量叫号" }));
|
||||||
|
expect(callNext).not.toHaveBeenCalled();
|
||||||
|
expect(screen.getByRole("alert")).toHaveTextContent("从 00013 叫到 00033 共 21 个号码,超过单次上限 20 个");
|
||||||
|
} finally {
|
||||||
|
callNext.mockRestore();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
it("updates number indicators after creation without showing a success card", async () => {
|
it("updates number indicators after creation without showing a success card", async () => {
|
||||||
vi.spyOn(api, "createTicket").mockResolvedValueOnce({
|
vi.spyOn(api, "createTicket").mockResolvedValueOnce({
|
||||||
ticket: { id: "ticket-30", ticket_number: "00030", status: "WAITING", party_size: 3 },
|
ticket: { id: "ticket-30", ticket_number: "00030", status: "WAITING", party_size: 3 },
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ export function StaffPage() {
|
|||||||
const [formError, setFormError] = useState<string | null>(null);
|
const [formError, setFormError] = useState<string | null>(null);
|
||||||
const [notice, setNotice] = useState<{ scene: "call" | "tickets"; tone: "success" | "warning" | "danger"; title: string; detail?: string; url?: string } | null>(null);
|
const [notice, setNotice] = useState<{ scene: "call" | "tickets"; tone: "success" | "warning" | "danger"; title: string; detail?: string; url?: string } | null>(null);
|
||||||
const [busyAction, setBusyAction] = useState<string | null>(null);
|
const [busyAction, setBusyAction] = useState<string | null>(null);
|
||||||
const [ticketCallCount, setTicketCallCount] = useState(1);
|
const [ticketCallTarget, setTicketCallTarget] = useState("");
|
||||||
const [peopleCallCount, setPeopleCallCount] = useState(1);
|
const [peopleCallCount, setPeopleCallCount] = useState(1);
|
||||||
const [visibleWaitingTicketCount, setVisibleWaitingTicketCount] = useState(WAITING_TICKET_PAGE_SIZE);
|
const [visibleWaitingTicketCount, setVisibleWaitingTicketCount] = useState(WAITING_TICKET_PAGE_SIZE);
|
||||||
const [confirmDuplicatePhone, setConfirmDuplicatePhone] = useState(false);
|
const [confirmDuplicatePhone, setConfirmDuplicatePhone] = useState(false);
|
||||||
@@ -148,6 +148,8 @@ export function StaffPage() {
|
|||||||
const waitingTicketCount = Math.max(0, Number(queue?.metrics.waiting_ticket_count ?? queue?.metrics.waiting_count) || 0);
|
const waitingTicketCount = Math.max(0, Number(queue?.metrics.waiting_ticket_count ?? queue?.metrics.waiting_count) || 0);
|
||||||
const waitingPeopleCount = Math.max(0, Number(queue?.metrics.waiting_people_count) || 0);
|
const waitingPeopleCount = Math.max(0, Number(queue?.metrics.waiting_people_count) || 0);
|
||||||
const waitingTickets = queue?.waiting ?? [];
|
const waitingTickets = queue?.waiting ?? [];
|
||||||
|
const defaultTicketCallCount = selectedProject?.default_call_ticket_count ?? selectedProject?.call_batch_size ?? selectedProject?.batch_size ?? 1;
|
||||||
|
const defaultTicketCallTarget = waitingTickets[Math.min(Math.max(defaultTicketCallCount, 1), waitingTickets.length) - 1]?.ticket_number ?? "";
|
||||||
const visibleWaitingTickets = waitingTickets.slice(0, visibleWaitingTicketCount);
|
const visibleWaitingTickets = waitingTickets.slice(0, visibleWaitingTicketCount);
|
||||||
const canShowMoreWaitingTickets = visibleWaitingTickets.length < waitingTickets.length;
|
const canShowMoreWaitingTickets = visibleWaitingTickets.length < waitingTickets.length;
|
||||||
const canCollapseWaitingTickets = visibleWaitingTickets.length > WAITING_TICKET_PAGE_SIZE;
|
const canCollapseWaitingTickets = visibleWaitingTickets.length > WAITING_TICKET_PAGE_SIZE;
|
||||||
@@ -233,7 +235,6 @@ export function StaffPage() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!selectedProject) return;
|
if (!selectedProject) return;
|
||||||
setTicketCallCount(selectedProject.default_call_ticket_count ?? selectedProject.call_batch_size ?? selectedProject.batch_size ?? 1);
|
|
||||||
setPeopleCallCount(selectedProject.default_call_people_count ?? 1);
|
setPeopleCallCount(selectedProject.default_call_people_count ?? 1);
|
||||||
const minPartySize = selectedProject.min_party_size ?? 1;
|
const minPartySize = selectedProject.min_party_size ?? 1;
|
||||||
const maxPartySize = selectedProject.max_party_size ?? minPartySize;
|
const maxPartySize = selectedProject.max_party_size ?? minPartySize;
|
||||||
@@ -245,6 +246,14 @@ export function StaffPage() {
|
|||||||
}));
|
}));
|
||||||
}, [selectedProject?.id]);
|
}, [selectedProject?.id]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setTicketCallTarget((current) => (
|
||||||
|
waitingTickets.some((ticket) => ticket.ticket_number === current)
|
||||||
|
? current
|
||||||
|
: defaultTicketCallTarget
|
||||||
|
));
|
||||||
|
}, [defaultTicketCallTarget, queue?.revision, selectedProjectId]);
|
||||||
|
|
||||||
useGSAP(() => {
|
useGSAP(() => {
|
||||||
if (!showProjectSwitcher) return;
|
if (!showProjectSwitcher) return;
|
||||||
const mm = gsap.matchMedia();
|
const mm = gsap.matchMedia();
|
||||||
@@ -278,6 +287,7 @@ export function StaffPage() {
|
|||||||
setFormError(null);
|
setFormError(null);
|
||||||
setConfirmDuplicatePhone(false);
|
setConfirmDuplicatePhone(false);
|
||||||
setPhoneError(null);
|
setPhoneError(null);
|
||||||
|
setTicketCallTarget("");
|
||||||
createIntentRef.current = null;
|
createIntentRef.current = null;
|
||||||
callIntentRef.current = null;
|
callIntentRef.current = null;
|
||||||
};
|
};
|
||||||
@@ -383,6 +393,34 @@ export function StaffPage() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const callThroughTicket = () => {
|
||||||
|
const target = ticketCallTarget.trim();
|
||||||
|
const targetIndex = waitingTickets.findIndex((ticket) => ticket.ticket_number === target);
|
||||||
|
if (targetIndex < 0) {
|
||||||
|
setNotice({
|
||||||
|
scene: "call",
|
||||||
|
tone: "danger",
|
||||||
|
title: "叫号未提交",
|
||||||
|
detail: "请输入当前待叫队列中的完整目标号码",
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const count = targetIndex + 1;
|
||||||
|
const limit = selectedProject?.max_call_ticket_count ?? 100;
|
||||||
|
if (count > limit) {
|
||||||
|
setNotice({
|
||||||
|
scene: "call",
|
||||||
|
tone: "danger",
|
||||||
|
title: "叫号未提交",
|
||||||
|
detail: `从 ${waitingTickets[0].ticket_number} 叫到 ${target} 共 ${count} 个号码,超过单次上限 ${limit} 个`,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
void callNext("TICKET", count);
|
||||||
|
};
|
||||||
|
|
||||||
const noticeBanner = notice && notice.scene === scene ? (
|
const noticeBanner = notice && notice.scene === scene ? (
|
||||||
<div className={notice.scene === "call" ? "staff-call-notice" : undefined}>
|
<div className={notice.scene === "call" ? "staff-call-notice" : undefined}>
|
||||||
<FeedbackBanner
|
<FeedbackBanner
|
||||||
@@ -453,8 +491,8 @@ export function StaffPage() {
|
|||||||
{busyAction === "call-next" ? "正在叫号" : "快速叫下一个号"}
|
{busyAction === "call-next" ? "正在叫号" : "快速叫下一个号"}
|
||||||
</button>
|
</button>
|
||||||
<div className="staff-batch-action">
|
<div className="staff-batch-action">
|
||||||
<label className="field"><span>号码数量</span><input aria-label="按号码叫号数量" type="number" min="1" max={selectedProject?.max_call_ticket_count ?? 100} value={ticketCallCount} onChange={(event) => setTicketCallCount(Number(event.target.value) || 1)} /></label>
|
<label className="field"><span>叫到号码</span><input aria-label="叫到号码" type="text" inputMode="numeric" autoComplete="off" value={ticketCallTarget} onChange={(event) => setTicketCallTarget(event.target.value.replace(/\D/g, ""))} /></label>
|
||||||
<button className="button button--secondary" onClick={() => void callNext("TICKET", ticketCallCount)} disabled={busyAction === "call-next" || callBlocked || waitingTicketCount === 0}>批量叫号</button>
|
<button className="button button--secondary" onClick={callThroughTicket} disabled={busyAction === "call-next" || callBlocked || waitingTicketCount === 0}>批量叫号</button>
|
||||||
</div>
|
</div>
|
||||||
</div> : null}
|
</div> : null}
|
||||||
{supportsPeopleCall ? <div className="staff-call-mode" aria-label="按人数叫号">
|
{supportsPeopleCall ? <div className="staff-call-mode" aria-label="按人数叫号">
|
||||||
|
|||||||
Reference in New Issue
Block a user