From 705dd4202a317a3f9a3fe69751dbedd7e980d3c1 Mon Sep 17 00:00:00 2001
From: damingishere-coder <damingishere@gmail.com>
Date: Sat, 29 Aug 2026 18:33:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E6=97=A5=E6=9C=9F=E8=AE=A2=E5=8D=95=E6=8E=92=E7=8F=AD?=
 =?UTF-8?q?=E4=B8=8E=E5=9C=B0=E5=9B=BE=E9=94=9A=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/api/customers.py                  |  62 ++++
 backend/app/api/intake.py                     | 107 +++++-
 backend/app/api/orders.py                     |  56 +++
 backend/app/api/plans.py                      | 133 ++++---
 backend/app/schemas/intake.py                 |  55 ++-
 backend/app/schemas/location.py               |  55 +++
 backend/app/schemas/plan.py                   |  15 +
 backend/app/services/intake.py                |  53 ++-
 backend/app/services/manual_locations.py      | 324 ++++++++++++++++++
 backend/app/services/order_locations.py       |  76 ++--
 backend/app/services/orders.py                |  14 +
 backend/app/services/plans.py                 |   1 +
 backend/tests/test_intake_api.py              | 134 ++++++++
 backend/tests/test_plan_api.py                |  41 +++
 backend/tests/test_plan_route_api.py          | 205 ++++++++++-
 .../P26_INTAKE_ORDER_CALENDAR_AND_MAP_PIN.md  |  64 ++++
 frontend/package-lock.json                    |  99 ++++++
 frontend/package.json                         |   2 +
 .../src/components/ui/CalendarMonthGrid.tsx   |  47 +++
 .../src/components/ui/MultiDateCalendar.tsx   |  90 +++++
 frontend/src/components/ui/calendarDates.ts   |  41 +++
 .../features/intake/AdminIntakePage.test.tsx  |  59 ++++
 .../src/features/intake/AdminIntakePage.tsx   |  65 +++-
 frontend/src/features/intake/api.ts           |  11 +
 frontend/src/features/intake/constants.ts     |  22 +-
 frontend/src/features/intake/types.ts         |   4 +
 frontend/src/features/orders/OrderForm.tsx    |  35 +-
 .../features/orders/OrderScheduleCalendar.tsx |  97 ++++++
 .../src/features/orders/OrdersPage.test.tsx   |  37 +-
 frontend/src/features/orders/OrdersPage.tsx   | 112 ++++--
 .../features/plans/DailyPlansPage.test.tsx    |   1 +
 .../src/features/plans/DailyPlansPage.tsx     | 141 +++++++-
 frontend/src/features/plans/RouteMap.tsx      |  38 +-
 .../src/features/plans/RouteWorkspace.tsx     |  17 +-
 frontend/src/features/plans/api.test.ts       |  64 ++++
 frontend/src/features/plans/api.ts            |  66 +++-
 .../src/features/plans/mapProvider.test.ts    | 106 ++++++
 frontend/src/features/plans/mapProvider.ts    |  51 ++-
 frontend/src/features/plans/types.ts          |  26 ++
 frontend/src/pages/FillPage.test.tsx          |   9 +-
 frontend/src/pages/FillPage.tsx               |  38 +-
 frontend/src/test/setup.ts                    |   8 +
 42 files changed, 2461 insertions(+), 220 deletions(-)
 create mode 100644 backend/app/schemas/location.py
 create mode 100644 backend/app/services/manual_locations.py
 create mode 100644 docs/tasks/P26_INTAKE_ORDER_CALENDAR_AND_MAP_PIN.md
 create mode 100644 frontend/src/components/ui/CalendarMonthGrid.tsx
 create mode 100644 frontend/src/components/ui/MultiDateCalendar.tsx
 create mode 100644 frontend/src/components/ui/calendarDates.ts
 create mode 100644 frontend/src/features/orders/OrderScheduleCalendar.tsx
 create mode 100644 frontend/src/features/plans/mapProvider.test.ts

diff --git a/backend/app/api/customers.py b/backend/app/api/customers.py
index fa92b52..de268ea 100644
--- a/backend/app/api/customers.py
+++ b/backend/app/api/customers.py
@@ -6,6 +6,8 @@
 from sqlalchemy.orm import Session, selectinload
 
 from app.db.session import get_db
+from app.maps import MapServices
+from app.maps.factory import get_map_services
 from app.models.customer import Cat, Customer
 from app.models.order import Order, OrderCat
 from app.models.payment import Payment
@@ -22,11 +24,18 @@
     CustomerSummary,
     CustomerUpdate,
 )
+from app.schemas.location import CustomerLocationRestore, CustomerLocationUpdate, LocationUpdateRead
 from app.services.customers import build_customer
+from app.services.manual_locations import (
+    check_customer_location_concurrency,
+    update_customer_location,
+    verified_geocode,
+)
 
 
 router = APIRouter(prefix="/api/admin/customers", tags=["admin-customers"])
 DatabaseSession = Annotated[Session, Depends(get_db)]
+MapServicesDependency = Annotated[MapServices, Depends(get_map_services)]
 GEOCODE_ADDRESS_FIELDS = {"community", "address", "building", "unit", "room"}
 
 
@@ -174,6 +183,59 @@ def get_customer(customer_id: int, session: DatabaseSession) -> CustomerDetail:
     return _customer_detail(session, _load_customer(session, customer_id))
 
 
+@router.patch("/{customer_id}/location", response_model=LocationUpdateRead)
+def patch_customer_location(
+    customer_id: int,
+    payload: CustomerLocationUpdate,
+    session: DatabaseSession,
+) -> LocationUpdateRead:
+    result = update_customer_location(
+        session,
+        customer_id=customer_id,
+        source_order_id=payload.source_order_id,
+        service_date=payload.service_date,
+        expected_customer_updated_at=payload.expected_customer_updated_at,
+        expected_day_revision=payload.expected_day_revision,
+        latitude=payload.latitude,
+        longitude=payload.longitude,
+    )
+    session.commit()
+    return result
+
+
+@router.post("/{customer_id}/location/restore-auto", response_model=LocationUpdateRead)
+def restore_customer_location(
+    customer_id: int,
+    payload: CustomerLocationRestore,
+    session: DatabaseSession,
+    services: MapServicesDependency,
+) -> LocationUpdateRead:
+    _, order, _ = check_customer_location_concurrency(
+        session,
+        customer_id=customer_id,
+        source_order_id=payload.source_order_id,
+        service_date=payload.service_date,
+        expected_customer_updated_at=payload.expected_customer_updated_at,
+        expected_day_revision=payload.expected_day_revision,
+    )
+    result, provider_name = verified_geocode(order, services)
+    session.expire_all()
+    updated = update_customer_location(
+        session,
+        customer_id=customer_id,
+        source_order_id=payload.source_order_id,
+        service_date=payload.service_date,
+        expected_customer_updated_at=payload.expected_customer_updated_at,
+        expected_day_revision=payload.expected_day_revision,
+        latitude=result.point.latitude,
+        longitude=result.point.longitude,
+        automatic_result=result,
+        provider_name=provider_name,
+    )
+    session.commit()
+    return updated
+
+
 @router.patch("/{customer_id}", response_model=CustomerDetail)
 def update_customer(
     customer_id: int,
diff --git a/backend/app/api/intake.py b/backend/app/api/intake.py
index 066fbcf..dc9cf6c 100644
--- a/backend/app/api/intake.py
+++ b/backend/app/api/intake.py
@@ -8,6 +8,7 @@
 from app.db.session import get_db
 from app.models.enums import FormSubmissionStatus
 from app.models.intake import CustomerFormSubmission, CustomerFormToken
+from app.models.system import SystemFlag
 from app.schemas.intake import (
     IntakeClaimCommand,
     IntakeClaimRead,
@@ -16,6 +17,7 @@
     IntakeDecisionCommand,
     IntakeDecisionRead,
     IntakeDraftPayload,
+    IntakeListStateUpdate,
     IntakeRedactionRead,
     IntakeReviewDraftUpdate,
     IntakeSubmissionDetail,
@@ -66,6 +68,7 @@
     tags=["intake-relay-sync"],
 )
 DatabaseSession = Annotated[Session, Depends(get_db)]
+REMOVED_FLAG_PREFIX = "intake-list-removed:"
 
 
 def _token_options():
@@ -83,6 +86,49 @@ def _load_admin_token(session: Session, token_id: int) -> CustomerFormToken:
     return token
 
 
+def _removed_key(submission_uuid: str) -> str:
+    return f"{REMOVED_FLAG_PREFIX}{submission_uuid}"
+
+
+def _decorate_removed_state(
+    session: Session,
+    detail: IntakeSubmissionDetail,
+) -> IntakeSubmissionDetail:
+    flag = session.get(SystemFlag, _removed_key(detail.submission_uuid))
+    return detail.model_copy(update={"removed_at": flag.created_at if flag else None})
+
+
+def _decorate_removed_list(
+    session: Session,
+    response: IntakeSubmissionList,
+) -> IntakeSubmissionList:
+    keys = [_removed_key(item.submission_uuid) for item in response.items]
+    flags = {
+        flag.key: flag
+        for flag in (
+            session.scalars(select(SystemFlag).where(SystemFlag.key.in_(keys))).all()
+            if keys
+            else []
+        )
+    }
+    return response.model_copy(
+        update={
+            "items": [
+                item.model_copy(
+                    update={
+                        "removed_at": (
+                            flags[_removed_key(item.submission_uuid)].created_at
+                            if _removed_key(item.submission_uuid) in flags
+                            else None
+                        )
+                    }
+                )
+                for item in response.items
+            ]
+        }
+    )
+
+
 def _submission_options():
     return (
         selectinload(CustomerFormSubmission.token),
@@ -235,9 +281,12 @@ def list_submissions(
     offset: int = Query(default=0, ge=0),
 ) -> IntakeSubmissionList:
     if remote_intake_enabled():
-        return hydrate_remote_list(
+        return _decorate_removed_list(
             session,
-            RemoteIntakeClient().list_submissions(limit=limit, offset=offset),
+            hydrate_remote_list(
+                session,
+                RemoteIntakeClient().list_submissions(limit=limit, offset=offset),
+            ),
         )
     status_filter = CustomerFormSubmission.status != FormSubmissionStatus.DRAFT
     total = session.scalar(
@@ -254,9 +303,12 @@ def list_submissions(
         .limit(limit)
         .offset(offset)
     ).all()
-    return IntakeSubmissionList(
-        items=[to_submission_summary(item) for item in submissions],
-        total=total,
+    return _decorate_removed_list(
+        session,
+        IntakeSubmissionList(
+            items=[to_submission_summary(item) for item in submissions],
+            total=total,
+        ),
     )
 
 
@@ -273,11 +325,52 @@ def get_submission(
     session: DatabaseSession,
 ) -> IntakeSubmissionDetail:
     if remote_intake_enabled():
-        return hydrate_remote_detail(
+        return _decorate_removed_state(
+            session,
+            hydrate_remote_detail(
+                session,
+                RemoteIntakeClient().get_submission(submission_id),
+            ),
+        )
+    return _decorate_removed_state(
+        session,
+        to_submission_detail(_load_submission(session, submission_id)),
+    )
+
+
+@admin_router.patch(
+    "/submissions/{submission_id}/list-state",
+    response_model=IntakeSubmissionDetail,
+)
+def update_submission_list_state(
+    submission_id: int,
+    payload: IntakeListStateUpdate,
+    session: DatabaseSession,
+) -> IntakeSubmissionDetail:
+    detail = (
+        hydrate_remote_detail(
             session,
             RemoteIntakeClient().get_submission(submission_id),
         )
-    return to_submission_detail(_load_submission(session, submission_id))
+        if remote_intake_enabled()
+        else to_submission_detail(_load_submission(session, submission_id))
+    )
+    if detail.revision != payload.expected_revision:
+        raise HTTPException(status_code=409, detail="提交记录已变化，请刷新后重试")
+    voided = detail.status is FormSubmissionStatus.VOIDED or (
+        detail.status is FormSubmissionStatus.REDACTED
+        and detail.decision_mode == "void"
+    )
+    if payload.removed and not voided:
+        raise HTTPException(status_code=409, detail="只有已作废记录可以从列表移除")
+    key = _removed_key(detail.submission_uuid)
+    flag = session.get(SystemFlag, key)
+    if payload.removed and flag is None:
+        session.add(SystemFlag(key=key, payload={"removed": True}))
+    elif not payload.removed and flag is not None:
+        session.delete(flag)
+    session.commit()
+    return _decorate_removed_state(session, detail)
 
 
 @admin_router.put(
diff --git a/backend/app/api/orders.py b/backend/app/api/orders.py
index 02f373e..c8e5dcb 100644
--- a/backend/app/api/orders.py
+++ b/backend/app/api/orders.py
@@ -36,8 +36,14 @@
     OrderWrite,
     OrderServiceContact,
 )
+from app.schemas.location import LocationUpdateRead, OrderLocationRestore, OrderLocationUpdate
 from app.services.order_customers import resolve_order_customer
 from app.services.order_locations import clear_order_location, geocode_order
+from app.services.manual_locations import (
+    check_order_location_concurrency,
+    update_order_location,
+    verified_geocode,
+)
 from app.services.orders import (
     DEFAULT_BASE_PRICE,
     EXTRA_CAT_UNIT_PRICE,
@@ -553,6 +559,56 @@ def retry_order_geocode(
     return _order_detail(_load_order(session, order_id))
 
 
+@router.patch("/{order_id}/location", response_model=LocationUpdateRead)
+def patch_order_location(
+    order_id: int,
+    payload: OrderLocationUpdate,
+    session: DatabaseSession,
+) -> LocationUpdateRead:
+    result = update_order_location(
+        session,
+        order_id=order_id,
+        service_date=payload.service_date,
+        expected_order_updated_at=payload.expected_order_updated_at,
+        expected_day_revision=payload.expected_day_revision,
+        latitude=payload.latitude,
+        longitude=payload.longitude,
+    )
+    session.commit()
+    return result
+
+
+@router.post("/{order_id}/location/restore-auto", response_model=LocationUpdateRead)
+def restore_order_location(
+    order_id: int,
+    payload: OrderLocationRestore,
+    session: DatabaseSession,
+    services: MapServicesDependency,
+) -> LocationUpdateRead:
+    _, order = check_order_location_concurrency(
+        session,
+        order_id=order_id,
+        service_date=payload.service_date,
+        expected_order_updated_at=payload.expected_order_updated_at,
+        expected_day_revision=payload.expected_day_revision,
+    )
+    result, provider_name = verified_geocode(order, services)
+    session.expire_all()
+    updated = update_order_location(
+        session,
+        order_id=order_id,
+        service_date=payload.service_date,
+        expected_order_updated_at=payload.expected_order_updated_at,
+        expected_day_revision=payload.expected_day_revision,
+        latitude=result.point.latitude,
+        longitude=result.point.longitude,
+        automatic_result=result,
+        provider_name=provider_name,
+    )
+    session.commit()
+    return updated
+
+
 @router.put("/{order_id}", response_model=OrderDetail)
 def update_order(
     order_id: int,
diff --git a/backend/app/api/plans.py b/backend/app/api/plans.py
index 77552fb..f07162d 100644
--- a/backend/app/api/plans.py
+++ b/backend/app/api/plans.py
@@ -1,15 +1,15 @@
 from datetime import date
 from typing import Annotated
 
-from fastapi import APIRouter, Depends
-from sqlalchemy import distinct, func, select
-from sqlalchemy.orm import Session
+from fastapi import APIRouter, Depends, HTTPException, Query
+from sqlalchemy import select
+from sqlalchemy.orm import Session, selectinload
 
 from app.db.session import get_db
 from app.maps import MapServices
 from app.maps.factory import get_map_services
-from app.models.order import Order, OrderCat
-from app.models.enums import TaskStatus
+from app.models.order import Order
+from app.models.enums import OrderStatus, TaskStatus
 from app.models.task import Task
 from app.schemas.plan import (
     DayPlanResponse,
@@ -18,6 +18,7 @@
     PlanCustomerDetail,
     PlanCustomerSummary,
     PlanDaySummary,
+    PlanDayOrderMarker,
     PlanDaysResponse,
     PlanRoutePreviewRequest,
     PlanRouteWorkspace,
@@ -28,6 +29,7 @@
     PlanTaskSummary,
 )
 from app.services.orders import order_display_address, task_has_execution_history
+from app.services.manual_locations import location_impact
 from app.services.plan_routes import load_route_workspace, preview_day_route
 from app.services.plans import (
     apply_day_schedule,
@@ -101,8 +103,11 @@ def _day_plan(service_date: date, tasks: list[Task]) -> DayPlanResponse:
     )
 
 
-def _task_detail(task: Task, day_tasks: list[Task]) -> PlanTaskDetail:
+def _task_detail(session: Session, task: Task, day_tasks: list[Task]) -> PlanTaskDetail:
     order = task.order
+    location_scope, sync_order_count, sync_task_count, customer_updated_at = (
+        location_impact(session, order)
+    )
     return PlanTaskDetail(
         task=_task_summary(task),
         day_revision=day_plan_revision(day_tasks),
@@ -114,6 +119,7 @@ def _task_detail(task: Task, day_tasks: list[Task]) -> PlanTaskDetail:
             building=order.contact_building,
             unit=order.contact_unit,
             room=order.contact_room,
+            updated_at=customer_updated_at,
         ),
         cats=(
             [
@@ -148,66 +154,83 @@ def _task_detail(task: Task, day_tasks: list[Task]) -> PlanTaskDetail:
         task_notes=task.notes,
         estimated_arrival=task.estimated_arrival,
         photo_count=len(task.photos),
+        order_updated_at=order.updated_at,
+        route_geocode_status=order.route_geocode_status,
+        current_position=(
+            {"latitude": float(order.route_latitude), "longitude": float(order.route_longitude)}
+            if order.route_latitude is not None and order.route_longitude is not None
+            else None
+        ),
+        location_scope=location_scope,
+        location_sync_order_count=sync_order_count,
+        location_sync_task_count=sync_task_count,
     )
 
 
-@router.get("/days", response_model=PlanDaysResponse)
-def list_plan_days(session: DatabaseSession) -> PlanDaysResponse:
-    rows = session.execute(
-        select(
-            Task.service_date,
-            func.count(distinct(Task.id)),
-            func.count(distinct(Task.order_id)),
-            func.count(distinct(OrderCat.cat_id)),
-        )
-        .outerjoin(OrderCat, OrderCat.order_id == Task.order_id)
-        .where(Task.status != TaskStatus.CANCELLED)
-        .group_by(Task.service_date)
-        .order_by(Task.service_date)
-    ).all()
-    order_rows = session.execute(
-        select(Task.service_date, Task.order_id)
-        .where(Task.status != TaskStatus.CANCELLED)
-        .distinct()
-    ).all()
-    order_ids = {order_id for _, order_id in order_rows}
-    order_counts = {
-        order.id: order.cat_count
-        for order in session.scalars(select(Order).where(Order.id.in_(order_ids))).all()
-    }
-    cat_counts_by_date: dict[date, int] = {}
-    for service_date, order_id in order_rows:
-        cat_counts_by_date[service_date] = (
-            cat_counts_by_date.get(service_date, 0) + order_counts.get(order_id, 0)
-        )
-    customer_names_by_date: dict[date, list[str]] = {}
-    name_rows = session.execute(
-        select(Task.service_date, Order.contact_name)
+@router.get("/days", response_model=PlanDaysResponse, response_model_exclude_none=True)
+def list_plan_days(
+    session: DatabaseSession,
+    date_from: date | None = Query(default=None),
+    date_to: date | None = Query(default=None),
+) -> PlanDaysResponse:
+    if (date_from is None) != (date_to is None):
+        raise HTTPException(status_code=422, detail="date_from 和 date_to 必须成对提供")
+    if date_from is not None and date_to is not None:
+        if date_to < date_from:
+            raise HTTPException(status_code=422, detail="date_to 不能早于 date_from")
+        if (date_to - date_from).days > 61:
+            raise HTTPException(status_code=422, detail="日期范围最多 62 天")
+    statement = (
+        select(Task)
         .join(Order, Order.id == Task.order_id)
-        .where(Task.status != TaskStatus.CANCELLED)
+        .options(selectinload(Task.order))
+        .where(
+            Task.status != TaskStatus.CANCELLED,
+            Order.order_status != OrderStatus.CANCELLED,
+        )
         .order_by(Task.service_date, Task.sort_order, Task.id)
-    ).all()
-    for service_date, customer_name in name_rows:
-        names = customer_names_by_date.setdefault(service_date, [])
-        if customer_name not in names:
-            names.append(customer_name)
-    items = [
-        PlanDaySummary(
-            service_date=service_date,
-            task_count=int(task_count),
-            order_count=int(order_count),
-            cat_count=cat_counts_by_date.get(service_date, int(cat_count)),
-            customer_names=customer_names_by_date.get(service_date, []),
+    )
+    if date_from is not None and date_to is not None:
+        statement = statement.where(Task.service_date.between(date_from, date_to))
+    tasks = list(session.scalars(statement).unique().all())
+    tasks_by_date: dict[date, list[Task]] = {}
+    for task in tasks:
+        tasks_by_date.setdefault(task.service_date, []).append(task)
+    items: list[PlanDaySummary] = []
+    for service_date, day_tasks in tasks_by_date.items():
+        order_tasks: dict[int, list[Task]] = {}
+        for task in day_tasks:
+            order_tasks.setdefault(task.order_id, []).append(task)
+        orders = [entries[0].order for entries in order_tasks.values()]
+        items.append(
+            PlanDaySummary(
+                service_date=service_date,
+                task_count=len(day_tasks),
+                order_count=len(order_tasks),
+                cat_count=sum(order.cat_count for order in orders),
+                customer_names=list(dict.fromkeys(order.contact_name for order in orders)),
+                orders=(
+                    [
+                        PlanDayOrderMarker(
+                            order_id=order_id,
+                            customer_name=entries[0].order.contact_name,
+                            visit_count=len(entries),
+                            order_status=entries[0].order.order_status,
+                        )
+                        for order_id, entries in order_tasks.items()
+                    ]
+                    if date_from is not None
+                    else None
+                ),
+            )
         )
-        for service_date, task_count, order_count, cat_count in rows
-    ]
     return PlanDaysResponse(items=items, total=len(items))
 
 
 @router.get("/tasks/{task_id}", response_model=PlanTaskDetail)
 def get_plan_task(task_id: int, session: DatabaseSession) -> PlanTaskDetail:
     task = load_plan_task(session, task_id)
-    return _task_detail(task, load_day_tasks(session, task.service_date))
+    return _task_detail(session, task, load_day_tasks(session, task.service_date))
 
 
 @router.get("/{service_date}/route", response_model=PlanRouteWorkspace)
@@ -251,7 +274,7 @@ def change_plan_task_status(
         expected_revision=payload.expected_revision,
         task_status=payload.task_status,
     )
-    return _task_detail(task, load_day_tasks(session, task.service_date))
+    return _task_detail(session, task, load_day_tasks(session, task.service_date))
 
 
 @router.get("/{service_date}", response_model=DayPlanResponse)
diff --git a/backend/app/schemas/intake.py b/backend/app/schemas/intake.py
index 8faa68e..bf04bda 100644
--- a/backend/app/schemas/intake.py
+++ b/backend/app/schemas/intake.py
@@ -52,6 +52,7 @@ class IntakeCatDraft(IntakeModel):
 
 
 class IntakeServiceDraft(IntakeModel):
+    service_dates: list[date] | None = None
     start_date: date | None = None
     end_date: date | None = None
     visits_per_day: int | None = Field(default=None, ge=1, le=10)
@@ -65,8 +66,26 @@ def deduplicate_service_items(
     ) -> list[TaskItemType]:
         return list(dict.fromkeys(service_items))
 
+    @field_validator("service_dates")
+    @classmethod
+    def normalize_service_dates(
+        cls,
+        service_dates: list[date] | None,
+    ) -> list[date] | None:
+        if service_dates is None:
+            return None
+        normalized = sorted(set(service_dates))
+        if len(normalized) > 366:
+            raise ValueError("服务日期最多 366 天")
+        return normalized
+
     @model_validator(mode="after")
     def validate_optional_date_range(self) -> Self:
+        if self.service_dates is not None and any(
+            value is not None
+            for value in (self.start_date, self.end_date, self.visits_per_day)
+        ):
+            raise ValueError("服务日期列表不能与旧日期区间同时填写")
         if self.start_date and self.end_date:
             if self.end_date < self.start_date:
                 raise ValueError("结束日期不能早于开始日期")
@@ -114,12 +133,31 @@ class PublicIntakeCatDraft(IntakeModel):
 
 
 class PublicIntakeServiceDraft(IntakeModel):
+    service_dates: list[date] | None = None
     start_date: date | None = None
     end_date: date | None = None
     visits_per_day: int | None = Field(default=None, ge=1, le=10)
 
+    @field_validator("service_dates")
+    @classmethod
+    def normalize_service_dates(
+        cls,
+        service_dates: list[date] | None,
+    ) -> list[date] | None:
+        if service_dates is None:
+            return None
+        normalized = sorted(set(service_dates))
+        if len(normalized) > 366:
+            raise ValueError("服务日期最多 366 天")
+        return normalized
+
     @model_validator(mode="after")
     def validate_optional_date_range(self) -> Self:
+        if self.service_dates is not None and any(
+            value is not None
+            for value in (self.start_date, self.end_date, self.visits_per_day)
+        ):
+            raise ValueError("服务日期列表不能与旧日期区间同时填写")
         if self.start_date and self.end_date:
             if self.end_date < self.start_date:
                 raise ValueError("结束日期不能早于开始日期")
@@ -168,11 +206,16 @@ class IntakeOrderCustomer(IntakeCustomerSubmit):
 
 
 class IntakeServiceArchive(IntakeServiceDraft):
-    start_date: date
-    end_date: date
-    visits_per_day: int = Field(ge=1, le=10)
     service_items: list[TaskItemType] = Field(min_length=1, max_length=8)
 
+    @model_validator(mode="after")
+    def require_schedule(self) -> Self:
+        if self.service_dates:
+            return self
+        if self.start_date and self.end_date and self.visits_per_day:
+            return self
+        raise ValueError("请至少选择一个服务日期")
+
 
 class IntakeSubmissionPayload(IntakeModel):
     customer: IntakeCustomerSubmit
@@ -252,9 +295,11 @@ class IntakeSubmissionSummary(BaseModel):
     cat_count: int
     start_date: date | None
     end_date: date | None
+    service_dates: list[date] = Field(default_factory=list)
     submitted_at: datetime | None
     updated_at: datetime
     revision: str
+    removed_at: datetime | None = None
 
 
 class IntakeSubmissionList(BaseModel):
@@ -310,6 +355,10 @@ class IntakeDecisionCommand(RevisionCommand):
     idempotency_key: str = Field(min_length=16, max_length=128)
 
 
+class IntakeListStateUpdate(RevisionCommand):
+    removed: bool
+
+
 class IntakeDecisionRead(BaseModel):
     submission_id: int
     submission_uuid: str
diff --git a/backend/app/schemas/location.py b/backend/app/schemas/location.py
new file mode 100644
index 0000000..786099a
--- /dev/null
+++ b/backend/app/schemas/location.py
@@ -0,0 +1,55 @@
+from datetime import date, datetime
+from typing import Literal
+
+from pydantic import BaseModel, ConfigDict, Field
+
+from app.schemas.plan import PlanGeoPoint
+
+
+class LocationWriteModel(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+
+class CustomerLocationUpdate(LocationWriteModel):
+    latitude: float = Field(ge=-90, le=90)
+    longitude: float = Field(ge=-180, le=180)
+    coordinate_system: Literal["GCJ-02"]
+    source_order_id: int = Field(gt=0)
+    service_date: date
+    expected_customer_updated_at: datetime
+    expected_day_revision: str = Field(pattern=r"^[0-9a-f]{64}$")
+
+
+class OrderLocationUpdate(LocationWriteModel):
+    latitude: float = Field(ge=-90, le=90)
+    longitude: float = Field(ge=-180, le=180)
+    coordinate_system: Literal["GCJ-02"]
+    service_date: date
+    expected_order_updated_at: datetime
+    expected_day_revision: str = Field(pattern=r"^[0-9a-f]{64}$")
+
+
+class CustomerLocationRestore(LocationWriteModel):
+    source_order_id: int = Field(gt=0)
+    service_date: date
+    expected_customer_updated_at: datetime
+    expected_day_revision: str = Field(pattern=r"^[0-9a-f]{64}$")
+
+
+class OrderLocationRestore(LocationWriteModel):
+    service_date: date
+    expected_order_updated_at: datetime
+    expected_day_revision: str = Field(pattern=r"^[0-9a-f]{64}$")
+
+
+class LocationUpdateRead(BaseModel):
+    scope: Literal["customer", "order"]
+    customer_id: int | None
+    order_id: int
+    original_position: PlanGeoPoint | None
+    position: PlanGeoPoint
+    affected_orders: int = Field(ge=0)
+    affected_tasks: int = Field(ge=0)
+    customer_updated_at: datetime | None
+    order_updated_at: datetime
+    day_revision: str = Field(pattern=r"^[0-9a-f]{64}$")
diff --git a/backend/app/schemas/plan.py b/backend/app/schemas/plan.py
index af8e182..6636433 100644
--- a/backend/app/schemas/plan.py
+++ b/backend/app/schemas/plan.py
@@ -20,6 +20,7 @@ class PlanCustomerDetail(PlanCustomerSummary):
     building: str | None
     unit: str | None
     room: str | None
+    updated_at: datetime | None
 
 
 class PlanCatSummary(BaseModel):
@@ -55,12 +56,20 @@ class PlanTaskSummary(BaseModel):
     has_execution_history: bool
 
 
+class PlanDayOrderMarker(BaseModel):
+    order_id: int
+    customer_name: str
+    visit_count: int = Field(ge=1)
+    order_status: OrderStatus
+
+
 class PlanDaySummary(BaseModel):
     service_date: date
     task_count: int
     order_count: int
     cat_count: int
     customer_names: list[str]
+    orders: list[PlanDayOrderMarker] | None = None
 
 
 class PlanDaysResponse(BaseModel):
@@ -89,6 +98,12 @@ class PlanTaskDetail(BaseModel):
     task_notes: str | None
     estimated_arrival: datetime | None
     photo_count: int
+    order_updated_at: datetime
+    route_geocode_status: str | None
+    current_position: "PlanGeoPoint | None" = None
+    location_scope: Literal["customer", "order"]
+    location_sync_order_count: int = Field(ge=0)
+    location_sync_task_count: int = Field(ge=0)
 
 
 class PlanScheduleItem(PlanWriteModel):
diff --git a/backend/app/services/intake.py b/backend/app/services/intake.py
index 02abfb7..ff95b2f 100644
--- a/backend/app/services/intake.py
+++ b/backend/app/services/intake.py
@@ -36,11 +36,11 @@
     PublicIntakeRead,
     PublicIntakeSubmissionPayload,
 )
-from app.schemas.order import OrderWrite
+from app.schemas.order import OrderCreate, OrderWrite
 from app.services.business_time import as_utc
 from app.services.credentials import token_digest
 from app.services.customers import build_customer
-from app.services.orders import build_order, reprice_order
+from app.services.orders import build_order, build_simple_order, reprice_order
 
 
 PUBLIC_TOKEN_BYTES = 16
@@ -316,6 +316,7 @@ def _public_payload_from_stored(payload: dict[str, object]) -> PublicIntakeDraft
                 for cat in stored.cats
             ],
             "service": {
+                "service_dates": stored.service.service_dates,
                 "start_date": stored.service.start_date,
                 "end_date": stored.service.end_date,
                 "visits_per_day": stored.service.visits_per_day,
@@ -556,6 +557,7 @@ def to_submission_summary(
             cat_count=0,
             start_date=None,
             end_date=None,
+            service_dates=[],
             submitted_at=submission.token.submitted_at,
             updated_at=submission.updated_at,
             revision=submission_revision(submission),
@@ -570,6 +572,7 @@ def to_submission_summary(
         cat_count=len(payload.cats),
         start_date=payload.service.start_date,
         end_date=payload.service.end_date,
+        service_dates=payload.service.service_dates or [],
         submitted_at=submission.token.submitted_at,
         updated_at=submission.updated_at,
         revision=submission_revision(submission),
@@ -746,7 +749,7 @@ def _order_payload(submission: CustomerFormSubmission) -> IntakeOrderArchivePayl
     except ValidationError as exc:
         raise HTTPException(
             status_code=409,
-            detail="请补齐地址、猫咪、服务日期、每日次数和服务事项",
+            detail="请补齐地址、猫咪、服务日期和服务事项",
         ) from exc
 
 
@@ -949,20 +952,36 @@ def archive_order_submission(
         changed_at=changed_at,
     )
     customer, cats = _build_customer_cats(session, payload=payload)
-    order_payload = OrderWrite(
-        customer_id=customer.id,
-        cat_ids=[cat.id for cat in cats],
-        start_date=payload.service.start_date,
-        end_date=payload.service.end_date,
-        visits_per_day=payload.service.visits_per_day,
-        service_items=payload.service.service_items,
-        base_price=unit_price,
-        stairs_fee=Decimal("0.00"),
-        other_fee=Decimal("0.00"),
-        order_status=OrderStatus.CONFIRMED,
-        notes=payload.notes,
-    )
-    order = build_order(order_payload, cats=cats, customer=customer)
+    if payload.service.service_dates:
+        order = build_simple_order(
+            OrderCreate(
+                source_customer_id=customer.id,
+                cat_count=len(cats),
+                service_dates=payload.service.service_dates,
+                service_items=payload.service.service_items,
+                unit_price=unit_price,
+                notes=payload.notes,
+            ),
+            source_customer=customer,
+        )
+    else:
+        assert payload.service.start_date is not None
+        assert payload.service.end_date is not None
+        assert payload.service.visits_per_day is not None
+        order_payload = OrderWrite(
+            customer_id=customer.id,
+            cat_ids=[cat.id for cat in cats],
+            start_date=payload.service.start_date,
+            end_date=payload.service.end_date,
+            visits_per_day=payload.service.visits_per_day,
+            service_items=payload.service.service_items,
+            base_price=unit_price,
+            stairs_fee=Decimal("0.00"),
+            other_fee=Decimal("0.00"),
+            order_status=OrderStatus.CONFIRMED,
+            notes=payload.notes,
+        )
+        order = build_order(order_payload, cats=cats, customer=customer)
     reprice_order(order, unit_price=unit_price)
     session.add(order)
     session.flush()
diff --git a/backend/app/services/manual_locations.py b/backend/app/services/manual_locations.py
new file mode 100644
index 0000000..9b04ecc
--- /dev/null
+++ b/backend/app/services/manual_locations.py
@@ -0,0 +1,324 @@
+from datetime import date, datetime, timezone
+from decimal import Decimal
+
+from fastapi import HTTPException
+from sqlalchemy import select
+from sqlalchemy.orm import Session, selectinload
+
+from app.maps import GeoPoint, GeocodeResult, MapProviderError, MapServices
+from app.models.customer import Customer
+from app.models.enums import OrderStatus
+from app.models.order import Order
+from app.models.task import Task
+from app.schemas.location import LocationUpdateRead
+from app.schemas.plan import PlanGeoPoint
+from app.services.geocoding import (
+    geocode_fingerprint,
+    geocode_result_matches_address,
+    normalized_geocode_address,
+)
+from app.services.orders import (
+    customer_geocode_address,
+    order_geocode_address,
+    task_has_execution_history,
+)
+from app.services.plans import day_plan_revision, load_day_tasks, require_current_revision
+
+
+def _order_options() -> tuple:
+    return (
+        selectinload(Order.customer),
+        selectinload(Order.tasks).selectinload(Task.items),
+        selectinload(Order.tasks).selectinload(Task.photos),
+    )
+
+
+def load_location_order(session: Session, order_id: int) -> Order:
+    order = session.scalar(
+        select(Order).options(*_order_options()).where(Order.id == order_id)
+    )
+    if order is None:
+        raise HTTPException(status_code=404, detail="订单不存在")
+    return order
+
+
+def _same_moment(current: datetime, expected: datetime) -> bool:
+    def normalize(value: datetime) -> datetime:
+        if value.tzinfo is not None:
+            return value.astimezone(timezone.utc).replace(tzinfo=None)
+        return value
+
+    return normalize(current) == normalize(expected)
+
+
+def _check_day_revision(session: Session, service_date: date, expected: str) -> list[Task]:
+    tasks = load_day_tasks(session, service_date)
+    require_current_revision(tasks, expected)
+    return tasks
+
+
+def _point(
+    latitude: float | Decimal | None,
+    longitude: float | Decimal | None,
+) -> PlanGeoPoint | None:
+    if latitude is None or longitude is None:
+        return None
+    return PlanGeoPoint(latitude=float(latitude), longitude=float(longitude))
+
+
+def _eligible_order(order: Order, address: str) -> bool:
+    return (
+        order.order_status not in {OrderStatus.CANCELLED, OrderStatus.COMPLETED}
+        and normalized_geocode_address(order_geocode_address(order) or "")
+        == normalized_geocode_address(address)
+    )
+
+
+def _apply_order_location(
+    order: Order,
+    *,
+    latitude: Decimal,
+    longitude: Decimal,
+    status: str,
+    fingerprint: str,
+    adcode: str | None,
+    level: str,
+) -> int:
+    order.route_latitude = latitude
+    order.route_longitude = longitude
+    order.route_geocode_status = status
+    order.route_geocode_fingerprint = fingerprint
+    order.route_geocode_adcode = adcode
+    order.route_geocode_level = level
+    order.updated_at = datetime.now(timezone.utc)
+    affected_tasks = 0
+    for task in order.tasks:
+        if not task_has_execution_history(task):
+            task.planned_lat = latitude
+            task.planned_lng = longitude
+            task.estimated_arrival = None
+            affected_tasks += 1
+    return affected_tasks
+
+
+def check_customer_location_concurrency(
+    session: Session,
+    *,
+    customer_id: int,
+    source_order_id: int,
+    service_date: date,
+    expected_customer_updated_at: datetime,
+    expected_day_revision: str,
+) -> tuple[list[Task], Order, Customer]:
+    day_tasks = _check_day_revision(session, service_date, expected_day_revision)
+    source_order = load_location_order(session, source_order_id)
+    customer = session.scalar(
+        select(Customer)
+        .options(selectinload(Customer.orders))
+        .where(Customer.id == customer_id)
+    )
+    if customer is None:
+        raise HTTPException(status_code=404, detail="客户档案不存在")
+    if source_order.customer_id != customer.id:
+        raise HTTPException(status_code=409, detail="来源订单与客户档案不匹配")
+    source_address = order_geocode_address(source_order)
+    current_customer_address = customer_geocode_address(customer)
+    if (
+        not source_address
+        or normalized_geocode_address(source_address)
+        != normalized_geocode_address(current_customer_address or "")
+    ):
+        raise HTTPException(status_code=409, detail="来源订单地址与客户当前地址不一致")
+    if not _same_moment(customer.updated_at, expected_customer_updated_at):
+        raise HTTPException(status_code=409, detail="客户档案已经变化，请刷新后再修改定位")
+    return day_tasks, source_order, customer
+
+
+def check_order_location_concurrency(
+    session: Session,
+    *,
+    order_id: int,
+    service_date: date,
+    expected_order_updated_at: datetime,
+    expected_day_revision: str,
+) -> tuple[list[Task], Order]:
+    day_tasks = _check_day_revision(session, service_date, expected_day_revision)
+    order = load_location_order(session, order_id)
+    if order.customer_id is not None:
+        raise HTTPException(status_code=409, detail="该订单已关联客户档案，请修改客户定位")
+    if not _same_moment(order.updated_at, expected_order_updated_at):
+        raise HTTPException(status_code=409, detail="订单已经变化，请刷新后再修改定位")
+    return day_tasks, order
+
+
+def update_customer_location(
+    session: Session,
+    *,
+    customer_id: int,
+    source_order_id: int,
+    service_date: date,
+    expected_customer_updated_at: datetime,
+    expected_day_revision: str,
+    latitude: float,
+    longitude: float,
+    automatic_result: GeocodeResult | None = None,
+    provider_name: str = "manual",
+) -> LocationUpdateRead:
+    day_tasks, source_order, customer = check_customer_location_concurrency(
+        session,
+        customer_id=customer_id,
+        source_order_id=source_order_id,
+        service_date=service_date,
+        expected_customer_updated_at=expected_customer_updated_at,
+        expected_day_revision=expected_day_revision,
+    )
+    address = order_geocode_address(source_order)
+    if not address:
+        raise HTTPException(status_code=422, detail="订单缺少可定位地址")
+    original = _point(customer.latitude, customer.longitude)
+    lat = Decimal(str(latitude))
+    lng = Decimal(str(longitude))
+    status = "resolved" if automatic_result is not None else "manual"
+    fingerprint = geocode_fingerprint(provider_name, address)
+    adcode = automatic_result.adcode if automatic_result is not None else None
+    level = automatic_result.level if automatic_result is not None else "manual_pin"
+    customer.latitude = lat
+    customer.longitude = lng
+    customer.geocode_status = status
+    customer.geocode_fingerprint = fingerprint
+    customer.geocode_adcode = adcode
+    customer.geocode_level = level
+    customer.updated_at = datetime.now(timezone.utc)
+
+    orders = list(
+        session.scalars(
+            select(Order)
+            .options(*_order_options())
+            .where(Order.customer_id == customer.id)
+        )
+        .unique()
+        .all()
+    )
+    affected_orders = 0
+    affected_tasks = 0
+    for order in orders:
+        if not _eligible_order(order, address):
+            continue
+        affected_tasks += _apply_order_location(
+            order,
+            latitude=lat,
+            longitude=lng,
+            status=status,
+            fingerprint=fingerprint,
+            adcode=adcode,
+            level=level,
+        )
+        affected_orders += 1
+    session.flush()
+    return LocationUpdateRead(
+        scope="customer",
+        customer_id=customer.id,
+        order_id=source_order.id,
+        original_position=original,
+        position=PlanGeoPoint(latitude=latitude, longitude=longitude),
+        affected_orders=affected_orders,
+        affected_tasks=affected_tasks,
+        customer_updated_at=customer.updated_at,
+        order_updated_at=source_order.updated_at,
+        day_revision=day_plan_revision(day_tasks),
+    )
+
+
+def update_order_location(
+    session: Session,
+    *,
+    order_id: int,
+    service_date: date,
+    expected_order_updated_at: datetime,
+    expected_day_revision: str,
+    latitude: float,
+    longitude: float,
+    automatic_result: GeocodeResult | None = None,
+    provider_name: str = "manual",
+) -> LocationUpdateRead:
+    day_tasks, order = check_order_location_concurrency(
+        session,
+        order_id=order_id,
+        service_date=service_date,
+        expected_order_updated_at=expected_order_updated_at,
+        expected_day_revision=expected_day_revision,
+    )
+    address = order_geocode_address(order)
+    if not address:
+        raise HTTPException(status_code=422, detail="订单缺少可定位地址")
+    original = _point(order.route_latitude, order.route_longitude)
+    lat = Decimal(str(latitude))
+    lng = Decimal(str(longitude))
+    status = "resolved" if automatic_result is not None else "manual"
+    fingerprint = geocode_fingerprint(provider_name, address)
+    affected_tasks = _apply_order_location(
+        order,
+        latitude=lat,
+        longitude=lng,
+        status=status,
+        fingerprint=fingerprint,
+        adcode=automatic_result.adcode if automatic_result is not None else None,
+        level=automatic_result.level if automatic_result is not None else "manual_pin",
+    )
+    session.flush()
+    return LocationUpdateRead(
+        scope="order",
+        customer_id=None,
+        order_id=order.id,
+        original_position=original,
+        position=PlanGeoPoint(latitude=latitude, longitude=longitude),
+        affected_orders=1,
+        affected_tasks=affected_tasks,
+        customer_updated_at=None,
+        order_updated_at=order.updated_at,
+        day_revision=day_plan_revision(day_tasks),
+    )
+
+
+def verified_geocode(order: Order, services: MapServices) -> tuple[GeocodeResult, str]:
+    address = order_geocode_address(order)
+    if not address:
+        raise HTTPException(status_code=422, detail="订单缺少可定位地址")
+    try:
+        result = services.geocode_provider.geocode(address)
+    except MapProviderError as exc:
+        raise HTTPException(status_code=409, detail="地址自动定位失败，已保留原手动锚点") from exc
+    if result is None or not geocode_result_matches_address(address, result):
+        raise HTTPException(status_code=409, detail="地址自动定位未通过验证，已保留原手动锚点")
+    return result, services.map_provider.provider_state().name
+
+
+def location_impact(session: Session, order: Order) -> tuple[str, int, int, datetime | None]:
+    if order.customer_id is None:
+        return (
+            "order",
+            1,
+            sum(1 for task in order.tasks if not task_has_execution_history(task)),
+            None,
+        )
+    customer = session.get(Customer, order.customer_id)
+    address = order_geocode_address(order)
+    if customer is None or not address:
+        return ("order", 1, 0, customer.updated_at if customer else None)
+    orders = list(
+        session.scalars(
+            select(Order).options(*_order_options()).where(Order.customer_id == customer.id)
+        ).unique().all()
+    )
+    eligible = [candidate for candidate in orders if _eligible_order(candidate, address)]
+    return (
+        "customer",
+        len(eligible),
+        sum(
+            1
+            for candidate in eligible
+            for task in candidate.tasks
+            if not task_has_execution_history(task)
+        ),
+        customer.updated_at,
+    )
diff --git a/backend/app/services/order_locations.py b/backend/app/services/order_locations.py
index b4e3b6d..c885d46 100644
--- a/backend/app/services/order_locations.py
+++ b/backend/app/services/order_locations.py
@@ -6,35 +6,18 @@
 from app.maps import GeoPoint, GeocodeResult, MapProviderError, MapServices
 from app.models.order import Order
 from app.models.task import Task
-from app.services.geocoding import geocode_fingerprint, geocode_result_matches_address
+from app.services.geocoding import (
+    geocode_fingerprint,
+    geocode_result_matches_address,
+    normalized_geocode_address,
+)
 from app.services.orders import (
-    default_geocode_service_area,
+    customer_geocode_address,
     order_geocode_address,
     task_has_execution_history,
 )
 
 
-def _normalized(value: str | None) -> str:
-    return " ".join((value or "").strip().casefold().split())
-
-
-def _customer_address(order: Order) -> str | None:
-    if order.customer is None:
-        return None
-    parts = [
-        order.customer.address,
-        order.customer.community,
-        order.customer.building,
-    ]
-    values: list[str] = []
-    for part in parts:
-        value = " ".join((part or "").strip().split())
-        if value and not any(_normalized(value) in _normalized(item) for item in values):
-            values = [item for item in values if _normalized(item) not in _normalized(value)]
-            values.append(value)
-    return " ".join(values) or None
-
-
 def clear_order_location(order: Order) -> None:
     order.route_latitude = None
     order.route_longitude = None
@@ -50,6 +33,20 @@ def clear_order_location(order: Order) -> None:
 
 def trusted_order_point(order: Order, services: MapServices) -> GeoPoint | None:
     address = order_geocode_address(order)
+    if (
+        address
+        and order.route_geocode_status == "manual"
+        and order.route_geocode_fingerprint == geocode_fingerprint("manual", address)
+        and order.route_latitude is not None
+        and order.route_longitude is not None
+    ):
+        try:
+            return GeoPoint(
+                latitude=float(order.route_latitude),
+                longitude=float(order.route_longitude),
+            )
+        except (TypeError, ValueError):
+            return None
     state = services.map_provider.provider_state()
     expected_fingerprints = (
         {geocode_fingerprint(state.name, address)} if address else set()
@@ -112,8 +109,14 @@ def _apply_geocode_result(
             task.planned_lat = latitude
             task.planned_lng = longitude
 
-    customer_address = default_geocode_service_area(_customer_address(order))
-    if order.customer is not None and _normalized(customer_address) == _normalized(address):
+    customer_address = (
+        customer_geocode_address(order.customer) if order.customer is not None else None
+    )
+    if (
+        order.customer is not None
+        and normalized_geocode_address(customer_address or "")
+        == normalized_geocode_address(address)
+    ):
         order.customer.latitude = latitude
         order.customer.longitude = longitude
         order.customer.geocode_status = "resolved"
@@ -128,6 +131,7 @@ def geocode_order(
     services: MapServices,
     *,
     raise_provider_errors: bool = False,
+    prefer_customer_manual: bool = True,
 ) -> str:
     """Best-effort address-only geocoding after the order transaction succeeds."""
 
@@ -144,6 +148,28 @@ def geocode_order(
         session.commit()
         return "missing"
 
+    customer = order.customer
+    if (
+        prefer_customer_manual
+        and customer is not None
+        and customer.geocode_status == "manual"
+        and customer.geocode_fingerprint == geocode_fingerprint("manual", address)
+        and customer.latitude is not None
+        and customer.longitude is not None
+    ):
+        order.route_latitude = customer.latitude
+        order.route_longitude = customer.longitude
+        order.route_geocode_status = "manual"
+        order.route_geocode_fingerprint = customer.geocode_fingerprint
+        order.route_geocode_adcode = None
+        order.route_geocode_level = "manual_pin"
+        for task in order.tasks:
+            if not task_has_execution_history(task):
+                task.planned_lat = customer.latitude
+                task.planned_lng = customer.longitude
+        session.commit()
+        return "manual"
+
     try:
         result = services.geocode_provider.geocode(address)
     except MapProviderError:
diff --git a/backend/app/services/orders.py b/backend/app/services/orders.py
index 73264d5..1134a75 100644
--- a/backend/app/services/orders.py
+++ b/backend/app/services/orders.py
@@ -361,6 +361,20 @@ def order_geocode_address(order: Order) -> str | None:
     )
 
 
+def customer_geocode_address(customer: Customer) -> str | None:
+    """Return the customer's current routable address using the order rules."""
+
+    return default_geocode_service_area(
+        _deduplicated_address(
+            [
+                _routable_address_part(customer.address),
+                customer.community,
+                customer.building,
+            ]
+        )
+    )
+
+
 DEFAULT_MAP_CITY = "深圳市"
 DEFAULT_MAP_DISTRICT = "龙岗区"
 _CITY_PATTERN = re.compile(r"(?:^|省|\s)([^省区县乡镇街道路\s]{2,8}市)")
diff --git a/backend/app/services/plans.py b/backend/app/services/plans.py
index 972a055..4289620 100644
--- a/backend/app/services/plans.py
+++ b/backend/app/services/plans.py
@@ -155,6 +155,7 @@ def apply_day_schedule(
         task = tasks_by_id[item.task_id]
         task.sort_order = sort_order
         task.planned_time = item.planned_time
+        task.estimated_arrival = None
 
     session.commit()
     return load_day_tasks(session, service_date)
diff --git a/backend/tests/test_intake_api.py b/backend/tests/test_intake_api.py
index 9eb1557..839c8f4 100644
--- a/backend/tests/test_intake_api.py
+++ b/backend/tests/test_intake_api.py
@@ -11,6 +11,7 @@
 from app.db.session import build_engine, get_db
 from app.main import app
 from app.models import Cat, Customer, CustomerFormSubmission, CustomerFormToken, Order, Task
+from app.models.system import SystemFlag
 from app.models.enums import FormSubmissionStatus, FormTokenStatus
 from app.services.privacy_logging import FillTokenRedactionFilter
 from app.services.credentials import token_digest
@@ -546,6 +547,139 @@ def test_submission_list_supports_pagination(
     assert len(page.json()["items"]) == 2
 
 
+def test_sparse_service_dates_are_canonical_and_create_one_task_per_selected_day(
+    intake_api_context: IntakeApiContext,
+) -> None:
+    client = intake_api_context.client
+    token = create_token(client)
+    payload = complete_payload(
+        service={
+            "service_dates": ["2031-04-07", "2031-04-01", "2031-04-07"],
+        }
+    )
+    submitted = client.post(
+        f"/api/fill/{token_value(token)}/submit",
+        json={
+            "expected_revision": token["revision"],
+            "idempotency_key": "sparse-service-dates-submit-0001",
+            "payload": payload,
+        },
+    )
+    assert submitted.status_code == 200
+    summary = max(
+        client.get("/api/admin/intake/submissions").json()["items"],
+        key=lambda item: item["id"],
+    )
+    assert summary["service_dates"] == ["2031-04-01", "2031-04-07"]
+    detail = client.get(f"/api/admin/intake/submissions/{summary['id']}").json()
+    review_payload = detail["payload"]
+    review_payload["service"]["service_items"] = ["feed", "photo"]
+    reviewed = client.put(
+        f"/api/admin/intake/submissions/{summary['id']}/review-draft",
+        json={
+            "review_payload": review_payload,
+            "unit_price": "40.00",
+            "expected_revision": detail["revision"],
+        },
+    ).json()
+    archived = client.post(
+        f"/api/admin/intake/submissions/{summary['id']}/archive-order",
+        json={
+            "expected_revision": reviewed["revision"],
+            "idempotency_key": "sparse-service-dates-archive-0001",
+        },
+    )
+    assert archived.status_code == 200
+    with intake_api_context.session_factory() as session:
+        order = session.get(Order, archived.json()["order_id"])
+        assert order is not None
+        task_dates = sorted(task.service_date.isoformat() for task in order.tasks)
+        assert task_dates == ["2031-04-01", "2031-04-07"]
+        assert order.total_amount == 80
+
+    mixed_token = create_token(client)
+    mixed = client.post(
+        f"/api/fill/{token_value(mixed_token)}/submit",
+        json={
+            "expected_revision": mixed_token["revision"],
+            "idempotency_key": "mixed-service-date-format-0001",
+            "payload": complete_payload(
+                service={
+                    "service_dates": ["2031-04-01"],
+                    "start_date": "2031-04-01",
+                    "end_date": "2031-04-01",
+                    "visits_per_day": 1,
+                }
+            ),
+        },
+    )
+    assert mixed.status_code == 422
+
+    duplicate_token = create_token(client)
+    duplicate_dates = client.post(
+        f"/api/fill/{token_value(duplicate_token)}/submit",
+        json={
+            "expected_revision": duplicate_token["revision"],
+            "idempotency_key": "dedupe-before-service-date-limit-0001",
+            "payload": complete_payload(
+                service={"service_dates": ["2031-04-01"] * 367}
+            ),
+        },
+    )
+    assert duplicate_dates.status_code == 200
+
+    too_many_token = create_token(client)
+    too_many_dates = [
+        (datetime(2031, 1, 1) + timedelta(days=offset)).date().isoformat()
+        for offset in range(367)
+    ]
+    rejected = client.post(
+        f"/api/fill/{token_value(too_many_token)}/submit",
+        json={
+            "expected_revision": too_many_token["revision"],
+            "idempotency_key": "too-many-service-dates-0001",
+            "payload": complete_payload(service={"service_dates": too_many_dates}),
+        },
+    )
+    assert rejected.status_code == 422
+
+
+def test_voided_submission_can_be_removed_and_restored_without_deletion(
+    intake_api_context: IntakeApiContext,
+) -> None:
+    client = intake_api_context.client
+    _, summary = submit_for_review(client)
+    voided = client.post(
+        f"/api/admin/intake/submissions/{summary['id']}/void",
+        json={
+            "expected_revision": summary["revision"],
+            "idempotency_key": "list-state-void-0001",
+        },
+    )
+    assert voided.status_code == 200
+    detail = client.get(f"/api/admin/intake/submissions/{summary['id']}").json()
+    removed = client.patch(
+        f"/api/admin/intake/submissions/{summary['id']}/list-state",
+        json={"removed": True, "expected_revision": detail["revision"]},
+    )
+    assert removed.status_code == 200
+    assert removed.json()["removed_at"] is not None
+    listed = client.get("/api/admin/intake/submissions").json()["items"]
+    assert next(item for item in listed if item["id"] == summary["id"])["removed_at"]
+    with intake_api_context.session_factory() as session:
+        assert session.get(CustomerFormSubmission, summary["id"]) is not None
+        flag = session.get(SystemFlag, f"intake-list-removed:{summary['submission_uuid']}")
+        assert flag is not None
+        assert flag.payload == {"removed": True}
+
+    restored = client.patch(
+        f"/api/admin/intake/submissions/{summary['id']}/list-state",
+        json={"removed": False, "expected_revision": detail["revision"]},
+    )
+    assert restored.status_code == 200
+    assert restored.json()["removed_at"] is None
+
+
 def test_customer_only_archive_and_void_are_idempotent(
     intake_api_context: IntakeApiContext,
 ) -> None:
diff --git a/backend/tests/test_plan_api.py b/backend/tests/test_plan_api.py
index 768fdcc..bc3fb5b 100644
--- a/backend/tests/test_plan_api.py
+++ b/backend/tests/test_plan_api.py
@@ -201,11 +201,16 @@ def test_plan_days_and_task_detail_follow_privacy_boundaries(
         "building",
         "unit",
         "room",
+        "updated_at",
     }
     assert detail["customer"]["address"] == "虚构路 100 号"
     assert detail["cats"][0]["service_notes"] == "虚构服务注意事项"
     assert detail["order_notes"] == "虚构 P4 订单备注"
     assert detail["photo_count"] == 0
+    assert detail["location_scope"] == "customer"
+    assert detail["location_sync_order_count"] == 1
+    assert detail["location_sync_task_count"] == 4
+    assert detail["order_updated_at"]
     for forbidden_key in (
         "phone",
         "wechat_name",
@@ -226,6 +231,42 @@ def test_plan_days_and_task_detail_follow_privacy_boundaries(
     assert client.get("/api/admin/plans/tasks/999999").status_code == 404
 
 
+def test_plan_days_range_returns_order_markers_and_validates_bounds(
+    plan_api_context: PlanApiContext,
+) -> None:
+    client = plan_api_context.client
+    first_order, second_order = create_three_task_plan(client)
+
+    response = client.get(
+        "/api/admin/plans/days",
+        params={"date_from": "2033-10-01", "date_to": "2033-10-02"},
+    )
+    assert response.status_code == 200
+    days = response.json()["items"]
+    assert days[0]["orders"] == [
+        {
+            "order_id": first_order["id"],
+            "customer_name": "P4 第一位虚构客户",
+            "visit_count": 2,
+            "order_status": "confirmed",
+        },
+        {
+            "order_id": second_order["id"],
+            "customer_name": "P4 第二位虚构客户",
+            "visit_count": 1,
+            "order_status": "confirmed",
+        },
+    ]
+    assert days[1]["orders"][0]["visit_count"] == 2
+    assert client.get(
+        "/api/admin/plans/days", params={"date_from": "2033-10-01"}
+    ).status_code == 422
+    assert client.get(
+        "/api/admin/plans/days",
+        params={"date_from": "2033-01-01", "date_to": "2033-03-04"},
+    ).status_code == 422
+
+
 def test_schedule_save_is_atomic_persistent_and_revision_protected(
     plan_api_context: PlanApiContext,
 ) -> None:
diff --git a/backend/tests/test_plan_route_api.py b/backend/tests/test_plan_route_api.py
index 65380c3..c49f80d 100644
--- a/backend/tests/test_plan_route_api.py
+++ b/backend/tests/test_plan_route_api.py
@@ -21,7 +21,9 @@
 )
 from app.maps.factory import UnavailableMapProvider, get_map_services
 from app.models import Customer, Order, Task
-from tests.test_plan_api import PlanApiContext, create_three_task_plan
+from app.services.geocoding import geocode_fingerprint
+from app.services.orders import order_geocode_address
+from tests.test_plan_api import PlanApiContext, create_order, create_three_task_plan
 
 
 @pytest.fixture
@@ -219,6 +221,207 @@ def test_order_save_geocodes_before_explicit_round_trip_preview(
         task["id"] for task in adopted_response.json()["tasks"]
     ] == optimized_task_ids
 
+
+def test_manual_customer_pin_syncs_only_unexecuted_tasks_and_restore_is_fail_safe(
+    plan_api_context: PlanApiContext,
+    fake_map_provider: FakeMapProvider,
+) -> None:
+    client = plan_api_context.client
+    first_order, _ = create_three_task_plan(client)
+    fake_map_provider.geocode_results.extend(
+        [
+            GeocodeResult(GeoPoint(30.11, 120.11), "深圳市", "龙岗区", "440307", "门牌号"),
+            GeocodeResult(GeoPoint(30.12, 120.12), "深圳市", "龙岗区", "440307", "门牌号"),
+        ]
+    )
+    cat_ids = [cat["id"] for cat in first_order["cats"]]
+    same_address_order = create_order(
+        client,
+        customer_id=first_order["customer"]["id"],
+        cat_ids=cat_ids,
+        start_date="2033-10-03",
+        end_date="2033-10-03",
+        visits_per_day=1,
+    )
+    different_address_order = create_order(
+        client,
+        customer_id=first_order["customer"]["id"],
+        cat_ids=cat_ids,
+        start_date="2033-10-04",
+        end_date="2033-10-04",
+        visits_per_day=1,
+    )
+    with plan_api_context.session_factory.begin() as session:
+        different = session.get(Order, different_address_order["id"])
+        assert different is not None
+        different.contact_address = "深圳市龙岗区虚构路 999 号"
+        different.route_latitude = Decimal("22.700001")
+        different.route_longitude = Decimal("114.700002")
+        for task in different.tasks:
+            task.planned_lat = different.route_latitude
+            task.planned_lng = different.route_longitude
+    day_one = client.get("/api/admin/plans/2033-10-01").json()
+    detail = client.get(
+        f"/api/admin/plans/tasks/{day_one['tasks'][0]['id']}"
+    ).json()
+    assert detail["location_scope"] == "customer"
+
+    with plan_api_context.session_factory.begin() as session:
+        historical = session.scalar(
+            select(Task).where(
+                Task.order_id == first_order["id"],
+                Task.service_date == datetime(2033, 10, 2).date(),
+            )
+        )
+        assert historical is not None
+        historical.started_at = datetime(2033, 10, 2, 9, 0, tzinfo=timezone.utc)
+        historical_original = (historical.planned_lat, historical.planned_lng)
+
+    day_one = client.get("/api/admin/plans/2033-10-01").json()
+    detail = client.get(
+        f"/api/admin/plans/tasks/{day_one['tasks'][0]['id']}"
+    ).json()
+    endpoint = f"/api/admin/customers/{detail['customer']['id']}/location"
+    payload = {
+        "latitude": 22.610001,
+        "longitude": 114.050002,
+        "coordinate_system": "GCJ-02",
+        "source_order_id": first_order["id"],
+        "service_date": "2033-10-01",
+        "expected_customer_updated_at": detail["customer"]["updated_at"],
+        "expected_day_revision": day_one["revision"],
+    }
+    wrong_coordinate_system = client.patch(
+        endpoint,
+        json={**payload, "coordinate_system": "WGS-84"},
+    )
+    assert wrong_coordinate_system.status_code == 422
+    response = client.patch(endpoint, json=payload)
+    assert response.status_code == 200
+    result = response.json()
+    assert result["scope"] == "customer"
+    assert result["affected_orders"] == 2
+    assert result["affected_tasks"] == 4
+    assert result["position"] == {"latitude": 22.610001, "longitude": 114.050002}
+
+    with plan_api_context.session_factory() as session:
+        order = session.get(Order, first_order["id"])
+        assert order is not None
+        address = order_geocode_address(order)
+        assert address
+        assert order.route_geocode_status == "manual"
+        assert order.route_geocode_fingerprint == geocode_fingerprint(
+            "manual", address
+        )
+        current_historical = session.get(Task, historical.id)
+        assert current_historical is not None
+        assert (
+            current_historical.planned_lat,
+            current_historical.planned_lng,
+        ) == historical_original
+        changed_tasks = session.scalars(
+            select(Task).where(
+                Task.order_id == first_order["id"],
+                Task.id != historical.id,
+            )
+        ).all()
+        assert all(
+            float(task.planned_lat or 0) == pytest.approx(22.610001)
+            for task in changed_tasks
+        )
+        assert all(
+            float(task.planned_lng or 0) == pytest.approx(114.050002)
+            for task in changed_tasks
+        )
+        same_address = session.get(Order, same_address_order["id"])
+        assert same_address is not None
+        assert float(same_address.route_latitude or 0) == pytest.approx(22.610001)
+        different_address = session.get(Order, different_address_order["id"])
+        assert different_address is not None
+        assert float(different_address.route_latitude or 0) == pytest.approx(22.700001)
+        assert all(
+            float(task.planned_lng or 0) == pytest.approx(114.700002)
+            for task in different_address.tasks
+        )
+
+    route = client.get("/api/admin/plans/2033-10-01/route").json()
+    first_order_markers = [
+        marker for marker in route["markers"] if marker["task_id"] in {
+            task["id"] for task in day_one["tasks"] if task["order_id"] == first_order["id"]
+        }
+    ]
+    assert first_order_markers
+    assert all(marker["position"] == result["position"] for marker in first_order_markers)
+    assert client.patch(endpoint, json=payload).status_code == 409
+
+    geocode_calls_before_inherited_order = len(fake_map_provider.geocode_calls)
+    inherited_order = create_order(
+        client,
+        customer_id=first_order["customer"]["id"],
+        cat_ids=cat_ids,
+        start_date="2033-10-05",
+        end_date="2033-10-05",
+        visits_per_day=1,
+    )
+    assert len(fake_map_provider.geocode_calls) == geocode_calls_before_inherited_order
+    with plan_api_context.session_factory() as session:
+        inherited = session.get(Order, inherited_order["id"])
+        assert inherited is not None
+        assert inherited.route_geocode_status == "manual"
+        assert float(inherited.route_latitude or 0) == pytest.approx(22.610001)
+
+    latest_day = client.get("/api/admin/plans/2033-10-01").json()
+    latest_detail = client.get(
+        f"/api/admin/plans/tasks/{latest_day['tasks'][0]['id']}"
+    ).json()
+    geocode_calls_before_stale_restore = len(fake_map_provider.geocode_calls)
+    stale_restore = client.post(
+        f"/api/admin/customers/{latest_detail['customer']['id']}/location/restore-auto",
+        json={
+            "source_order_id": first_order["id"],
+            "service_date": "2033-10-01",
+            "expected_customer_updated_at": detail["customer"]["updated_at"],
+            "expected_day_revision": latest_day["revision"],
+        },
+    )
+    assert stale_restore.status_code == 409
+    assert len(fake_map_provider.geocode_calls) == geocode_calls_before_stale_restore
+
+    next_geocode_index = len(fake_map_provider.geocode_calls)
+    fake_map_provider.geocode_results[next_geocode_index] = None
+    restore = client.post(
+        f"/api/admin/customers/{latest_detail['customer']['id']}/location/restore-auto",
+        json={
+            "source_order_id": first_order["id"],
+            "service_date": "2033-10-01",
+            "expected_customer_updated_at": latest_detail["customer"]["updated_at"],
+            "expected_day_revision": latest_day["revision"],
+        },
+    )
+    assert restore.status_code == 409
+    with plan_api_context.session_factory() as session:
+        order = session.get(Order, first_order["id"])
+        assert order is not None
+        assert order.route_geocode_status == "manual"
+        assert float(order.route_latitude or 0) == pytest.approx(22.610001)
+
+    changed_customer = client.patch(
+        f"/api/admin/customers/{latest_detail['customer']['id']}",
+        json={"address": "深圳市龙岗区另一条虚构路 1 号"},
+    )
+    assert changed_customer.status_code == 200
+    with plan_api_context.session_factory() as session:
+        customer = session.get(Customer, latest_detail["customer"]["id"])
+        assert customer is not None
+        assert customer.geocode_status == "pending"
+        assert customer.latitude is None
+        assert customer.geocode_fingerprint is None
+        historical_order = session.get(Order, first_order["id"])
+        assert historical_order is not None
+        assert historical_order.route_geocode_status == "manual"
+        assert float(historical_order.route_latitude or 0) == pytest.approx(22.610001)
+
+
 def test_route_preview_caches_order_coordinates_and_ignores_later_profile_changes(
     plan_api_context: PlanApiContext,
     fake_map_provider: FakeMapProvider,
diff --git a/docs/tasks/P26_INTAKE_ORDER_CALENDAR_AND_MAP_PIN.md b/docs/tasks/P26_INTAKE_ORDER_CALENDAR_AND_MAP_PIN.md
new file mode 100644
index 0000000..8cdff14
--- /dev/null
+++ b/docs/tasks/P26_INTAKE_ORDER_CALENDAR_AND_MAP_PIN.md
@@ -0,0 +1,64 @@
+# P26：客户多选日期、订单日历排班与地图锚点
+
+## 背景
+
+公网客户填写页的原生日期区间控件在微信/iPhone 中会越界，也无法表达隔天或每周数次等不连续日期。后台订单详情占据主区域，缺少按月查看订单和按地理路线拖拽排班的统一工作区；自动地理编码发生偏差时也没有手动修正入口。客户填写链接和已作废提交的列表还需要收敛展示。
+
+## 目标
+
+- 公网客户可用自绘日历多选不连续上门日期，也可暂不选择日期提交。
+- 后台审核兼容旧日期区间，新订单仅按选中日期生成一次上门任务。
+- 订单管理以月历和当天排班为主，订单详情改为次级面板。
+- 当天任务支持拖拽排序并与路线地图编号联动。
+- 管理员可在高德地图上点击或拖动锚点，修正客户及相同地址未执行任务的定位。
+- 已作废提交可从当前列表移除并恢复；生成链接默认仅展示最新三条。
+
+## 允许修改范围
+
+- `frontend/src/components/`、`frontend/src/features/`、`frontend/src/pages/`、前端测试与依赖锁文件。
+- `backend/app/api/`、`backend/app/schemas/`、`backend/app/services/`、相关模型读取逻辑与后端测试。
+- 本任务文档和必要的部署/接口说明。
+
+## 禁止修改范围
+
+- 不新增 Alembic 迁移，不修改现有数据库表结构。
+- 不修改公网访问白名单，不开放 `/admin` 或管理 API。
+- 不修改 `.env`、密钥、Cookie、真实客户数据、运行数据库或 NAS 文件。
+- 不重启 Alter 管理的服务，不执行 NAS 更新、发布或数据库迁移。
+- 不暂存或修改 `.codemap/`、`PROJECT_AUDIT.md`。
+
+## 已确定实现要求
+
+- 新 intake 日程使用排序去重后的 `service_dates`，最多 366 天；旧区间数据只读兼容，日历发生编辑后才切换为新语义。
+- 新日程每个日期一次；没有日期可以提交，但不能归档为订单。
+- 月历标记使用订单号，同一订单同日多次显示 `#订单号 ×N`，取消订单不显示。
+- 拖拽仅调整所选日期内的任务顺序，保存复用现有 schedule API 和 revision 校验。
+- 手动锚点只接受 GCJ-02；只改坐标，不改地址文字。客户主档、相同地址未取消/未完成订单及无执行历史任务同步更新，历史任务保持不变。
+- 手动来源使用现有 `geocode_status/geocode_fingerprint/geocode_level` 字段表达；地址改变后手动坐标失效。
+- 公网 Relay/Gateway 的 `service_dates` 协议必须同步，但真实更新需另行确认。
+
+## 验收标准
+
+- 公网填写页不存在原生日期输入框，390×844 与 430×932 无横向越界。
+- 非连续日期经审核归档后只生成对应日期任务，旧每天两次订单不丢失语义。
+- 订单月历、详情面板、拖拽列表和路线编号联动正确；锁定日与 revision 冲突不会被覆盖。
+- 点击/拖动地图锚点后，可信手动坐标按规则同步；自动恢复失败时保留原手动位置。
+- 已作废提交移除/恢复不改变原始提交；链接列表默认三条并可展开。
+- 前后端完整测试、lint、typecheck、普通构建和 public 构建通过。
+
+## 测试命令
+
+```powershell
+npm --prefix frontend test -- --run
+npm --prefix frontend run typecheck
+npm --prefix frontend run lint
+npm --prefix frontend run build
+npm --prefix frontend run build:public
+Set-Location backend
+..\.venv\Scripts\python.exe -m pytest -q
+```
+
+## 返回格式
+
+- 报告实际改动、测试命令和结果、浏览器验收结果、风险与未执行的部署动作。
+- 报告 Git 初始状态、任务分支、提交/远端 SHA、Push、PR 与 CI 状态。
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 13fdf1f..63d3fc9 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -8,6 +8,8 @@
       "name": "catcare-hub-frontend",
       "version": "0.1.0",
       "dependencies": {
+        "@dnd-kit/helpers": "^0.5.0",
+        "@dnd-kit/react": "^0.5.0",
         "lucide-react": "1.33.0",
         "react": "19.2.8",
         "react-dom": "19.2.8",
@@ -500,6 +502,87 @@
         "node": ">=20.19.0"
       }
     },
+    "node_modules/@dnd-kit/abstract": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/abstract/-/abstract-0.5.0.tgz",
+      "integrity": "sha512-hi13iMJgjPX/KDYVKg5VeDIhmYiV6buc9bAX+tCLYf4QdyYjPbsXjn2sPo6m7fQ6SGJBEFgHJ2PemeKDUbwBaA==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/geometry": "^0.5.0",
+        "@dnd-kit/state": "^0.5.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@dnd-kit/collision": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/collision/-/collision-0.5.0.tgz",
+      "integrity": "sha512-xUqRn3lS7oqLkT0AnnHS/STh/Czvwe1UapZFYiLbsUGxopMsQd4teaPCzPouOThoMdGEe+dHWjfqJl6t9iG4mQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/abstract": "^0.5.0",
+        "@dnd-kit/geometry": "^0.5.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@dnd-kit/dom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/dom/-/dom-0.5.0.tgz",
+      "integrity": "sha512-f2xFJp5SYQ8EW/Fbtaa8iBb66hpkWc7qa8vU826KW11/tb44sH+AisZnGtwOOTWTQ0GraqBDr5ixTErww+eKXw==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/abstract": "^0.5.0",
+        "@dnd-kit/collision": "^0.5.0",
+        "@dnd-kit/geometry": "^0.5.0",
+        "@dnd-kit/state": "^0.5.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@dnd-kit/geometry": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/geometry/-/geometry-0.5.0.tgz",
+      "integrity": "sha512-ubHQS1CiSDH8ssYH2xG5BnpwPSFP1tStXXjug7/Ba6qnQdu/EUH47l6QXKIksQnnanfVfDf0aGeevRxgZlj28A==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/state": "^0.5.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@dnd-kit/helpers": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/helpers/-/helpers-0.5.0.tgz",
+      "integrity": "sha512-i4y+51/icSw+OHMr/su19qhnmNhAzh8PnBwXvapFYTd+64oodIyJRiRkB+hhfxAfnur7RYSW8qacDTrXjg2XOg==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/abstract": "^0.5.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@dnd-kit/react": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/react/-/react-0.5.0.tgz",
+      "integrity": "sha512-abQPLI8lmfVE+v/n+pqy5WFxrw6T2Yg0UQZsL78dp5DKci7dKTVDjvLWqvass+XTFtzJmsZEjk1NdqE6xG8Jiw==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/abstract": "^0.5.0",
+        "@dnd-kit/dom": "^0.5.0",
+        "@dnd-kit/state": "^0.5.0",
+        "tslib": "^2.6.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@dnd-kit/state": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/state/-/state-0.5.0.tgz",
+      "integrity": "sha512-y7XbabQqjF58Lk8YmDQuR8l6QjN+Kh4qlGEjUvHuIeasLk1QP+9L5diXS98VMxQIivyMmUtX2//f+3N7qPJX4w==",
+      "license": "MIT",
+      "dependencies": {
+        "@preact/signals-core": "^1.10.0",
+        "tslib": "^2.6.2"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz",
@@ -772,6 +855,16 @@
         "url": "https://github.com/sponsors/Boshen"
       }
     },
+    "node_modules/@preact/signals-core": {
+      "version": "1.14.4",
+      "resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.14.4.tgz",
+      "integrity": "sha512-HNB6HYeYKhQbJ1aKl+YRjrS4+QWHLKX6qKoUsfS/m0vqzsVaEBiZiaKbG/e+NKk2ch5ALQr/ihWaMHxiCuuWHA==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/preact"
+      }
+    },
     "node_modules/@rolldown/binding-android-arm-eabi": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.5.tgz",
@@ -3910,6 +4003,12 @@
         "typescript": ">=4.8.4"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 84ffb9e..0e063e6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -17,6 +17,8 @@
     "test": "vitest"
   },
   "dependencies": {
+    "@dnd-kit/helpers": "^0.5.0",
+    "@dnd-kit/react": "^0.5.0",
     "lucide-react": "1.33.0",
     "react": "19.2.8",
     "react-dom": "19.2.8",
diff --git a/frontend/src/components/ui/CalendarMonthGrid.tsx b/frontend/src/components/ui/CalendarMonthGrid.tsx
new file mode 100644
index 0000000..26220ad
--- /dev/null
+++ b/frontend/src/components/ui/CalendarMonthGrid.tsx
@@ -0,0 +1,47 @@
+import { useMemo, type ReactNode } from "react";
+
+import { localDateValue, monthGrid } from "./calendarDates";
+
+const sundayFirst = ["日", "一", "二", "三", "四", "五", "六"];
+const mondayFirst = ["一", "二", "三", "四", "五", "六", "日"];
+
+interface CalendarMonthGridProps {
+  month: Date;
+  renderDay: (date: Date) => ReactNode;
+  weekStartsOn?: 0 | 1;
+  fixedWeeks?: boolean;
+  weekdayPrefix?: string;
+  className?: string;
+  weekdayClassName?: string;
+  emptyClassName?: string;
+}
+
+export function CalendarMonthGrid({
+  month,
+  renderDay,
+  weekStartsOn = 0,
+  fixedWeeks = false,
+  weekdayPrefix = "",
+  className = "grid grid-cols-7 gap-1 text-center",
+  weekdayClassName = "py-2 text-xs font-medium text-slate-400",
+  emptyClassName = "",
+}: CalendarMonthGridProps) {
+  const cells = useMemo(
+    () => monthGrid(month, weekStartsOn, fixedWeeks),
+    [fixedWeeks, month, weekStartsOn],
+  );
+  const weekdays = weekStartsOn === 1 ? mondayFirst : sundayFirst;
+
+  return (
+    <div className={className}>
+      {weekdays.map((day) => (
+        <div key={day} className={weekdayClassName}>{weekdayPrefix}{day}</div>
+      ))}
+      {cells.map((date, index) => (
+        date
+          ? <div key={localDateValue(date)} className="min-w-0">{renderDay(date)}</div>
+          : <div key={`empty-${index}`} className={emptyClassName} />
+      ))}
+    </div>
+  );
+}
diff --git a/frontend/src/components/ui/MultiDateCalendar.tsx b/frontend/src/components/ui/MultiDateCalendar.tsx
new file mode 100644
index 0000000..19b0457
--- /dev/null
+++ b/frontend/src/components/ui/MultiDateCalendar.tsx
@@ -0,0 +1,90 @@
+import { CalendarDays, ChevronLeft, ChevronRight, RotateCcw } from "lucide-react";
+import { useMemo, useState } from "react";
+
+import { CalendarMonthGrid } from "./CalendarMonthGrid";
+import { localDateValue, parseLocalDate } from "./calendarDates";
+
+function dateSummary(values: string[]): string {
+  if (!values.length) return "暂不确定，可以留空";
+  const formatted = values.slice(0, 3).map((value) => {
+    const date = parseLocalDate(value);
+    return `${date.getMonth() + 1}月${date.getDate()}日`;
+  });
+  return `${formatted.join("、")}${values.length > 3 ? ` 等 ${values.length} 天` : ""}`;
+}
+
+interface MultiDateCalendarProps {
+  values: string[];
+  onChange: (values: string[]) => void;
+  title?: string;
+  disabled?: boolean;
+}
+
+export function MultiDateCalendar({
+  values,
+  onChange,
+  title = "选择预计上门日期",
+  disabled = false,
+}: MultiDateCalendarProps) {
+  const [open, setOpen] = useState(false);
+  const [visibleMonth, setVisibleMonth] = useState(() => (
+    values[0] ? parseLocalDate(values[0]) : new Date()
+  ));
+  const selected = useMemo(() => new Set(values), [values]);
+
+  function toggle(date: Date) {
+    const value = localDateValue(date);
+    const next = new Set(selected);
+    if (next.has(value)) next.delete(value);
+    else next.add(value);
+    onChange([...next].sort());
+  }
+
+  return (
+    <div className="min-w-0 max-w-full">
+      <button
+        type="button"
+        className="flex min-h-14 w-full min-w-0 items-center gap-3 rounded-2xl border border-orange-200 bg-orange-50/60 px-4 py-3 text-left transition hover:border-orange-400 disabled:opacity-60"
+        aria-expanded={open}
+        onClick={() => setOpen((current) => !current)}
+        disabled={disabled}
+      >
+        <CalendarDays className="shrink-0 text-orange-700" size={20} />
+        <span className="min-w-0 flex-1">
+          <span className="block text-sm font-bold text-slate-900">{title}</span>
+          <span className="mt-1 block truncate text-xs text-slate-500">{dateSummary(values)}</span>
+        </span>
+        {values.length ? <span className="shrink-0 rounded-full bg-orange-600 px-2.5 py-1 text-xs font-bold text-white">{values.length} 天</span> : null}
+      </button>
+
+      {open ? (
+        <section className="mt-3 max-w-full overflow-hidden rounded-2xl border border-orange-100 bg-white p-3 shadow-sm" aria-label="预计上门日期日历">
+          <div className="flex items-center justify-between gap-2">
+            <button type="button" className="cc-icon-button" aria-label="上个月" onClick={() => setVisibleMonth((current) => new Date(current.getFullYear(), current.getMonth() - 1, 1))}><ChevronLeft size={18} /></button>
+            <p className="text-sm font-bold text-slate-900">{visibleMonth.getFullYear()} 年 {visibleMonth.getMonth() + 1} 月</p>
+            <button type="button" className="cc-icon-button" aria-label="下个月" onClick={() => setVisibleMonth((current) => new Date(current.getFullYear(), current.getMonth() + 1, 1))}><ChevronRight size={18} /></button>
+          </div>
+          <CalendarMonthGrid
+            month={visibleMonth}
+            className="mt-3 grid min-w-0 grid-cols-7 gap-1 text-center"
+            renderDay={(date) => (
+              <button
+                key={localDateValue(date)}
+                type="button"
+                className={`aspect-square min-h-10 w-full min-w-0 rounded-xl text-sm font-semibold transition ${selected.has(localDateValue(date)) ? "bg-[#FF9500] text-[#1D1D1F] shadow-sm" : "text-slate-700 hover:bg-orange-50"}`}
+                aria-pressed={selected.has(localDateValue(date))}
+                onClick={() => toggle(date)}
+              >
+                {date.getDate()}
+              </button>
+            )}
+          />
+          <div className="mt-3 flex items-center justify-between border-t border-orange-100 pt-3">
+            <button type="button" className="cc-button cc-button--secondary min-h-10 px-3" onClick={() => onChange([])} disabled={!values.length}><RotateCcw size={14} />清空</button>
+            <button type="button" className="cc-button cc-button--primary min-h-10 px-4" onClick={() => setOpen(false)}>完成</button>
+          </div>
+        </section>
+      ) : null}
+    </div>
+  );
+}
diff --git a/frontend/src/components/ui/calendarDates.ts b/frontend/src/components/ui/calendarDates.ts
new file mode 100644
index 0000000..4f9d330
--- /dev/null
+++ b/frontend/src/components/ui/calendarDates.ts
@@ -0,0 +1,41 @@
+export function localDateValue(date = new Date()): string {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
+
+export function parseLocalDate(value: string): Date {
+  const [year, month, day] = value.split("-").map(Number);
+  return new Date(year, month - 1, day);
+}
+
+export function monthGrid(
+  month: Date,
+  weekStartsOn: 0 | 1 = 0,
+  fixedWeeks = false,
+): Array<Date | null> {
+  const first = new Date(month.getFullYear(), month.getMonth(), 1);
+  const offset = (first.getDay() - weekStartsOn + 7) % 7;
+  const lastDay = new Date(month.getFullYear(), month.getMonth() + 1, 0).getDate();
+  const length = fixedWeeks ? 42 : offset + lastDay;
+  return Array.from({ length }, (_, index) => {
+    const day = index - offset + 1;
+    return day >= 1 && day <= lastDay
+      ? new Date(month.getFullYear(), month.getMonth(), day)
+      : null;
+  });
+}
+
+export function expandDateRange(start: string | null, end: string | null): string[] {
+  if (!start || !end) return [];
+  const current = parseLocalDate(start);
+  const last = parseLocalDate(end);
+  if (Number.isNaN(current.getTime()) || Number.isNaN(last.getTime()) || last < current) return [];
+  const values: string[] = [];
+  while (current <= last && values.length < 366) {
+    values.push(localDateValue(current));
+    current.setDate(current.getDate() + 1);
+  }
+  return values;
+}
diff --git a/frontend/src/features/intake/AdminIntakePage.test.tsx b/frontend/src/features/intake/AdminIntakePage.test.tsx
index b4a4b41..78f3da0 100644
--- a/frontend/src/features/intake/AdminIntakePage.test.tsx
+++ b/frontend/src/features/intake/AdminIntakePage.test.tsx
@@ -13,6 +13,7 @@ const apiMocks = vi.hoisted(() => ({
   getIntakeSubmission: vi.fn(),
   saveIntakeReviewDraft: vi.fn(),
   decideIntakeSubmission: vi.fn(),
+  updateIntakeSubmissionListState: vi.fn(),
 }));
 
 vi.mock("./api", () => apiMocks);
@@ -100,12 +101,70 @@ beforeEach(() => {
   apiMocks.updateIntakeToken.mockResolvedValue({ ...token, status: "disabled", submitted_at: null, submission_status: null });
   apiMocks.saveIntakeReviewDraft.mockResolvedValue({ ...detail, status: "reviewed", review_payload: payload, review_unit_price: "30.00", reviewed_at: timestamp, revision: "b".repeat(64) });
   apiMocks.decideIntakeSubmission.mockResolvedValue({ submission_id: 9, submission_uuid: summary.submission_uuid, status: "archived_order", decision_mode: "order", customer_id: 3, order_id: 4, revision: "c".repeat(64) });
+  apiMocks.updateIntakeSubmissionListState.mockResolvedValue(detail);
   Object.defineProperty(navigator, "clipboard", {
     configurable: true,
     value: { writeText: vi.fn().mockResolvedValue(undefined) },
   });
 });
 
+it("shows only the newest three links until expanded", async () => {
+  const links = Array.from({ length: 5 }, (_, index) => ({
+    ...token,
+    id: 20 - index,
+    created_at: `2031-05-0${5 - index}T08:00:00Z`,
+  }));
+  apiMocks.listIntakeTokens.mockResolvedValue({ items: links, total: links.length });
+  renderPage();
+
+  expect(await screen.findByText("链接 #20")).toBeInTheDocument();
+  expect(screen.getByText("链接 #18")).toBeInTheDocument();
+  expect(screen.queryByText("链接 #17")).not.toBeInTheDocument();
+  fireEvent.click(screen.getByRole("button", { name: "展开全部（5）" }));
+  expect(screen.getByText("链接 #16")).toBeInTheDocument();
+  fireEvent.click(screen.getByRole("button", { name: "收起" }));
+  expect(screen.queryByText("链接 #17")).not.toBeInTheDocument();
+});
+
+it("moves a voided record out of the current list and can restore it", async () => {
+  const voidedSummary: IntakeSubmissionSummary = {
+    ...summary,
+    status: "voided",
+    removed_at: null,
+  };
+  const voidedDetail: IntakeSubmissionDetail = {
+    ...detail,
+    ...voidedSummary,
+    status: "voided",
+    voided_at: timestamp,
+    decision_mode: "void",
+  };
+  const removedDetail = { ...voidedDetail, removed_at: "2031-05-02T08:00:00Z" };
+  apiMocks.listIntakeSubmissions.mockResolvedValue({ items: [voidedSummary], total: 1 });
+  apiMocks.getIntakeSubmission.mockResolvedValue(voidedDetail);
+  apiMocks.updateIntakeSubmissionListState
+    .mockResolvedValueOnce(removedDetail)
+    .mockResolvedValueOnce(voidedDetail);
+  renderPage();
+
+  fireEvent.click(await screen.findByRole("button", { name: "从列表移除" }));
+  await waitFor(() => expect(apiMocks.updateIntakeSubmissionListState).toHaveBeenCalledWith(
+    9,
+    true,
+    revision,
+  ));
+  expect(await screen.findByRole("button", { name: "恢复到当前列表" })).toBeInTheDocument();
+  expect(within(screen.getByLabelText("提交记录列表")).getByText("P10 后台虚构客户")).toBeInTheDocument();
+
+  fireEvent.click(screen.getByRole("button", { name: "恢复到当前列表" }));
+  await waitFor(() => expect(apiMocks.updateIntakeSubmissionListState).toHaveBeenLastCalledWith(
+    9,
+    false,
+    revision,
+  ));
+  expect(await screen.findByRole("button", { name: "从列表移除" })).toBeInTheDocument();
+});
+
 it("shows the full editable review while keeping the submission list privacy-minimized", async () => {
   renderPage();
 
diff --git a/frontend/src/features/intake/AdminIntakePage.tsx b/frontend/src/features/intake/AdminIntakePage.tsx
index 63c24c3..69a26cf 100644
--- a/frontend/src/features/intake/AdminIntakePage.tsx
+++ b/frontend/src/features/intake/AdminIntakePage.tsx
@@ -18,6 +18,8 @@ import { type FormEvent, useCallback, useEffect, useRef, useState } from "react"
 import { Link } from "react-router-dom";
 
 import { PageHeader } from "../../components/ui/PageHeader";
+import { MultiDateCalendar } from "../../components/ui/MultiDateCalendar";
+import { expandDateRange } from "../../components/ui/calendarDates";
 import { customerAddress } from "../../lib/customerDisplay";
 import {
   createIntakeToken,
@@ -27,6 +29,7 @@ import {
   listIntakeTokens,
   saveIntakeReviewDraft,
   updateIntakeToken,
+  updateIntakeSubmissionListState,
 } from "./api";
 import { emptyCat, serviceItemOptions } from "./constants";
 import type {
@@ -103,9 +106,11 @@ function replaceSubmission(
     cat_count: detail.cat_count,
     start_date: detail.start_date,
     end_date: detail.end_date,
+    service_dates: detail.service_dates,
     submitted_at: detail.submitted_at,
     updated_at: detail.updated_at,
     revision: detail.revision,
+    removed_at: detail.removed_at,
   } : item);
 }
 
@@ -115,6 +120,7 @@ function DetailRow({ label, value }: { label: string; value: string | null | und
 
 function PayloadDetail({ payload }: { payload: IntakeDraftPayload }) {
   const labels = new Map(serviceItemOptions.map((item) => [item.value, item.label]));
+  const dates = payload.service.service_dates ?? [];
   return (
     <div className="space-y-4">
       <section className="rounded-lg border border-slate-200 bg-white p-4">
@@ -141,7 +147,7 @@ function PayloadDetail({ payload }: { payload: IntakeDraftPayload }) {
       </section>
       <section className="rounded-lg border border-slate-200 bg-white p-4">
         <h3 className="text-sm font-semibold">服务计划</h3>
-        <dl className="mt-4 grid gap-4 sm:grid-cols-2"><DetailRow label="服务日期" value={`${valueOrDash(payload.service.start_date)} 至 ${valueOrDash(payload.service.end_date)}`} /><DetailRow label="每日次数" value={payload.service.visits_per_day ? `${payload.service.visits_per_day} 次` : null} /><DetailRow label="服务事项" value={payload.service.service_items.map((item) => labels.get(item) || item).join("、")} /><DetailRow label="补充备注" value={payload.notes} /><div className="sm:col-span-2"><DetailRow label="客户备注" value={payload.customer.notes} /></div></dl>
+        <dl className="mt-4 grid gap-4 sm:grid-cols-2"><DetailRow label="服务日期" value={dates.length ? `${dates.length} 天：${dates.join("、")}` : `${valueOrDash(payload.service.start_date)} 至 ${valueOrDash(payload.service.end_date)}`} />{dates.length ? null : <DetailRow label="每日次数（旧记录）" value={payload.service.visits_per_day ? `${payload.service.visits_per_day} 次` : null} />}<DetailRow label="服务事项" value={payload.service.service_items.map((item) => labels.get(item) || item).join("、")} /><DetailRow label="补充备注" value={payload.notes} /><div className="sm:col-span-2"><DetailRow label="客户备注" value={payload.customer.notes} /></div></dl>
       </section>
     </div>
   );
@@ -198,6 +204,8 @@ function ReviewEditor({ payload, sourceNote, unitPrice, disabled, onPayloadChang
     onPayloadChange({ ...payload, notes: mergeNote(payload.notes, sourceNote) });
   }
   const optional = (value: string) => value.trim() || null;
+  const serviceDates = payload.service.service_dates
+    ?? expandDateRange(payload.service.start_date, payload.service.end_date);
   return <div className="space-y-4">
     <section className="rounded-lg border border-orange-200 bg-white p-4">
       <div className="flex flex-wrap items-center justify-between gap-3"><div><h3 className="text-sm font-semibold">后台审核稿</h3><p className="mt-1 text-xs text-slate-500">客户原始提交不会被覆盖；这里的修改只用于最终落档和生成订单。</p></div><label className="text-sm font-semibold text-orange-900">每次价格（元）<input className={`${reviewInputClass} w-40 border-orange-300`} type="number" min="0" step="0.01" value={unitPrice} disabled={disabled} onChange={(event) => onUnitPriceChange(event.target.value)} /></label></div>
@@ -241,7 +249,7 @@ function ReviewEditor({ payload, sourceNote, unitPrice, disabled, onPayloadChang
         <label className="text-xs font-medium text-slate-600 sm:col-span-2">服务注意事项<textarea className={`${reviewInputClass} min-h-16`} value={item.service_notes ?? ""} disabled={disabled} onChange={(event) => cat(index, "service_notes", optional(event.target.value))} /></label>
       </div>)}</div>
     </section>
-    <section className="rounded-lg border border-slate-200 bg-white p-4"><h3 className="text-sm font-semibold">服务计划</h3><div className="mt-3 grid gap-4 sm:grid-cols-3"><label className="text-xs font-medium text-slate-600">开始日期<input className={reviewInputClass} type="date" value={payload.service.start_date ?? ""} disabled={disabled} onChange={(event) => service("start_date", optional(event.target.value))} /></label><label className="text-xs font-medium text-slate-600">结束日期<input className={reviewInputClass} type="date" value={payload.service.end_date ?? ""} disabled={disabled} onChange={(event) => service("end_date", optional(event.target.value))} /></label><label className="text-xs font-medium text-slate-600">每日次数<input className={reviewInputClass} type="number" min={1} max={10} value={payload.service.visits_per_day ?? 1} disabled={disabled} onChange={(event) => service("visits_per_day", Number(event.target.value))} /></label></div><fieldset className="mt-4"><legend className="text-xs font-medium text-slate-600">服务事项</legend><div className="mt-2 flex flex-wrap gap-2">{serviceItemOptions.map((option) => <label key={option.value} className="rounded-lg border border-slate-200 bg-slate-50 px-3 py-2 text-xs"><input className="mr-2" type="checkbox" checked={payload.service.service_items.includes(option.value)} disabled={disabled} onChange={() => service("service_items", payload.service.service_items.includes(option.value) ? payload.service.service_items.filter((item) => item !== option.value) : [...payload.service.service_items, option.value])} />{option.label}</label>)}</div></fieldset><label className="mt-4 block text-xs font-medium text-slate-600">本次订单备注<textarea className={`${reviewInputClass} min-h-20`} value={payload.notes ?? ""} disabled={disabled} onChange={(event) => onPayloadChange({ ...payload, notes: optional(event.target.value) })} /></label></section>
+    <section className="rounded-lg border border-slate-200 bg-white p-4"><h3 className="text-sm font-semibold">服务计划</h3><div className="mt-3 max-w-xl"><MultiDateCalendar values={serviceDates} disabled={disabled} title="选择预计上门日期" onChange={(dates) => onPayloadChange({ ...payload, service: { ...payload.service, service_dates: dates, start_date: null, end_date: null, visits_per_day: null } })} /></div>{payload.service.service_dates === null && payload.service.visits_per_day ? <p className="mt-2 text-xs text-amber-700">旧记录当前仍按每天 {payload.service.visits_per_day} 次处理；修改日历后将转换为每个选中日期一次。</p> : null}<fieldset className="mt-4"><legend className="text-xs font-medium text-slate-600">服务事项</legend><div className="mt-2 flex flex-wrap gap-2">{serviceItemOptions.map((option) => <label key={option.value} className="rounded-lg border border-slate-200 bg-slate-50 px-3 py-2 text-xs"><input className="mr-2" type="checkbox" checked={payload.service.service_items.includes(option.value)} disabled={disabled} onChange={() => service("service_items", payload.service.service_items.includes(option.value) ? payload.service.service_items.filter((item) => item !== option.value) : [...payload.service.service_items, option.value])} />{option.label}</label>)}</div></fieldset><label className="mt-4 block text-xs font-medium text-slate-600">本次订单备注<textarea className={`${reviewInputClass} min-h-20`} value={payload.notes ?? ""} disabled={disabled} onChange={(event) => onPayloadChange({ ...payload, notes: optional(event.target.value) })} /></label></section>
   </div>;
 }
 
@@ -258,9 +266,12 @@ export function IntakeWorkspace({ embedded = false }: { embedded?: boolean }) {
   const [action, setAction] = useState<string | null>(null);
   const [confirmingDecision, setConfirmingDecision] = useState<IntakeDecisionMode | null>(null);
   const [copiedId, setCopiedId] = useState<number | null>(null);
+  const [linksExpanded, setLinksExpanded] = useState(false);
+  const [showRemoved, setShowRemoved] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const decisionKeys = useRef(new Map<string, string>());
   const selectedIdRef = useRef<number | null>(null);
+  const showRemovedRef = useRef(false);
 
   useEffect(() => { selectedIdRef.current = selectedId; }, [selectedId]);
 
@@ -275,9 +286,12 @@ export function IntakeWorkspace({ embedded = false }: { embedded?: boolean }) {
       setTokens(tokenResponse.items);
       setSubmissions(submissionResponse.items);
       setLoadedOnce(true);
-      setSelectedId((current) => current && submissionResponse.items.some((item) => item.id === current)
+      const matchingSubmissions = submissionResponse.items.filter(
+        (item) => Boolean(item.removed_at) === showRemovedRef.current,
+      );
+      setSelectedId((current) => current && matchingSubmissions.some((item) => item.id === current)
         ? current
-        : submissionResponse.items[0]?.id ?? null);
+        : matchingSubmissions[0]?.id ?? null);
       const activeId = selectedIdRef.current;
       if (!silent && activeId && submissionResponse.items.some((item) => item.id === activeId)) {
         const refreshedDetail = await getIntakeSubmission(activeId);
@@ -441,6 +455,33 @@ export function IntakeWorkspace({ embedded = false }: { embedded?: boolean }) {
     }
   }
 
+  async function handleListState(removed: boolean) {
+    if (!detail) return;
+    setAction("list-state");
+    setError(null);
+    try {
+      const updated = await updateIntakeSubmissionListState(detail.id, removed, detail.revision);
+      setDetail(updated);
+      setSubmissions((current) => replaceSubmission(current, updated));
+      showRemovedRef.current = removed;
+      setShowRemoved(removed);
+      setSelectedId(updated.id);
+    } catch (cause) {
+      setError(cause instanceof Error ? cause.message : "列表状态修改失败，请刷新后重试。");
+    } finally {
+      setAction(null);
+    }
+  }
+
+  function selectSubmissionList(removed: boolean) {
+    showRemovedRef.current = removed;
+    setShowRemoved(removed);
+    const first = submissions.find((item) => Boolean(item.removed_at) === removed);
+    setSelectedId(first?.id ?? null);
+    if (!first) setDetail(null);
+    setConfirmingDecision(null);
+  }
+
   const reviewDirty = Boolean(
     detail
     && reviewDraft
@@ -450,7 +491,11 @@ export function IntakeWorkspace({ embedded = false }: { embedded?: boolean }) {
     ),
   );
   const reviewSaved = Boolean(detail?.review_payload && !reviewDirty);
-  const orderReady = Boolean(reviewSaved && detail?.review_unit_price !== null);
+  const hasServiceSchedule = Boolean(reviewDraft && (
+    (reviewDraft.service.service_dates?.length ?? 0) > 0
+    || (reviewDraft.service.start_date && reviewDraft.service.end_date && reviewDraft.service.visits_per_day)
+  ));
+  const orderReady = Boolean(reviewSaved && detail?.review_unit_price !== null && hasServiceSchedule);
   const canEdit = detail?.status === "submitted" || detail?.status === "reviewed";
   const canDecide = canEdit || detail?.status === "processing";
   const terminal = Boolean(detail && [
@@ -460,6 +505,8 @@ export function IntakeWorkspace({ embedded = false }: { embedded?: boolean }) {
     "voided",
     "redacted",
   ].includes(detail.status));
+  const visibleSubmissions = submissions.filter((item) => Boolean(item.removed_at) === showRemoved);
+  const visibleTokens = linksExpanded ? tokens : tokens.slice(0, 3);
 
   return (
     <section className={embedded ? "mt-6" : "cc-page cc-page--wide"} aria-labelledby="intake-title">
@@ -482,14 +529,14 @@ export function IntakeWorkspace({ embedded = false }: { embedded?: boolean }) {
 
           <section className="cc-surface overflow-hidden" aria-labelledby="links-title">
             <div className="border-b border-slate-200 px-5 py-4"><h2 id="links-title" className="font-semibold">填写链接（{tokens.length}）</h2></div>
-            {loading ? <div className="flex items-center justify-center gap-2 py-12 text-sm text-slate-500"><LoaderCircle className="animate-spin" size={17} />正在加载…</div> : !loadedOnce && error ? <p className="px-5 py-10 text-center text-sm font-medium text-red-700">云端暂不可用，未把失败当作空列表。</p> : tokens.length === 0 ? <p className="px-5 py-10 text-center text-sm text-slate-500">还没有填写链接。</p> : <ul className="divide-y divide-slate-100">{tokens.map((token) => <li key={token.id} className="p-4"><div className="flex flex-wrap items-start justify-between gap-3"><div><div className="flex flex-wrap items-center gap-2"><span className="text-sm font-semibold">链接 #{token.id}</span><span className={`rounded-full px-2 py-0.5 text-xs font-medium ${token.status === "active" ? "bg-emerald-50 text-emerald-700" : "bg-slate-100 text-slate-600"}`}>{tokenStatusLabels[token.status]}</span>{token.submission_status ? <span className="rounded-full bg-blue-50 px-2 py-0.5 text-xs font-medium text-blue-700">{submissionStatusLabels[token.submission_status]}</span> : null}</div><p className="mt-2 text-xs text-slate-500">有效期至 {dateTime(token.expires_at)}</p>{token.fill_path ? <p className="mt-1 text-xs font-medium text-amber-700">新链接仅本次可查看，请立即复制保存</p> : <p className="mt-1 text-xs text-slate-400">链接原文未保存；需要时请重新生成</p>}</div></div><div className="mt-3 flex flex-wrap gap-2">{token.fill_path ? <><a href={token.fill_path} target="_blank" rel="noreferrer" className="inline-flex items-center gap-1.5 rounded-md border border-slate-300 px-2.5 py-1.5 text-xs font-medium"><ExternalLink size={13} />打开</a><button type="button" className="inline-flex items-center gap-1.5 rounded-md border border-slate-300 px-2.5 py-1.5 text-xs font-medium" onClick={() => void handleCopy(token)}><ClipboardCopy size={13} />{copiedId === token.id ? "已复制" : "复制"}</button></> : null}{!token.submitted_at && token.status !== "expired" ? <button type="button" className="rounded-md border border-slate-300 px-2.5 py-1.5 text-xs font-medium disabled:opacity-50" onClick={() => void handleTokenStatus(token)} disabled={action === `token-${token.id}`}>{token.status === "active" ? "关闭" : "恢复"}</button> : null}</div></li>)}</ul>}
+            {loading ? <div className="flex items-center justify-center gap-2 py-12 text-sm text-slate-500"><LoaderCircle className="animate-spin" size={17} />正在加载…</div> : !loadedOnce && error ? <p className="px-5 py-10 text-center text-sm font-medium text-red-700">云端暂不可用，未把失败当作空列表。</p> : tokens.length === 0 ? <p className="px-5 py-10 text-center text-sm text-slate-500">还没有填写链接。</p> : <><ul className="divide-y divide-slate-100">{visibleTokens.map((token) => <li key={token.id} className="p-4"><div className="flex flex-wrap items-start justify-between gap-3"><div><div className="flex flex-wrap items-center gap-2"><span className="text-sm font-semibold">链接 #{token.id}</span><span className={`rounded-full px-2 py-0.5 text-xs font-medium ${token.status === "active" ? "bg-emerald-50 text-emerald-700" : "bg-slate-100 text-slate-600"}`}>{tokenStatusLabels[token.status]}</span>{token.submission_status ? <span className="rounded-full bg-blue-50 px-2 py-0.5 text-xs font-medium text-blue-700">{submissionStatusLabels[token.submission_status]}</span> : null}</div><p className="mt-2 text-xs text-slate-500">有效期至 {dateTime(token.expires_at)}</p>{token.fill_path ? <p className="mt-1 text-xs font-medium text-amber-700">新链接仅本次可查看，请立即复制保存</p> : <p className="mt-1 text-xs text-slate-400">链接原文未保存；需要时请重新生成</p>}</div></div><div className="mt-3 flex flex-wrap gap-2">{token.fill_path ? <><a href={token.fill_path} target="_blank" rel="noreferrer" className="inline-flex items-center gap-1.5 rounded-md border border-slate-300 px-2.5 py-1.5 text-xs font-medium"><ExternalLink size={13} />打开</a><button type="button" className="inline-flex items-center gap-1.5 rounded-md border border-slate-300 px-2.5 py-1.5 text-xs font-medium" onClick={() => void handleCopy(token)}><ClipboardCopy size={13} />{copiedId === token.id ? "已复制" : "复制"}</button></> : null}{!token.submitted_at && token.status !== "expired" ? <button type="button" className="rounded-md border border-slate-300 px-2.5 py-1.5 text-xs font-medium disabled:opacity-50" onClick={() => void handleTokenStatus(token)} disabled={action === `token-${token.id}`}>{token.status === "active" ? "关闭" : "恢复"}</button> : null}</div></li>)}</ul>{tokens.length > 3 ? <div className="border-t border-slate-100 p-3 text-center"><button type="button" className="text-sm font-medium text-orange-700" onClick={() => setLinksExpanded((value) => !value)}>{linksExpanded ? "收起" : `展开全部（${tokens.length}）`}</button></div> : null}</>}
           </section>
         </div>
 
         <section className="cc-surface min-w-0 overflow-hidden" aria-labelledby="submissions-title">
-          <div className="border-b border-slate-200 px-5 py-4"><h2 id="submissions-title" className="font-semibold">提交审核（{submissions.length}）</h2><p className="mt-1 text-xs text-slate-500">列表仅显示摘要；完整地址、门禁和钥匙只在右侧详情中读取。</p></div>
+          <div className="flex flex-wrap items-center justify-between gap-3 border-b border-slate-200 px-5 py-4"><div><h2 id="submissions-title" className="font-semibold">提交审核（{visibleSubmissions.length}）</h2><p className="mt-1 text-xs text-slate-500">列表仅显示摘要；完整地址、门禁和钥匙只在右侧详情中读取。</p></div><div className="inline-flex rounded-lg border border-slate-200 bg-slate-50 p-1 text-xs font-medium"><button type="button" className={`rounded-md px-3 py-1.5 ${!showRemoved ? "bg-white text-slate-950 shadow-sm" : "text-slate-500"}`} onClick={() => selectSubmissionList(false)}>当前记录</button><button type="button" className={`rounded-md px-3 py-1.5 ${showRemoved ? "bg-white text-slate-950 shadow-sm" : "text-slate-500"}`} onClick={() => selectSubmissionList(true)}>已移除记录</button></div></div>
           <div className="grid min-h-[600px] lg:grid-cols-[260px_minmax(0,1fr)]">
-            <aside className="cc-scrollbar overflow-y-auto border-b border-slate-200 bg-slate-50/60 lg:border-r lg:border-b-0" aria-label="提交记录列表">{loading ? <div className="flex justify-center py-12"><LoaderCircle className="animate-spin text-slate-400" size={18} /></div> : !loadedOnce && error ? <p className="px-4 py-12 text-center text-sm font-medium text-red-700">云端暂不可用，请稍后刷新。</p> : submissions.length === 0 ? <p className="px-4 py-12 text-center text-sm text-slate-500">还没有客户提交。</p> : <ul className="p-2">{submissions.map((item) => <li key={item.id}><button type="button" className={`mb-1 w-full rounded-xl px-3 py-3 text-left ${selectedId === item.id ? "bg-orange-50 text-slate-950 shadow-sm ring-1 ring-orange-200" : "hover:bg-slate-100"}`} onClick={() => { setSelectedId(item.id); setConfirmingDecision(null); }}><div className="flex items-start justify-between gap-2"><span className="truncate text-sm font-semibold">{item.customer_name || "未填写名称"}</span><span className={`shrink-0 text-[11px] ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{submissionStatusLabels[item.status]}</span></div><p className={`mt-1 truncate text-xs ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{item.cat_count} 只猫</p><p className={`mt-2 text-xs ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{item.start_date || "日期未填"} 至 {item.end_date || "—"}</p></button></li>)}</ul>}</aside>
+            <aside className="cc-scrollbar overflow-y-auto border-b border-slate-200 bg-slate-50/60 lg:border-r lg:border-b-0" aria-label="提交记录列表">{loading ? <div className="flex justify-center py-12"><LoaderCircle className="animate-spin text-slate-400" size={18} /></div> : !loadedOnce && error ? <p className="px-4 py-12 text-center text-sm font-medium text-red-700">云端暂不可用，请稍后刷新。</p> : visibleSubmissions.length === 0 ? <p className="px-4 py-12 text-center text-sm text-slate-500">{showRemoved ? "还没有已移除记录。" : "还没有客户提交。"}</p> : <ul className="p-2">{visibleSubmissions.map((item) => { const serviceDates = item.service_dates ?? []; return <li key={item.id}><button type="button" className={`mb-1 w-full rounded-xl px-3 py-3 text-left ${selectedId === item.id ? "bg-orange-50 text-slate-950 shadow-sm ring-1 ring-orange-200" : "hover:bg-slate-100"}`} onClick={() => { setSelectedId(item.id); setConfirmingDecision(null); }}><div className="flex items-start justify-between gap-2"><span className="truncate text-sm font-semibold">{item.customer_name || "未填写名称"}</span><span className={`shrink-0 text-[11px] ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{submissionStatusLabels[item.status]}</span></div><p className={`mt-1 truncate text-xs ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{item.cat_count} 只猫</p><p className={`mt-2 text-xs ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{serviceDates.length ? `${serviceDates.length} 天 · ${serviceDates.slice(0, 2).join("、")}${serviceDates.length > 2 ? "…" : ""}` : `${item.start_date || "日期未填"} 至 ${item.end_date || "—"}`}</p></button></li>; })}</ul>}</aside>
             <div className="min-w-0 bg-slate-50/40 p-4 sm:p-5">
               {selectedId !== null && detail?.id !== selectedId ? <div className="flex items-center justify-center gap-2 py-20 text-sm text-slate-500"><LoaderCircle className="animate-spin" size={18} />正在读取敏感详情…</div> : !detail ? <div className="flex min-h-80 flex-col items-center justify-center text-center text-sm text-slate-500"><FileCheck2 className="text-slate-300" size={34} /><p className="mt-3">选择一条提交查看详情。</p></div> : <div>
                 <div className="mb-4 flex flex-wrap items-start justify-between gap-3">
@@ -503,7 +550,7 @@ export function IntakeWorkspace({ embedded = false }: { embedded?: boolean }) {
                 </div>
                 {detail.status === "processing" ? <div className="mb-4 rounded-lg border border-blue-200 bg-blue-50 p-3 text-sm text-blue-800">云端记录正在处理。如上次因回写失败中断，请使用同一动作重试；本机唯一回执会阻止重复建档。</div> : null}
                 {confirmingDecision ? <div className="mb-4 rounded-lg border border-amber-300 bg-amber-50 p-4" role="alertdialog" aria-label="确认审核动作"><p className="text-sm font-semibold text-amber-950">{confirmingDecision === "customer" ? "确认新建客户档案（不会设置为已归档），并创建已补齐名称的猫咪？" : confirmingDecision === "order" ? "确认新建客户、猫咪、已确认订单和每日任务？" : "确认作废本次提交？"}</p><p className="mt-1 text-xs leading-5 text-amber-800">客户原稿保持只读；失败不会留下半套订单，重复重试不会重复建档。</p><div className="mt-3 flex justify-end gap-2"><button type="button" className="rounded-md border border-amber-300 bg-white px-3 py-2 text-sm font-medium text-amber-900" onClick={() => setConfirmingDecision(null)}>取消</button><button type="button" className="rounded-md bg-slate-900 px-3 py-2 text-sm font-medium text-white" onClick={() => void handleDecision(confirmingDecision)}>{action === `decision-${confirmingDecision}` ? <LoaderCircle className="inline animate-spin" size={14} /> : null}确认执行</button></div></div> : null}
-                {terminal ? <div className={`mb-4 rounded-lg border p-4 text-sm ${detail.status === "voided" ? "border-slate-300 bg-slate-100 text-slate-800" : "border-emerald-200 bg-emerald-50 text-emerald-900"}`}><p className="font-semibold">{detail.status === "voided" ? "该提交已作废。" : detail.status === "redacted" ? "云端敏感资料已按期限清理。" : "已完成本机幂等归档。"}</p><div className="mt-2 flex flex-wrap gap-3">{detail.converted_customer_id ? <Link className="font-medium underline underline-offset-4" to="/admin/customers">查看客户 #{detail.converted_customer_id}</Link> : null}{detail.converted_order_id ? <Link className="font-medium underline underline-offset-4" to="/admin/orders">查看订单 #{detail.converted_order_id}</Link> : null}</div></div> : null}
+                {terminal ? <div className={`mb-4 rounded-lg border p-4 text-sm ${detail.status === "voided" ? "border-slate-300 bg-slate-100 text-slate-800" : "border-emerald-200 bg-emerald-50 text-emerald-900"}`}><p className="font-semibold">{detail.status === "voided" ? "该提交已作废。" : detail.status === "redacted" ? "云端敏感资料已按期限清理。" : "已完成本机幂等归档。"}</p><div className="mt-2 flex flex-wrap items-center gap-3">{detail.converted_customer_id ? <Link className="font-medium underline underline-offset-4" to="/admin/customers">查看客户 #{detail.converted_customer_id}</Link> : null}{detail.converted_order_id ? <Link className="font-medium underline underline-offset-4" to="/admin/orders">查看订单 #{detail.converted_order_id}</Link> : null}{detail.status === "voided" || (detail.status === "redacted" && detail.decision_mode === "void") ? <button type="button" className="font-medium text-slate-700 underline underline-offset-4 disabled:opacity-50" disabled={action !== null} onClick={() => void handleListState(!detail.removed_at)}>{detail.removed_at ? "恢复到当前列表" : "从列表移除"}</button> : null}</div></div> : null}
                 {terminal ? <PayloadDetail payload={detail.review_payload ?? detail.payload} /> : reviewDraft ? <><ReviewEditor payload={reviewDraft} sourceNote={detail.payload.notes} unitPrice={unitPrice} disabled={action !== null || detail.status === "processing"} onPayloadChange={setReviewDraft} onUnitPriceChange={setUnitPrice} /><details className="mt-4 rounded-lg border border-slate-200 bg-white p-4"><summary className="cursor-pointer text-sm font-semibold">查看客户原始提交（永久只读）</summary><div className="mt-4"><PayloadDetail payload={detail.payload} /></div></details></> : null}
                 <AuditTimeline events={detail.audit_events} />
               </div>}
diff --git a/frontend/src/features/intake/api.ts b/frontend/src/features/intake/api.ts
index 4e255af..944fdeb 100644
--- a/frontend/src/features/intake/api.ts
+++ b/frontend/src/features/intake/api.ts
@@ -97,6 +97,17 @@ export function getIntakeSubmission(submissionId: number): Promise<IntakeSubmiss
   return request<IntakeSubmissionDetail>(`${adminPath}/submissions/${submissionId}`);
 }
 
+export function updateIntakeSubmissionListState(
+  submissionId: number,
+  removed: boolean,
+  expectedRevision: string,
+): Promise<IntakeSubmissionDetail> {
+  return request<IntakeSubmissionDetail>(`${adminPath}/submissions/${submissionId}/list-state`, {
+    method: "PATCH",
+    body: JSON.stringify({ removed, expected_revision: expectedRevision }),
+  });
+}
+
 export function reviewIntakeSubmission(
   submissionId: number,
   expectedRevision: string,
diff --git a/frontend/src/features/intake/constants.ts b/frontend/src/features/intake/constants.ts
index f830759..5979df3 100644
--- a/frontend/src/features/intake/constants.ts
+++ b/frontend/src/features/intake/constants.ts
@@ -56,9 +56,10 @@ export function editableDraft(draft: IntakeDraftPayload | null): IntakeDraftPayl
       customer: { ...emptyCustomer },
       cats: [emptyCat()],
       service: {
+        service_dates: [],
         start_date: null,
         end_date: null,
-        visits_per_day: 1,
+        visits_per_day: null,
         service_items: ["feed", "water", "litter", "photo"],
       },
       notes: null,
@@ -70,7 +71,11 @@ export function editableDraft(draft: IntakeDraftPayload | null): IntakeDraftPayl
     cats: draft.cats.length ? draft.cats : [emptyCat()],
     service: {
       ...draft.service,
-      visits_per_day: draft.service.visits_per_day ?? 1,
+      service_dates: draft.service.service_dates ?? null,
+      visits_per_day: draft.service.service_dates !== null
+        && draft.service.service_dates !== undefined
+        ? null
+        : draft.service.visits_per_day ?? 1,
       service_items: draft.service.service_items.length
         ? draft.service.service_items
         : ["feed", "water", "litter", "photo"],
@@ -86,7 +91,17 @@ export const emptyPublicCat = (): PublicIntakeCatDraft => ({
 export function publicEditableDraft(
   draft: PublicIntakeDraftPayload | null,
 ): PublicIntakeDraftPayload {
-  if (draft) return draft;
+  if (draft) {
+    return {
+      ...draft,
+      service: {
+        service_dates: draft.service.service_dates ?? null,
+        start_date: draft.service.start_date ?? null,
+        end_date: draft.service.end_date ?? null,
+        visits_per_day: draft.service.visits_per_day ?? null,
+      },
+    };
+  }
   return {
     customer: {
       name: null,
@@ -101,6 +116,7 @@ export function publicEditableDraft(
     },
     cats: [],
     service: {
+      service_dates: [],
       start_date: null,
       end_date: null,
       visits_per_day: null,
diff --git a/frontend/src/features/intake/types.ts b/frontend/src/features/intake/types.ts
index 16503ce..6669c00 100644
--- a/frontend/src/features/intake/types.ts
+++ b/frontend/src/features/intake/types.ts
@@ -55,6 +55,7 @@ export interface IntakeCatDraft {
 }
 
 export interface IntakeServiceDraft {
+  service_dates?: string[] | null;
   start_date: string | null;
   end_date: string | null;
   visits_per_day: number | null;
@@ -98,6 +99,7 @@ export interface PublicIntakeCatDraft {
 }
 
 export interface PublicIntakeServiceDraft {
+  service_dates?: string[] | null;
   start_date: string | null;
   end_date: string | null;
   visits_per_day: number | null;
@@ -142,9 +144,11 @@ export interface IntakeSubmissionSummary {
   cat_count: number;
   start_date: string | null;
   end_date: string | null;
+  service_dates?: string[];
   submitted_at: string | null;
   updated_at: string;
   revision: string;
+  removed_at?: string | null;
 }
 
 export interface IntakeSubmissionList {
diff --git a/frontend/src/features/orders/OrderForm.tsx b/frontend/src/features/orders/OrderForm.tsx
index ace0150..90f2066 100644
--- a/frontend/src/features/orders/OrderForm.tsx
+++ b/frontend/src/features/orders/OrderForm.tsx
@@ -18,6 +18,8 @@ import {
   type KeyboardEvent as ReactKeyboardEvent,
 } from "react";
 
+import { CalendarMonthGrid } from "../../components/ui/CalendarMonthGrid";
+import { localDateValue, parseLocalDate } from "../../components/ui/calendarDates";
 import { serviceItemOptions } from "./constants";
 import { parseOrderAddress } from "./addressParser";
 import {
@@ -41,30 +43,6 @@ import type {
 const inputClass = "mt-1.5 min-h-11 w-full rounded-xl border border-slate-300 bg-white px-3.5 py-2.5 text-sm text-slate-950 outline-none transition focus:border-orange-500 focus:ring-4 focus:ring-orange-100";
 const labelClass = "block text-sm font-medium text-slate-700";
 const defaultServices: ServiceItem[] = ["feed", "water", "litter", "photo"];
-const weekDays = ["一", "二", "三", "四", "五", "六", "日"];
-
-function localDateValue(date = new Date()): string {
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, "0");
-  const day = String(date.getDate()).padStart(2, "0");
-  return `${year}-${month}-${day}`;
-}
-
-function parseLocalDate(value: string): Date {
-  const [year, month, day] = value.split("-").map(Number);
-  return new Date(year, month - 1, day);
-}
-
-function monthGrid(month: Date): Array<Date | null> {
-  const first = new Date(month.getFullYear(), month.getMonth(), 1);
-  const offset = (first.getDay() + 6) % 7;
-  const days = new Date(month.getFullYear(), month.getMonth() + 1, 0).getDate();
-  return Array.from({ length: 42 }, (_, index) => {
-    const day = index - offset + 1;
-    return day >= 1 && day <= days ? new Date(month.getFullYear(), month.getMonth(), day) : null;
-  });
-}
-
 function optionalValue(value: string): string | null {
   return value.trim() || null;
 }
@@ -175,7 +153,6 @@ export function OrderForm({ options, initial, onCancel, onSave }: OrderFormProps
   }, [onCancel, saving]);
 
   const selectedSet = useMemo(() => new Set(selectedDates), [selectedDates]);
-  const calendarDays = useMemo(() => monthGrid(visibleMonth), [visibleMonth]);
   const adjustmentValue = adjustmentType === "none" ? 0 : Number(adjustmentAmount) || 0;
   const initialVisitCounts = useMemo(
     () => new Map(initial?.service_schedule.map((entry) => [entry.service_date, entry.visit_count]) ?? []),
@@ -449,7 +426,13 @@ export function OrderForm({ options, initial, onCancel, onSave }: OrderFormProps
                   <div className="flex items-center justify-between gap-3"><div><h3 id="order-schedule-fields" className="text-sm font-semibold text-slate-950">服务日期</h3><p className="mt-1 text-xs text-slate-500">点击日期添加，再次点击取消；可以选择不连续日期。</p></div><span className="rounded-full bg-orange-50 px-3 py-1 text-xs font-semibold text-orange-700">已选 {selectedDates.length} 天</span></div>
                   <div className="mt-3 rounded-2xl border border-slate-200 bg-white p-3 sm:p-4">
                     <div className="flex items-center justify-between"><button type="button" className="cc-icon-button" aria-label="上个月" onClick={() => setVisibleMonth(new Date(visibleMonth.getFullYear(), visibleMonth.getMonth() - 1, 1))}><ChevronLeft size={17} /></button><p className="text-sm font-semibold">{visibleMonth.getFullYear()} 年 {visibleMonth.getMonth() + 1} 月</p><button type="button" className="cc-icon-button" aria-label="下个月" onClick={() => setVisibleMonth(new Date(visibleMonth.getFullYear(), visibleMonth.getMonth() + 1, 1))}><ChevronRight size={17} /></button></div>
-                    <div className="mt-3 grid grid-cols-7 gap-1 text-center">{weekDays.map((day) => <span key={day} className="py-2 text-xs font-medium text-slate-400">{day}</span>)}{calendarDays.map((date, index) => date ? <button key={localDateValue(date)} type="button" aria-pressed={selectedSet.has(localDateValue(date))} className={`aspect-square min-h-10 rounded-xl text-sm font-medium transition disabled:cursor-not-allowed disabled:opacity-60 ${selectedSet.has(localDateValue(date)) ? "bg-[#FF9500] text-[#1D1D1F] shadow-sm" : "text-slate-700 hover:bg-orange-50 hover:text-orange-700"}`} onClick={() => toggleDate(date)} disabled={historyLocked}>{date.getDate()}</button> : <span key={`empty-${index}`} />)}</div>
+                    <CalendarMonthGrid
+                      month={visibleMonth}
+                      weekStartsOn={1}
+                      fixedWeeks
+                      className="mt-3 grid grid-cols-7 gap-1 text-center"
+                      renderDay={(date) => <button type="button" aria-pressed={selectedSet.has(localDateValue(date))} className={`aspect-square min-h-10 w-full rounded-xl text-sm font-medium transition disabled:cursor-not-allowed disabled:opacity-60 ${selectedSet.has(localDateValue(date)) ? "bg-[#FF9500] text-[#1D1D1F] shadow-sm" : "text-slate-700 hover:bg-orange-50 hover:text-orange-700"}`} onClick={() => toggleDate(date)} disabled={historyLocked}>{date.getDate()}</button>}
+                    />
                   </div>
                 </section>
 
diff --git a/frontend/src/features/orders/OrderScheduleCalendar.tsx b/frontend/src/features/orders/OrderScheduleCalendar.tsx
new file mode 100644
index 0000000..2329a5f
--- /dev/null
+++ b/frontend/src/features/orders/OrderScheduleCalendar.tsx
@@ -0,0 +1,97 @@
+import { CalendarDays, ChevronLeft, ChevronRight } from "lucide-react";
+import { useEffect, useMemo, useState } from "react";
+
+import { CalendarMonthGrid } from "../../components/ui/CalendarMonthGrid";
+import { localDateValue, parseLocalDate } from "../../components/ui/calendarDates";
+import { DailyPlansPage } from "../plans/DailyPlansPage";
+import { getPlanDays } from "../plans/api";
+import type { PlanDaySummary } from "../plans/types";
+
+function monthBounds(month: Date): [string, string] {
+  return [
+    localDateValue(new Date(month.getFullYear(), month.getMonth(), 1)),
+    localDateValue(new Date(month.getFullYear(), month.getMonth() + 1, 0)),
+  ];
+}
+
+interface OrderScheduleCalendarProps {
+  selectedDate: string;
+  onSelectDate: (date: string) => void;
+  onSelectOrder: (orderId: number) => void;
+}
+
+export function OrderScheduleCalendar({ selectedDate, onSelectDate, onSelectOrder }: OrderScheduleCalendarProps) {
+  const [visibleMonth, setVisibleMonth] = useState(() => parseLocalDate(selectedDate));
+  const [days, setDays] = useState<PlanDaySummary[]>([]);
+  const [error, setError] = useState<string | null>(null);
+  const [dirty, setDirty] = useState(false);
+  const dayMap = useMemo(() => new Map(days.map((day) => [day.service_date, day])), [days]);
+
+  useEffect(() => {
+    let active = true;
+    const [from, to] = monthBounds(visibleMonth);
+    getPlanDays(from, to)
+      .then((response) => {
+        if (!active) return;
+        setError(null);
+        setDays(response.items);
+      })
+      .catch((cause: unknown) => {
+        if (active) setError(cause instanceof Error ? cause.message : "月历排班加载失败，请重试。");
+      });
+    return () => { active = false; };
+  }, [visibleMonth]);
+
+  function changeMonth(offset: number) {
+    if (dirty) return;
+    setVisibleMonth((current) => new Date(current.getFullYear(), current.getMonth() + offset, 1));
+  }
+
+  function selectToday() {
+    if (dirty) return;
+    const today = new Date();
+    setVisibleMonth(new Date(today.getFullYear(), today.getMonth(), 1));
+    onSelectDate(localDateValue(today));
+  }
+
+  return (
+    <main className="min-w-0 bg-slate-50/60 p-4 sm:p-5" aria-label="订单月历与当天排班">
+      <section className="rounded-xl border border-slate-200 bg-white p-4 shadow-sm" aria-labelledby="order-calendar-title">
+        <div className="flex flex-wrap items-center justify-between gap-3">
+          <div><h3 id="order-calendar-title" className="flex items-center gap-2 font-semibold"><CalendarDays size={18} />订单月历</h3><p className="mt-1 text-xs text-slate-500">点击日期查看当天排班；点击订单编号打开右侧详情。</p></div>
+          <div className="flex items-center gap-2">
+            <button type="button" className="cc-icon-button" aria-label="上个月" onClick={() => changeMonth(-1)} disabled={dirty}><ChevronLeft size={17} /></button>
+            <span className="min-w-28 text-center text-sm font-semibold">{visibleMonth.getFullYear()} 年 {visibleMonth.getMonth() + 1} 月</span>
+            <button type="button" className="cc-icon-button" aria-label="下个月" onClick={() => changeMonth(1)} disabled={dirty}><ChevronRight size={17} /></button>
+            <button type="button" className="cc-button cc-button--secondary min-h-9 px-3 text-xs whitespace-nowrap" onClick={selectToday} disabled={dirty}>今天</button>
+          </div>
+        </div>
+        {error ? <p className="mt-3 rounded-lg bg-red-50 px-3 py-2 text-xs text-red-700">{error}</p> : null}
+        <CalendarMonthGrid
+          month={visibleMonth}
+          fixedWeeks
+          weekdayPrefix="周"
+          className="mt-4 grid grid-cols-7 overflow-hidden rounded-lg border border-slate-200"
+          weekdayClassName="border-b border-slate-200 bg-slate-50 px-1 py-2 text-center text-xs font-medium whitespace-nowrap text-slate-500"
+          emptyClassName="min-h-24 border-r border-b border-slate-100 bg-slate-50/40"
+          renderDay={(date) => {
+            const value = localDateValue(date);
+            const day = dayMap.get(value);
+            return (
+              <div className={`min-h-24 min-w-0 border-r border-b border-slate-100 p-1.5 text-left align-top transition hover:bg-orange-50 ${selectedDate === value ? "bg-orange-50 ring-2 ring-inset ring-orange-400" : "bg-white"}`} onClick={() => !dirty && onSelectDate(value)}>
+                <button type="button" className={`inline-flex size-6 items-center justify-center rounded-full text-xs font-semibold ${value === localDateValue(new Date()) ? "bg-slate-900 text-white" : "text-slate-600"}`} onClick={() => !dirty && onSelectDate(value)} disabled={dirty} aria-label={`选择 ${value}`}>{date.getDate()}</button>
+                <span className="mt-1 block space-y-1">
+                  {(day?.orders ?? []).slice(0, 3).map((order) => <button key={order.order_id} type="button" className={`block w-full truncate rounded px-1.5 py-1 text-left text-[11px] font-semibold ${order.order_status === "completed" ? "bg-emerald-50 text-emerald-700" : "bg-orange-100 text-orange-900"}`} onClick={(event) => { event.stopPropagation(); onSelectOrder(order.order_id); }}>#{order.order_id}{order.visit_count > 1 ? ` ×${order.visit_count}` : ""} · {order.customer_name}</button>)}
+                  {(day?.orders?.length ?? 0) > 3 ? <span className="block px-1 text-[11px] text-slate-500">还有 {day!.orders!.length - 3} 笔</span> : null}
+                </span>
+              </div>
+            );
+          }}
+        />
+      </section>
+      <div className="mt-5">
+        <DailyPlansPage key={selectedDate} onDirtyChange={setDirty} />
+      </div>
+    </main>
+  );
+}
diff --git a/frontend/src/features/orders/OrdersPage.test.tsx b/frontend/src/features/orders/OrdersPage.test.tsx
index 2b63041..d11b207 100644
--- a/frontend/src/features/orders/OrdersPage.test.tsx
+++ b/frontend/src/features/orders/OrdersPage.test.tsx
@@ -21,8 +21,11 @@ const apiMocks = vi.hoisted(() => ({
   previewDemoData: vi.fn(),
   clearDemoData: vi.fn(),
 }));
+const planApiMocks = vi.hoisted(() => ({ getPlanDays: vi.fn() }));
 
 vi.mock("./api", () => apiMocks);
+vi.mock("../plans/DailyPlansPage", () => ({ DailyPlansPage: () => <div>当天排班工作区</div> }));
+vi.mock("../plans/api", () => planApiMocks);
 
 const timestamp = "2030-09-01T08:00:00";
 const tasks: OrderTask[] = Array.from({ length: 7 }, (_, index) => ({
@@ -127,9 +130,9 @@ const detail: OrderDetail = {
   created_at: timestamp,
 };
 
-function renderPage(initialCreate = false) {
+function renderPage(initialCreate = false, initialEntry = "/admin/orders?order_id=1&date=2030-10-01") {
   return render(
-    <MemoryRouter>
+    <MemoryRouter initialEntries={[initialEntry]}>
       <OrdersPage initialCreate={initialCreate} />
     </MemoryRouter>,
   );
@@ -176,6 +179,36 @@ beforeEach(() => {
   apiMocks.updateOrder.mockResolvedValue(detail);
   apiMocks.updateOrderStatus.mockResolvedValue(detail);
   apiMocks.deleteOrder.mockResolvedValue(undefined);
+  planApiMocks.getPlanDays.mockResolvedValue({ items: [], total: 0 });
+});
+
+it("uses the month calendar as the primary view and opens details on demand", async () => {
+  planApiMocks.getPlanDays.mockResolvedValue({
+    items: [{
+      service_date: "2030-10-01",
+      task_count: 2,
+      order_count: 1,
+      cat_count: 2,
+      customer_names: [summary.customer.name],
+      orders: [{ order_id: 1, customer_name: summary.customer.name, visit_count: 2, order_status: "confirmed" }],
+    }],
+    total: 1,
+  });
+  renderPage(false, "/admin/orders?date=2030-10-01");
+
+  expect(await screen.findByRole("heading", { name: "订单月历" })).toBeInTheDocument();
+  expect(screen.queryByRole("heading", { name: "订单 #1", level: 2 })).not.toBeInTheDocument();
+  const marker = await screen.findByRole("button", { name: /#1 ×2/ });
+  fireEvent.click(marker);
+  expect(await screen.findByRole("heading", { name: "订单 #1", level: 2 })).toBeInTheDocument();
+  expect(apiMocks.getOrder).toHaveBeenCalledWith(1);
+
+  fireEvent.click(screen.getByRole("button", { name: "关闭订单详情" }));
+  expect(screen.queryByRole("heading", { name: "订单 #1", level: 2 })).not.toBeInTheDocument();
+  const collapse = screen.getByRole("button", { name: "收起订单列表" });
+  fireEvent.click(collapse);
+  expect(screen.getByLabelText("订单列表")).toHaveClass("hidden");
+  expect(screen.getByRole("button", { name: "展开订单列表" })).toBeInTheDocument();
 });
 
 it("shows an order, authoritative pricing, and seven generated tasks", async () => {
diff --git a/frontend/src/features/orders/OrdersPage.tsx b/frontend/src/features/orders/OrdersPage.tsx
index 07f32d5..7c38f07 100644
--- a/frontend/src/features/orders/OrdersPage.tsx
+++ b/frontend/src/features/orders/OrdersPage.tsx
@@ -5,15 +5,19 @@ import {
   ClipboardList,
   LoaderCircle,
   MapPin,
+  PanelLeftClose,
+  PanelLeftOpen,
   Pencil,
   Plus,
   ReceiptText,
   Trash2,
+  X,
 } from "lucide-react";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { Link } from "react-router-dom";
+import { Link, useSearchParams } from "react-router-dom";
 
 import { ConnectionErrorAlert } from "../../components/ui/ConnectionErrorAlert";
+import { localDateValue } from "../../components/ui/calendarDates";
 import {
   createOrder,
   clearDemoData,
@@ -28,6 +32,7 @@ import {
 } from "./api";
 import { serviceItemOptions } from "./constants";
 import { OrderForm } from "./OrderForm";
+import { OrderScheduleCalendar } from "./OrderScheduleCalendar";
 import type {
   OrderDetail,
   OrderCreateInput,
@@ -102,8 +107,13 @@ interface OrdersPageProps {
 }
 
 export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const requestedOrderId = Number(searchParams.get("order_id"));
+  const selectedOrderId = Number.isInteger(requestedOrderId) && requestedOrderId > 0
+    ? requestedOrderId
+    : null;
+  const requestedDate = searchParams.get("date") || localDateValue();
   const [orders, setOrders] = useState<OrderSummary[]>([]);
-  const [selectedOrderId, setSelectedOrderId] = useState<number | null>(null);
   const [orderDetail, setOrderDetail] = useState<OrderDetail | null>(null);
   const [formOptions, setFormOptions] = useState<OrderFormOptions | null>(null);
   const [listLoading, setListLoading] = useState(true);
@@ -114,28 +124,23 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
   const [statusSaving, setStatusSaving] = useState(false);
   const [deleting, setDeleting] = useState(false);
   const [geocoding, setGeocoding] = useState(false);
+  const [listCollapsed, setListCollapsed] = useState(false);
   const listRequestId = useRef(0);
 
-  const applyOrders = useCallback((items: OrderSummary[], preferredId?: number) => {
+  const applyOrders = useCallback((items: OrderSummary[]) => {
     setOrders(items);
-    setSelectedOrderId((current) => {
-      if (preferredId && items.some((item) => item.id === preferredId)) return preferredId;
-      if (current && items.some((item) => item.id === current)) return current;
-      return items[0]?.id ?? null;
-    });
   }, []);
 
-  const refreshOrders = useCallback(async (preferredId?: number) => {
+  const refreshOrders = useCallback(async () => {
     const requestId = ++listRequestId.current;
     setListLoading(true);
     setPageError(null);
     try {
       const response = await listOrders();
-      if (requestId === listRequestId.current) applyOrders(response.items, preferredId);
+      if (requestId === listRequestId.current) applyOrders(response.items);
     } catch (cause) {
       if (requestId === listRequestId.current) {
         setOrders([]);
-        setSelectedOrderId(null);
         setOrderDetail(null);
         setPageError(cause instanceof Error ? cause.message : "订单列表加载失败，请重试。");
       }
@@ -190,9 +195,39 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
         ? await updateOrder(orderDetail.id, payload as OrderPatchInput)
         : await createOrder(payload as OrderCreateInput);
     setOrderDetail(saved);
-    setSelectedOrderId(saved.id);
+    setSearchParams((current) => {
+      const next = new URLSearchParams(current);
+      next.set("order_id", String(saved.id));
+      return next;
+    });
     setFormMode(null);
-    await refreshOrders(saved.id);
+    await refreshOrders();
+  }
+
+  function selectOrder(orderId: number) {
+    setSearchParams((current) => {
+      const next = new URLSearchParams(current);
+      next.set("order_id", String(orderId));
+      return next;
+    });
+  }
+
+  function closeOrderDetail() {
+    setOrderDetail(null);
+    setSearchParams((current) => {
+      const next = new URLSearchParams(current);
+      next.delete("order_id");
+      return next;
+    });
+  }
+
+  function selectScheduleDate(date: string) {
+    setSearchParams((current) => {
+      const next = new URLSearchParams(current);
+      next.set("date", date);
+      next.delete("task_id");
+      return next;
+    });
   }
 
   async function handleStatusChange(status: OrderStatus) {
@@ -204,7 +239,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
     try {
       const updated = await updateOrderStatus(orderDetail.id, status);
       setOrderDetail(updated);
-      await refreshOrders(updated.id);
+      await refreshOrders();
     } catch (cause) {
       setPageError(cause instanceof Error ? cause.message : "订单状态更新失败，请重试。");
     } finally {
@@ -219,8 +254,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
     setPageError(null);
     try {
       await deleteOrder(orderDetail.id);
-      setOrderDetail(null);
-      setSelectedOrderId(null);
+      closeOrderDetail();
       await refreshOrders();
     } catch (cause) {
       setPageError(cause instanceof Error ? cause.message : "订单删除失败，请重试。");
@@ -241,8 +275,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
       );
       if (!confirmed) return;
       await clearDemoData();
-      setOrderDetail(null);
-      setSelectedOrderId(null);
+      closeOrderDetail();
       await refreshOrders();
     } catch (cause) {
       setPageError(cause instanceof Error ? cause.message : "演示数据清理失败，请重试。");
@@ -258,7 +291,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
     try {
       const updated = await retryOrderGeocode(orderDetail.id);
       setOrderDetail(updated);
-      await refreshOrders(updated.id);
+      await refreshOrders();
     } catch (cause) {
       setPageError(cause instanceof Error ? cause.message : "地址定位重试失败。");
     } finally {
@@ -282,23 +315,29 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
           <h2 id="page-title" className="mt-1 text-xl font-semibold tracking-tight text-slate-950">订单管理</h2>
           <p className="mt-2 text-sm leading-6 text-slate-600">录入服务订单，自动计算次数和费用，并生成每日任务。</p>
         </div>
-        <button
-          type="button"
-          className="cc-button cc-button--primary"
-          onClick={() => setFormMode("create")}
-          disabled={!formOptions}
-        >
-          <Plus size={17} />
-          新建订单
-        </button>
+        <div className="flex flex-wrap items-center gap-2">
+          <button type="button" className="cc-button cc-button--secondary" onClick={() => setListCollapsed((current) => !current)} aria-expanded={!listCollapsed} aria-controls="orders-secondary-list">
+            {listCollapsed ? <PanelLeftOpen size={16} /> : <PanelLeftClose size={16} />}
+            {listCollapsed ? "展开订单列表" : "收起订单列表"}
+          </button>
+          <button
+            type="button"
+            className="cc-button cc-button--primary"
+            onClick={() => setFormMode("create")}
+            disabled={!formOptions}
+          >
+            <Plus size={17} />
+            新建订单
+          </button>
+        </div>
       </div>
 
       {pageError ? (
         <ConnectionErrorAlert className="mt-5" message={pageError} onRetry={() => void refreshOrders()} />
       ) : null}
 
-      <div className="cc-surface mt-6 grid min-h-[680px] overflow-hidden p-0 lg:grid-cols-[320px_minmax(0,1fr)]">
-        <aside className="border-b border-slate-200 lg:border-r lg:border-b-0" aria-label="订单列表">
+      <div className={`cc-surface mt-6 grid min-h-[680px] overflow-hidden p-0 ${listCollapsed ? "lg:grid-cols-[minmax(0,1fr)]" : "lg:grid-cols-[320px_minmax(0,1fr)]"}`}>
+        <aside id="orders-secondary-list" className={`${listCollapsed ? "hidden" : "block"} border-b border-slate-200 lg:border-r lg:border-b-0`} aria-label="订单列表">
           <div className="flex items-center justify-between border-b border-slate-200 px-4 py-3">
             <p className="text-sm font-semibold text-slate-900">全部订单</p>
             <span className="text-xs text-slate-500">{orders.length} 单</span>
@@ -319,7 +358,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
                     <button
                       type="button"
                       className={`w-full rounded-xl px-3 py-3 text-left transition-colors ${selectedOrderId === order.id ? "bg-orange-50 text-slate-950 shadow-sm ring-1 ring-orange-200" : "hover:bg-slate-100"}`}
-                      onClick={() => setSelectedOrderId(order.id)}
+                      onClick={() => selectOrder(order.id)}
                       aria-pressed={selectedOrderId === order.id}
                     >
                       <div className="flex items-start justify-between gap-3">
@@ -341,7 +380,13 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
           </div>
         </aside>
 
-        <div className="min-w-0 bg-slate-50/60">
+        <OrderScheduleCalendar
+          selectedDate={requestedDate}
+          onSelectDate={selectScheduleDate}
+          onSelectOrder={selectOrder}
+        />
+
+        {selectedOrderId !== null ? <div className="fixed inset-0 z-50 min-w-0 overflow-y-auto bg-slate-50 shadow-2xl lg:left-auto lg:w-[min(920px,78vw)]">
           {selectedOrderId !== null && orderDetail?.id !== selectedOrderId ? (
             <div className="flex h-full min-h-96 items-center justify-center gap-2 text-sm text-slate-500"><LoaderCircle className="animate-spin" size={18} />正在加载订单详情…</div>
           ) : selectedOrderId === null || !orderDetail ? (
@@ -361,6 +406,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
                   <p className="mt-1 text-sm text-slate-500">{orderDetail.customer.name}{orderDetail.customer.address ? ` · ${orderDetail.customer.address}` : ""}</p>
                 </div>
                 <div className="flex flex-wrap gap-2">
+                  <button type="button" className="cc-button cc-button--secondary min-h-10 px-3" onClick={closeOrderDetail} aria-label="关闭订单详情"><X size={15} />关闭</button>
                   {!(["cancelled", "completed"] as OrderStatus[]).includes(orderDetail.order_status) ? <button type="button" className="cc-button cc-button--secondary min-h-10 px-3 text-red-700" onClick={() => void handleStatusChange("cancelled")} disabled={statusSaving}>{statusSaving ? <LoaderCircle className="animate-spin" size={15} /> : null}取消订单</button> : null}
                   {orderDetail.is_demo_data ? <button type="button" className="cc-button cc-button--secondary min-h-10 px-3 text-red-700" onClick={() => void handleDemoClear()} disabled={deleting}>{deleting ? <LoaderCircle className="animate-spin" size={15} /> : <Trash2 size={15} />}清除整套演示数据</button> : <button type="button" className="cc-button cc-button--secondary min-h-10 px-3 text-red-700 disabled:cursor-not-allowed disabled:opacity-45" onClick={() => void handleDelete()} disabled={!orderDetail.deletable || deleting} title={orderDetail.delete_block_reason ?? "永久删除订单"}>{deleting ? <LoaderCircle className="animate-spin" size={15} /> : <Trash2 size={15} />}删除订单</button>}
                   <button type="button" className="cc-button cc-button--secondary min-h-10 px-3" onClick={() => setFormMode("edit")}>
@@ -442,7 +488,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
               </section>
             </div>
           )}
-        </div>
+        </div> : null}
       </div>
 
       {formMode && formOptions ? (
diff --git a/frontend/src/features/plans/DailyPlansPage.test.tsx b/frontend/src/features/plans/DailyPlansPage.test.tsx
index d963d1c..a260d53 100644
--- a/frontend/src/features/plans/DailyPlansPage.test.tsx
+++ b/frontend/src/features/plans/DailyPlansPage.test.tsx
@@ -257,6 +257,7 @@ it("moves tasks, edits time, and saves one revision-protected day schedule", asy
   const onDirtyChange = vi.fn();
   renderPage(onDirtyChange);
   expect((await screen.findAllByText("P4 第二位虚构客户")).length).toBeGreaterThan(0);
+  expect(screen.getByRole("button", { name: "拖动任务 #1 排序" })).toBeEnabled();
 
   fireEvent.click(screen.getByRole("button", { name: "上移 P4 第二位虚构客户 任务" }));
   fireEvent.change(screen.getByLabelText("任务 #2 计划时间"), {
diff --git a/frontend/src/features/plans/DailyPlansPage.tsx b/frontend/src/features/plans/DailyPlansPage.tsx
index 7b85709..41f875a 100644
--- a/frontend/src/features/plans/DailyPlansPage.tsx
+++ b/frontend/src/features/plans/DailyPlansPage.tsx
@@ -9,7 +9,12 @@ import {
   LoaderCircle,
   RotateCcw,
   Save,
+  GripVertical,
+  LocateFixed,
 } from "lucide-react";
+import { DragDropProvider } from "@dnd-kit/react";
+import { useSortable } from "@dnd-kit/react/sortable";
+import { arrayMove } from "@dnd-kit/helpers";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Link, useSearchParams } from "react-router-dom";
 
@@ -25,6 +30,8 @@ import {
   previewPlanRoute,
   saveDaySchedule,
   updatePlanTaskStatus,
+  updateTaskLocation,
+  restoreTaskAutomaticLocation,
 } from "./api";
 import { editablePlanStatuses, planTaskStatusLabels } from "./constants";
 import { RouteWorkspace } from "./RouteWorkspace";
@@ -35,6 +42,7 @@ import type {
   PlanTaskDetail,
   PlanTaskStatus,
   PlanTaskSummary,
+  PlanGeoPoint,
 } from "./types";
 
 const serviceLabels = Object.fromEntries(
@@ -88,6 +96,22 @@ function statusStyle(status: PlanTaskStatus): string {
   }[status];
 }
 
+function SortableTaskItem({ taskId, index, disabled, selected, children }: {
+  taskId: number;
+  index: number;
+  disabled: boolean;
+  selected: boolean;
+  children: React.ReactNode;
+}) {
+  const { ref, handleRef, isDragging } = useSortable({ id: taskId, index, disabled });
+  return (
+    <li ref={ref} className={`relative rounded-xl border p-3 transition-all ${selected ? "border-orange-200 bg-orange-50/70 shadow-sm" : "border-transparent bg-slate-50/70 hover:border-slate-200 hover:bg-white"} ${isDragging ? "z-10 opacity-70 shadow-lg" : ""}`}>
+      <button ref={handleRef} type="button" className="absolute top-2 right-2 cursor-grab rounded-md p-1 text-slate-400 hover:bg-white hover:text-slate-700 active:cursor-grabbing disabled:cursor-not-allowed" aria-label={`拖动任务 #${taskId} 排序`} disabled={disabled}><GripVertical size={16} /></button>
+      {children}
+    </li>
+  );
+}
+
 interface DailyPlansPageProps {
   onDirtyChange: (dirty: boolean) => void;
 }
@@ -116,12 +140,17 @@ export function DailyPlansPage({ onDirtyChange }: DailyPlansPageProps) {
   const [routeAdopting, setRouteAdopting] = useState(false);
   const [routeError, setRouteError] = useState<string | null>(null);
   const [dirty, setDirty] = useState(false);
+  const [locationEditing, setLocationEditing] = useState(false);
+  const [draftLocation, setDraftLocation] = useState<PlanGeoPoint | null>(null);
+  const [locationSaving, setLocationSaving] = useState(false);
+  const [amapReady, setAmapReady] = useState(false);
+  const [locationMessage, setLocationMessage] = useState<string | null>(null);
   const [error, setError] = useState<string | null>(null);
   const dayRequestId = useRef(0);
   const detailRequestId = useRef(0);
   const routeRequestId = useRef(0);
 
-  useEffect(() => onDirtyChange(dirty), [dirty, onDirtyChange]);
+  useEffect(() => onDirtyChange(dirty || locationEditing), [dirty, locationEditing, onDirtyChange]);
 
   const refreshDays = useCallback(async () => {
     const response = await getPlanDays();
@@ -222,17 +251,31 @@ export function DailyPlansPage({ onDirtyChange }: DailyPlansPageProps) {
   }, [selectedTaskId]);
 
   function selectDate(nextDate: string) {
+    if (locationEditing) return;
     setSelectedDate(nextDate);
     setTaskDetail(null);
-    setSearchParams({ date: nextDate });
+    setSearchParams((current) => {
+      const next = new URLSearchParams(current);
+      next.set("date", nextDate);
+      next.delete("task_id");
+      return next;
+    });
     void loadDay(nextDate);
   }
 
   function selectTask(taskId: number) {
+    if (locationEditing) return;
     if (taskId === selectedTaskId) return;
     setDetailLoading(true);
     setSelectedTaskId(taskId);
-    if (selectedDate) setSearchParams({ date: selectedDate, task_id: String(taskId) });
+    if (selectedDate) {
+      setSearchParams((current) => {
+        const next = new URLSearchParams(current);
+        next.set("date", selectedDate);
+        next.set("task_id", String(taskId));
+        return next;
+      });
+    }
   }
 
   function updateDraft(next: PlanTaskSummary[]) {
@@ -262,6 +305,17 @@ export function DailyPlansPage({ onDirtyChange }: DailyPlansPageProps) {
     updateDraft(next);
   }
 
+  function handleDragEnd(event: { canceled: boolean; operation: { source: { id: string | number } | null; target: { id: string | number } | null } }) {
+    if (event.canceled || plan?.schedule_locked || routeBusy) return;
+    const sourceId = Number(event.operation.source?.id);
+    const targetId = Number(event.operation.target?.id);
+    const sourceIndex = draftTasks.findIndex((task) => task.id === sourceId);
+    const targetIndex = draftTasks.findIndex((task) => task.id === targetId);
+    if (sourceIndex < 0 || targetIndex < 0 || sourceIndex === targetIndex) return;
+    invalidateRouteWorkspace();
+    updateDraft(arrayMove(draftTasks, sourceIndex, targetIndex));
+  }
+
   function updateTime(taskId: number, value: string) {
     if (routeBusy) return;
     invalidateRouteWorkspace();
@@ -376,6 +430,66 @@ export function DailyPlansPage({ onDirtyChange }: DailyPlansPageProps) {
     }
   }
 
+  function beginLocationEdit() {
+    if (!taskDetail || !amapReady || dirty || routeBusy) return;
+    setDraftLocation(taskDetail.current_position ?? selectedRouteMarker?.position ?? null);
+    setLocationMessage(null);
+    setLocationEditing(true);
+    invalidateRouteWorkspace();
+  }
+
+  function cancelLocationEdit() {
+    if (locationSaving) return;
+    setLocationEditing(false);
+    setDraftLocation(null);
+    void loadRoute(selectedDate, draftTasks.length > 0);
+  }
+
+  async function saveLocation() {
+    if (!taskDetail || !plan || !draftLocation || locationSaving) return;
+    const scope = taskDetail.location_scope === "customer"
+      ? `将同步 ${taskDetail.location_sync_order_count ?? 0} 笔同地址订单、${taskDetail.location_sync_task_count ?? 0} 个未执行任务`
+      : `未关联客户档案，仅修改订单 #${taskDetail.task.order_id} 及其未执行任务`;
+    if (!window.confirm(`确认保存 ${taskDetail.customer.name} 的新定位？\n${scope}\n地址文字不会改变。`)) return;
+    setLocationSaving(true);
+    setError(null);
+    try {
+      const result = await updateTaskLocation(taskDetail, draftLocation, {
+        serviceDate: selectedDate,
+        dayRevision: plan.revision,
+      });
+      setLocationMessage(`定位已保存：同步 ${result.affected_orders} 笔订单、${result.affected_tasks} 个未执行任务。请重新规划当天路线。`);
+      setLocationEditing(false);
+      setDraftLocation(null);
+      await loadDay(selectedDate, taskDetail.task.id);
+      await refreshDays();
+    } catch (cause) {
+      setError(cause instanceof Error ? cause.message : "客户定位保存失败，请刷新后重试。");
+    } finally {
+      setLocationSaving(false);
+    }
+  }
+
+  async function restoreAutomaticLocation() {
+    if (!taskDetail || !plan || dirty || routeBusy || locationEditing) return;
+    if (!window.confirm("确认按当前地址重新进行高德自动定位？解析失败会保留现有手动锚点。")) return;
+    setLocationSaving(true);
+    setError(null);
+    try {
+      const result = await restoreTaskAutomaticLocation(taskDetail, {
+        serviceDate: selectedDate,
+        dayRevision: plan.revision,
+      });
+      setLocationMessage(`已恢复地址自动定位，并同步 ${result.affected_orders} 笔订单、${result.affected_tasks} 个未执行任务。`);
+      await loadDay(selectedDate, taskDetail.task.id);
+      await refreshDays();
+    } catch (cause) {
+      setError(cause instanceof Error ? cause.message : "地址自动定位失败，已保留原手动锚点。");
+    } finally {
+      setLocationSaving(false);
+    }
+  }
+
   const currentDay = days.find((day) => day.service_date === selectedDate);
   const detailStatusEditable =
     taskDetail &&
@@ -384,7 +498,7 @@ export function DailyPlansPage({ onDirtyChange }: DailyPlansPageProps) {
   const selectedRouteMarker = routeWorkspace?.markers.find(
     (marker) => marker.task_id === selectedTaskId,
   );
-  const routeBusy = routePreviewing || routeAdopting;
+  const routeBusy = routePreviewing || routeAdopting || locationSaving;
 
   return (
     <>
@@ -451,9 +565,10 @@ export function DailyPlansPage({ onDirtyChange }: DailyPlansPageProps) {
                 这一天没有任务
               </div>
             ) : (
+              <DragDropProvider onDragEnd={handleDragEnd}>
               <ol className="space-y-2">
                 {draftTasks.map((task, index) => (
-                  <li key={task.id} className={`rounded-xl border p-3 transition-all ${selectedTaskId === task.id ? "border-orange-200 bg-orange-50/70 shadow-sm" : "border-transparent bg-slate-50/70 hover:border-slate-200 hover:bg-white"}`}>
+                  <SortableTaskItem key={task.id} taskId={task.id} index={index} disabled={Boolean(plan?.schedule_locked || saving || routeBusy)} selected={selectedTaskId === task.id}>
                     <div className="flex items-start gap-2">
                       <button type="button" className="min-w-0 flex-1 text-left" onClick={() => selectTask(task.id)}>
                         <div className="flex items-center gap-2">
@@ -481,9 +596,10 @@ export function DailyPlansPage({ onDirtyChange }: DailyPlansPageProps) {
                         <button type="button" className="cc-icon-button min-h-9 min-w-9 p-2" aria-label={`下移 ${task.customer.name} 任务`} onClick={() => moveTask(index, 1)} disabled={index === draftTasks.length - 1 || plan?.schedule_locked || saving || routeBusy}><ArrowDown size={14} /></button>
                       </div>
                     </div>
-                  </li>
+                  </SortableTaskItem>
                 ))}
               </ol>
+              </DragDropProvider>
             )}
           </div>
 
@@ -503,12 +619,16 @@ export function DailyPlansPage({ onDirtyChange }: DailyPlansPageProps) {
           loading={routeLoading}
           previewing={routePreviewing}
           adopting={routeAdopting}
-          dirty={dirty}
+          dirty={dirty || locationEditing}
           error={routeError}
           onSelectTask={selectTask}
           onPreview={() => void handleRoutePreview()}
           onRetry={() => void loadRoute(selectedDate, draftTasks.length > 0)}
           onAdopt={() => void handleAdoptRecommendation()}
+          locationEditing={locationEditing}
+          draftPosition={draftLocation}
+          onDraftPositionChange={setDraftLocation}
+          onAmapReadyChange={setAmapReady}
         />
 
         <aside className="bg-white" aria-label="任务详情">
@@ -529,6 +649,13 @@ export function DailyPlansPage({ onDirtyChange }: DailyPlansPageProps) {
                     <span className={`rounded-full px-2 py-1 text-xs font-medium ${statusStyle(taskDetail.task.status)}`}>{planTaskStatusLabels[taskDetail.task.status]}</span>
                   </div>
                   <p className="mt-3 text-sm leading-6 text-slate-700">{addressLine(taskDetail)}</p>
+                  <div className="mt-3 rounded-lg border border-slate-200 bg-slate-50 p-3 text-xs leading-5 text-slate-600">
+                    <div className="flex flex-wrap items-center justify-between gap-2"><span className="font-semibold text-slate-800">客户地图锚点</span><span>{taskDetail.location_scope === "customer" ? "同步客户档案" : "仅此订单"}</span></div>
+                    <p className="mt-1">当前：{taskDetail.current_position ? `${taskDetail.current_position.longitude.toFixed(6)}, ${taskDetail.current_position.latitude.toFixed(6)}` : "尚无可信坐标"}</p>
+                    {!amapReady ? <p className="mt-1 font-medium text-amber-700">高德街道底图未成功加载，只能查看，不能修改定位。</p> : null}
+                    {locationMessage ? <p className="mt-2 rounded-md bg-emerald-50 px-2 py-1.5 text-emerald-800">{locationMessage}</p> : null}
+                    {locationEditing ? <div className="mt-3 space-y-2 rounded-md bg-white p-2"><p><strong>原地址：</strong>{addressLine(taskDetail)}</p><p><strong>原定位：</strong>{taskDetail.current_position ? `${taskDetail.current_position.longitude.toFixed(6)}, ${taskDetail.current_position.latitude.toFixed(6)}` : "无"}</p><p><strong>新定位：</strong>{draftLocation ? `${draftLocation.longitude.toFixed(6)}, ${draftLocation.latitude.toFixed(6)}` : "请点击地图选择"}</p><p><strong>同步范围：</strong>{taskDetail.location_scope === "customer" ? `${taskDetail.location_sync_order_count ?? 0} 笔同地址订单、${taskDetail.location_sync_task_count ?? 0} 个未执行任务` : `订单 #${taskDetail.task.order_id} 的未执行任务`}</p><div className="flex gap-2"><button type="button" className="cc-button cc-button--secondary min-h-9 flex-1 px-2 text-xs" onClick={cancelLocationEdit} disabled={locationSaving}>取消</button><button type="button" className="cc-button cc-button--primary min-h-9 flex-1 px-2 text-xs" onClick={() => void saveLocation()} disabled={!draftLocation || locationSaving}>{locationSaving ? <LoaderCircle className="animate-spin" size={13} /> : null}确认定位</button></div></div> : <div className="mt-3 flex flex-wrap gap-2"><button type="button" className="cc-button cc-button--secondary min-h-9 px-2.5 text-xs" onClick={beginLocationEdit} disabled={!amapReady || dirty || routeBusy || taskDetail.task.has_execution_history}><LocateFixed size={14} />修改客户定位</button>{taskDetail.route_geocode_status === "manual" ? <button type="button" className="cc-button cc-button--secondary min-h-9 px-2.5 text-xs" onClick={() => void restoreAutomaticLocation()} disabled={dirty || routeBusy}><RotateCcw size={14} />恢复地址自动定位</button> : null}</div>}
+                  </div>
                   {selectedRouteMarker?.navigation_url ? (
                     <a
                       className="cc-button cc-button--secondary mt-3"
diff --git a/frontend/src/features/plans/RouteMap.tsx b/frontend/src/features/plans/RouteMap.tsx
index f17a4c4..888a1a6 100644
--- a/frontend/src/features/plans/RouteMap.tsx
+++ b/frontend/src/features/plans/RouteMap.tsx
@@ -20,6 +20,10 @@ interface RouteMapProps {
   route: PlanRoutePath | null;
   selectedTaskId: number | null;
   onSelectTask: (taskId: number) => void;
+  locationEditing?: boolean;
+  draftPosition?: PlanGeoPoint | null;
+  onDraftPositionChange?: (position: PlanGeoPoint) => void;
+  onAmapReadyChange?: (ready: boolean) => void;
 }
 
 interface ProjectedPoint {
@@ -120,6 +124,8 @@ function CoordinateCanvas({
 export function RouteMap(props: RouteMapProps) {
   const container = useRef<HTMLDivElement>(null);
   const selectTask = useRef(props.onSelectTask);
+  const changeDraft = useRef(props.onDraftPositionChange);
+  const readyChange = useRef(props.onAmapReadyChange);
   const [amapFailed, setAmapFailed] = useState(false);
   const canUseAmap = props.providerName === "amap" && hasAmapBrowserKey() && hasAmapBrowserSecurityCode() && !amapFailed;
   const modelKey = useMemo(
@@ -128,14 +134,24 @@ export function RouteMap(props: RouteMapProps) {
       markers: props.markers,
       route: props.route,
       selectedTaskId: props.selectedTaskId,
+      locationEditing: props.locationEditing,
+      draftPosition: props.draftPosition,
     }),
-    [props.markers, props.route, props.selectedTaskId, props.start],
+    [props.draftPosition, props.locationEditing, props.markers, props.route, props.selectedTaskId, props.start],
   );
 
   useEffect(() => {
     selectTask.current = props.onSelectTask;
   }, [props.onSelectTask]);
 
+  useEffect(() => {
+    changeDraft.current = props.onDraftPositionChange;
+  }, [props.onDraftPositionChange]);
+
+  useEffect(() => {
+    readyChange.current = props.onAmapReadyChange;
+  }, [props.onAmapReadyChange]);
+
   useEffect(() => {
     if (!canUseAmap || !container.current) return;
     let cleanup: (() => void) | undefined;
@@ -149,21 +165,33 @@ export function RouteMap(props: RouteMapProps) {
           markers: props.markers,
           polyline: props.route?.polyline ?? [],
           selectedTaskId: props.selectedTaskId,
+          locationEditing: props.locationEditing,
+          draftPosition: props.draftPosition,
+        },
+        {
+          onSelectTask: (taskId) => selectTask.current(taskId),
+          onDraftPositionChange: (point) => changeDraft.current?.(point),
         },
-        (taskId) => selectTask.current(taskId),
       )
       .then((dispose) => {
-        if (active) cleanup = dispose;
+        if (active) {
+          cleanup = dispose;
+          readyChange.current?.(true);
+        }
         else dispose();
       })
       .catch(() => {
-        if (active) setAmapFailed(true);
+        if (active) {
+          setAmapFailed(true);
+          readyChange.current?.(false);
+        }
       });
     return () => {
       active = false;
+      readyChange.current?.(false);
       cleanup?.();
     };
-  }, [canUseAmap, modelKey, props.markers, props.route, props.selectedTaskId, props.start]);
+  }, [canUseAmap, modelKey, props.draftPosition, props.locationEditing, props.markers, props.route, props.selectedTaskId, props.start]);
 
   return (
     <div className="relative h-[390px] overflow-hidden rounded-[10px] border border-slate-200/80 bg-slate-100 shadow-inner">
diff --git a/frontend/src/features/plans/RouteWorkspace.tsx b/frontend/src/features/plans/RouteWorkspace.tsx
index 684857a..b50271a 100644
--- a/frontend/src/features/plans/RouteWorkspace.tsx
+++ b/frontend/src/features/plans/RouteWorkspace.tsx
@@ -15,6 +15,7 @@ import type {
   PlanRoutePath,
   PlanRouteWorkspace as PlanRouteWorkspaceData,
   PlanTaskSummary,
+  PlanGeoPoint,
 } from "./types";
 
 const issueLabels: Record<PlanRouteIssueReason, string> = {
@@ -60,6 +61,10 @@ interface RouteWorkspaceProps {
   onPreview: () => void;
   onRetry: () => void;
   onAdopt: () => void;
+  locationEditing?: boolean;
+  draftPosition?: PlanGeoPoint | null;
+  onDraftPositionChange?: (position: PlanGeoPoint) => void;
+  onAmapReadyChange?: (ready: boolean) => void;
 }
 
 export function RouteWorkspace({
@@ -75,6 +80,10 @@ export function RouteWorkspace({
   onPreview,
   onRetry,
   onAdopt,
+  locationEditing = false,
+  draftPosition = null,
+  onDraftPositionChange,
+  onAmapReadyChange,
 }: RouteWorkspaceProps) {
   const optimization = workspace?.optimization ?? null;
   const roadRoute = workspace?.road_route ?? null;
@@ -110,7 +119,8 @@ export function RouteWorkspace({
     && activeTaskCount
     && !dirty
     && !previewing
-    && !adopting,
+    && !adopting
+    && !locationEditing,
   );
   const closedRouteLabel = optimization && workspace?.start
     ? [workspace.start.label, ...markers.map((marker) => marker.customer_name), workspace.start.label].join(" → ")
@@ -156,6 +166,7 @@ export function RouteWorkspace({
             ) : null}
           </div>
           {dirty ? <p className="mt-2 text-xs text-amber-700">请先保存或撤销人工排程，再规划路线。</p> : null}
+          {locationEditing ? <p className="mt-2 text-xs font-medium text-orange-700">正在修改客户定位：请点击地图放置新锚点，或拖动橙色锚点微调；此时不能规划路线。</p> : null}
           {optimization && !workspace?.can_adopt_recommendation ? (
             <p className="mt-2 text-xs text-slate-500">
               {workspace?.schedule_locked ? "已有执行历史，路线只能查看，不能改变顺序。" : "当前排程已经采用这个优化顺序。"}
@@ -179,6 +190,10 @@ export function RouteWorkspace({
             route={mapRoute}
             selectedTaskId={selectedTaskId}
             onSelectTask={onSelectTask}
+            locationEditing={locationEditing}
+            draftPosition={draftPosition}
+            onDraftPositionChange={onDraftPositionChange}
+            onAmapReadyChange={onAmapReadyChange}
           />
         )}
 
diff --git a/frontend/src/features/plans/api.test.ts b/frontend/src/features/plans/api.test.ts
index 9071616..39c72e4 100644
--- a/frontend/src/features/plans/api.test.ts
+++ b/frontend/src/features/plans/api.test.ts
@@ -4,14 +4,78 @@ import {
   getPlanRoute,
   getPlanTask,
   previewPlanRoute,
+  restoreTaskAutomaticLocation,
   saveDaySchedule,
+  updateTaskLocation,
   updatePlanTaskStatus,
 } from "./api";
+import type { PlanTaskDetail } from "./types";
 
 beforeEach(() => {
   vi.stubGlobal("fetch", vi.fn());
 });
 
+it("requests ranged calendar markers and revision-protected GCJ-02 location updates", async () => {
+  const fetchMock = vi.mocked(fetch);
+  fetchMock.mockResolvedValue({ ok: true, json: async () => ({}) } as Response);
+  const customerDetail = {
+    task: { order_id: 9 },
+    customer: { id: 4, updated_at: "2034-09-01T08:00:00Z" },
+    location_scope: "customer",
+  } as PlanTaskDetail;
+  const orderDetail = {
+    task: { order_id: 10 },
+    customer: { id: null, updated_at: null },
+    order_updated_at: "2034-09-02T08:00:00Z",
+    location_scope: "order",
+  } as PlanTaskDetail;
+
+  await getPlanDays("2034-10-01", "2034-10-31");
+  await updateTaskLocation(
+    customerDetail,
+    { latitude: 22.61, longitude: 114.05 },
+    { serviceDate: "2034-10-01", dayRevision: "a".repeat(64) },
+  );
+  await restoreTaskAutomaticLocation(
+    orderDetail,
+    { serviceDate: "2034-10-02", dayRevision: "b".repeat(64) },
+  );
+
+  expect(fetchMock).toHaveBeenNthCalledWith(
+    1,
+    "/api/admin/plans/days?date_from=2034-10-01&date_to=2034-10-31",
+    expect.any(Object),
+  );
+  expect(fetchMock).toHaveBeenNthCalledWith(
+    2,
+    "/api/admin/customers/4/location",
+    expect.objectContaining({
+      method: "PATCH",
+      body: JSON.stringify({
+        latitude: 22.61,
+        longitude: 114.05,
+        coordinate_system: "GCJ-02",
+        service_date: "2034-10-01",
+        expected_day_revision: "a".repeat(64),
+        source_order_id: 9,
+        expected_customer_updated_at: "2034-09-01T08:00:00Z",
+      }),
+    }),
+  );
+  expect(fetchMock).toHaveBeenNthCalledWith(
+    3,
+    "/api/admin/orders/10/location/restore-auto",
+    expect.objectContaining({
+      method: "POST",
+      body: JSON.stringify({
+        service_date: "2034-10-02",
+        expected_day_revision: "b".repeat(64),
+        expected_order_updated_at: "2034-09-02T08:00:00Z",
+      }),
+    }),
+  );
+});
+
 afterEach(() => {
   vi.useRealTimers();
   vi.unstubAllGlobals();
diff --git a/frontend/src/features/plans/api.ts b/frontend/src/features/plans/api.ts
index 5b856f9..e51f77d 100644
--- a/frontend/src/features/plans/api.ts
+++ b/frontend/src/features/plans/api.ts
@@ -6,6 +6,8 @@ import type {
   PlanScheduleInput,
   PlanTaskDetail,
   PlanTaskStatusInput,
+  LocationUpdateRead,
+  PlanGeoPoint,
 } from "./types";
 import { requestJson, ROUTE_REQUEST_TIMEOUT_MS } from "../../lib/api";
 
@@ -16,8 +18,11 @@ async function request<T>(path: string, init?: RequestInit, timeoutMs?: number):
   return requestJson<T>(path, init, { timeoutMs });
 }
 
-export function getPlanDays(): Promise<PlanDaysResponse> {
-  return request<PlanDaysResponse>(`${plansPath}/days`);
+export function getPlanDays(dateFrom?: string, dateTo?: string): Promise<PlanDaysResponse> {
+  const query = dateFrom && dateTo
+    ? `?date_from=${encodeURIComponent(dateFrom)}&date_to=${encodeURIComponent(dateTo)}`
+    : "";
+  return request<PlanDaysResponse>(`${plansPath}/days${query}`);
 }
 
 export function getDayPlan(serviceDate: string): Promise<DayPlan> {
@@ -65,3 +70,60 @@ export function updatePlanTaskStatus(
     body: JSON.stringify(payload),
   });
 }
+
+interface LocationConcurrency {
+  serviceDate: string;
+  dayRevision: string;
+}
+
+export function updateTaskLocation(
+  detail: PlanTaskDetail,
+  position: PlanGeoPoint,
+  concurrency: LocationConcurrency,
+): Promise<LocationUpdateRead> {
+  const common = {
+    latitude: position.latitude,
+    longitude: position.longitude,
+    coordinate_system: "GCJ-02",
+    service_date: concurrency.serviceDate,
+    expected_day_revision: concurrency.dayRevision,
+  };
+  if (detail.location_scope === "customer" && detail.customer.id && detail.customer.updated_at) {
+    return request<LocationUpdateRead>(`${apiBase}/api/admin/customers/${detail.customer.id}/location`, {
+      method: "PATCH",
+      body: JSON.stringify({
+        ...common,
+        source_order_id: detail.task.order_id,
+        expected_customer_updated_at: detail.customer.updated_at,
+      }),
+    });
+  }
+  return request<LocationUpdateRead>(`${apiBase}/api/admin/orders/${detail.task.order_id}/location`, {
+    method: "PATCH",
+    body: JSON.stringify({ ...common, expected_order_updated_at: detail.order_updated_at }),
+  });
+}
+
+export function restoreTaskAutomaticLocation(
+  detail: PlanTaskDetail,
+  concurrency: LocationConcurrency,
+): Promise<LocationUpdateRead> {
+  const common = {
+    service_date: concurrency.serviceDate,
+    expected_day_revision: concurrency.dayRevision,
+  };
+  if (detail.location_scope === "customer" && detail.customer.id && detail.customer.updated_at) {
+    return request<LocationUpdateRead>(`${apiBase}/api/admin/customers/${detail.customer.id}/location/restore-auto`, {
+      method: "POST",
+      body: JSON.stringify({
+        ...common,
+        source_order_id: detail.task.order_id,
+        expected_customer_updated_at: detail.customer.updated_at,
+      }),
+    });
+  }
+  return request<LocationUpdateRead>(`${apiBase}/api/admin/orders/${detail.task.order_id}/location/restore-auto`, {
+    method: "POST",
+    body: JSON.stringify({ ...common, expected_order_updated_at: detail.order_updated_at }),
+  });
+}
diff --git a/frontend/src/features/plans/mapProvider.test.ts b/frontend/src/features/plans/mapProvider.test.ts
new file mode 100644
index 0000000..c5c5468
--- /dev/null
+++ b/frontend/src/features/plans/mapProvider.test.ts
@@ -0,0 +1,106 @@
+import { AmapMapProvider } from "./mapProvider";
+
+interface FakeEventTarget {
+  getPosition: () => { getLat: () => number; getLng: () => number };
+}
+
+type EventHandler = (event: {
+  lnglat?: { getLat: () => number; getLng: () => number };
+  target?: FakeEventTarget;
+}) => void;
+
+const markerInstances: FakeMarker[] = [];
+const mapInstances: FakeMap[] = [];
+
+class FakeMarker {
+  handlers = new Map<string, EventHandler>();
+
+  constructor(public options: Record<string, unknown>) {
+    markerInstances.push(this);
+  }
+
+  on(event: string, handler: EventHandler) {
+    this.handlers.set(event, handler);
+  }
+}
+
+class FakePolyline extends FakeMarker {}
+
+class FakeMap {
+  handlers = new Map<string, EventHandler>();
+  overlays: FakeMarker[] = [];
+  destroyed = false;
+
+  constructor(_container: HTMLElement, public options: Record<string, unknown>) {
+    mapInstances.push(this);
+  }
+
+  add(overlays: FakeMarker[]) {
+    this.overlays = overlays;
+  }
+
+  setFitView() {}
+
+  destroy() {
+    this.destroyed = true;
+  }
+
+  on(event: string, handler: EventHandler) {
+    this.handlers.set(event, handler);
+  }
+}
+
+beforeEach(() => {
+  markerInstances.length = 0;
+  mapInstances.length = 0;
+  window.AMap = {
+    Map: FakeMap,
+    Marker: FakeMarker,
+    Polyline: FakePolyline,
+  } as never;
+});
+
+afterEach(() => {
+  delete window.AMap;
+});
+
+it("places a GCJ-02 draft pin on map click and updates it after dragging", async () => {
+  const onDraftPositionChange = vi.fn();
+  const provider = new AmapMapProvider();
+  const cleanup = await provider.mount(document.createElement("div"), {
+    start: { label: "家", position: { latitude: 22.54, longitude: 114.05 } },
+    markers: [{
+      task_id: 7,
+      sequence: 1,
+      customer_name: "虚构定位客户",
+      community: "虚构小区",
+      address: "虚构地址",
+      position: { latitude: 22.55, longitude: 114.06 },
+      navigation_url: null,
+    }],
+    polyline: [],
+    selectedTaskId: 7,
+    locationEditing: true,
+    draftPosition: { latitude: 22.56, longitude: 114.07 },
+  }, {
+    onSelectTask: vi.fn(),
+    onDraftPositionChange,
+  });
+
+  mapInstances[0].handlers.get("click")?.({
+    lnglat: { getLat: () => 22.57, getLng: () => 114.08 },
+  });
+  expect(onDraftPositionChange).toHaveBeenLastCalledWith({ latitude: 22.57, longitude: 114.08 });
+
+  const draftMarker = markerInstances.find((marker) => marker.options.draggable === true);
+  expect(draftMarker).toBeDefined();
+  draftMarker?.handlers.get("dragend")?.({
+    target: { getPosition: () => ({ getLat: () => 22.58, getLng: () => 114.09 }) },
+  });
+  expect(onDraftPositionChange).toHaveBeenLastCalledWith({ latitude: 22.58, longitude: 114.09 });
+
+  const previousMarker = markerInstances.find((marker) => marker.options.title === "虚构地址");
+  expect((previousMarker?.options.content as HTMLDivElement).className).toContain("bg-slate-400");
+  cleanup();
+  expect(mapInstances[0].destroyed).toBe(true);
+});
diff --git a/frontend/src/features/plans/mapProvider.ts b/frontend/src/features/plans/mapProvider.ts
index 5dba0a5..00fa8c9 100644
--- a/frontend/src/features/plans/mapProvider.ts
+++ b/frontend/src/features/plans/mapProvider.ts
@@ -5,13 +5,20 @@ export interface MapRenderModel {
   markers: PlanRouteMarker[];
   polyline: PlanGeoPoint[];
   selectedTaskId: number | null;
+  locationEditing?: boolean;
+  draftPosition?: PlanGeoPoint | null;
+}
+
+export interface MapInteractionCallbacks {
+  onSelectTask: (taskId: number) => void;
+  onDraftPositionChange?: (position: PlanGeoPoint) => void;
 }
 
 export interface MapProvider {
   mount(
     container: HTMLElement,
     model: MapRenderModel,
-    onSelectTask: (taskId: number) => void,
+    callbacks: MapInteractionCallbacks,
   ): Promise<() => void>;
 }
 
@@ -42,8 +49,18 @@ export function markerDisplayOffset(
   };
 }
 
+interface AMapLngLat {
+  getLat: () => number;
+  getLng: () => number;
+}
+
+interface AMapEvent {
+  lnglat?: AMapLngLat;
+  target?: { getPosition?: () => AMapLngLat };
+}
+
 interface AMapOverlay {
-  on?: (event: string, handler: () => void) => void;
+  on?: (event: string, handler: (event: AMapEvent) => void) => void;
 }
 
 interface AMapMap {
@@ -55,6 +72,7 @@ interface AMapMap {
     maxZoom?: number,
   ) => void;
   destroy: () => void;
+  on?: (event: string, handler: (event: AMapEvent) => void) => void;
 }
 
 interface AMapNamespace {
@@ -108,12 +126,13 @@ function markerContent(
   name: string | null = null,
   selected = false,
   offset: MarkerDisplayOffset = { x: 0, y: 0 },
+  muted = false,
 ): HTMLDivElement {
   const content = document.createElement("div");
   content.className = [
     "flex items-center gap-1 rounded-full border-2 border-white px-2 py-1",
     "max-w-36 text-xs font-bold whitespace-nowrap text-white shadow-md",
-    selected ? "bg-amber-600 ring-2 ring-amber-300" : "bg-slate-900",
+    selected ? "bg-amber-600 ring-2 ring-amber-300" : muted ? "bg-slate-400" : "bg-slate-900",
   ].join(" ");
   const sequence = document.createElement("span");
   sequence.textContent = label;
@@ -132,7 +151,7 @@ export class AmapMapProvider implements MapProvider {
   async mount(
     container: HTMLElement,
     model: MapRenderModel,
-    onSelectTask: (taskId: number) => void,
+    callbacks: MapInteractionCallbacks,
   ): Promise<() => void> {
     const AMap = await loadAmap();
     const center = model.start?.position ?? model.markers[0]?.position;
@@ -162,13 +181,33 @@ export class AmapMapProvider implements MapProvider {
         content: markerContent(
           String(item.sequence),
           item.customer_name,
-          item.task_id === model.selectedTaskId,
+          item.task_id === model.selectedTaskId && !model.locationEditing,
           markerDisplayOffset(model.markers, index),
+          model.locationEditing && item.task_id === model.selectedTaskId,
         ),
       });
-      marker.on?.("click", () => onSelectTask(item.task_id));
+      marker.on?.("click", () => callbacks.onSelectTask(item.task_id));
       overlays.push(marker);
     }
+    if (model.locationEditing && model.draftPosition) {
+      const draftMarker = new AMap.Marker({
+        position: position(model.draftPosition),
+        title: "新客户定位",
+        anchor: "center",
+        draggable: true,
+        content: markerContent("新", "拖动微调", true),
+      });
+      draftMarker.on?.("dragend", (event) => {
+        const point = event.target?.getPosition?.();
+        if (point) callbacks.onDraftPositionChange?.({ latitude: point.getLat(), longitude: point.getLng() });
+      });
+      overlays.push(draftMarker);
+    }
+    if (model.locationEditing) {
+      map.on?.("click", (event) => {
+        if (event.lnglat) callbacks.onDraftPositionChange?.({ latitude: event.lnglat.getLat(), longitude: event.lnglat.getLng() });
+      });
+    }
     if (model.polyline.length > 1) {
       overlays.push(
         new AMap.Polyline({
diff --git a/frontend/src/features/plans/types.ts b/frontend/src/features/plans/types.ts
index 3490834..5dd1e0a 100644
--- a/frontend/src/features/plans/types.ts
+++ b/frontend/src/features/plans/types.ts
@@ -18,6 +18,7 @@ export interface PlanCustomerDetail extends PlanCustomerSummary {
   building: string | null;
   unit: string | null;
   room: string | null;
+  updated_at?: string | null;
 }
 
 export interface PlanCatSummary {
@@ -59,6 +60,12 @@ export interface PlanDaySummary {
   order_count: number;
   cat_count: number;
   customer_names: string[];
+  orders?: Array<{
+    order_id: number;
+    customer_name: string;
+    visit_count: number;
+    order_status: OrderStatus;
+  }>;
 }
 
 export interface PlanDaysResponse {
@@ -87,6 +94,25 @@ export interface PlanTaskDetail {
   task_notes: string | null;
   estimated_arrival: string | null;
   photo_count: number;
+  order_updated_at?: string;
+  route_geocode_status?: string | null;
+  current_position?: PlanGeoPoint | null;
+  location_scope?: "customer" | "order";
+  location_sync_order_count?: number;
+  location_sync_task_count?: number;
+}
+
+export interface LocationUpdateRead {
+  scope: "customer" | "order";
+  customer_id: number | null;
+  order_id: number;
+  original_position: PlanGeoPoint | null;
+  position: PlanGeoPoint;
+  affected_orders: number;
+  affected_tasks: number;
+  customer_updated_at: string | null;
+  order_updated_at: string;
+  day_revision: string;
 }
 
 export interface PlanScheduleInput {
diff --git a/frontend/src/pages/FillPage.test.tsx b/frontend/src/pages/FillPage.test.tsx
index 5804280..d147c74 100644
--- a/frontend/src/pages/FillPage.test.tsx
+++ b/frontend/src/pages/FillPage.test.tsx
@@ -109,15 +109,16 @@ it("requires a name and one contact method before opening confirmation", async (
   expect(apiMocks.submitPublicIntake).not.toHaveBeenCalled();
 });
 
-it("allows a partial date, uses visit choices, and submits only after confirmation", async () => {
+it("preserves an untouched legacy schedule and submits only after confirmation", async () => {
   apiMocks.getPublicIntake.mockResolvedValue(responseFor(legacyDraft));
   renderPage();
 
   await screen.findByDisplayValue("P24 页面虚构客户");
   expect(screen.getByRole("button", { name: /地址与交接/ })).toHaveAttribute("aria-expanded", "true");
   expect(screen.getByRole("button", { name: /猫咪资料/ })).toHaveAttribute("aria-expanded", "true");
-  fireEvent.click(screen.getByRole("button", { name: "每天 2 次" }));
-  expect(screen.getByRole("button", { name: "每天 2 次" })).toHaveAttribute("aria-pressed", "true");
+  expect(screen.queryByRole("button", { name: "每天 2 次" })).not.toBeInTheDocument();
+  expect(document.querySelector('input[type="date"]')).not.toBeInTheDocument();
+  expect(screen.getByRole("button", { name: /选择预计上门日期/ })).toBeInTheDocument();
 
   fireEvent.click(screen.getByRole("button", { name: "提交资料" }));
   const dialog = screen.getByRole("alertdialog", { name: "确认提交资料？" });
@@ -136,7 +137,7 @@ it("allows a partial date, uses visit choices, and submits only after confirmati
       service: expect.objectContaining({
         start_date: "2031-05-01",
         end_date: null,
-        visits_per_day: 2,
+        visits_per_day: 1,
       }),
       notes: "客户填写的待审核备注",
     }),
diff --git a/frontend/src/pages/FillPage.tsx b/frontend/src/pages/FillPage.tsx
index 77728bb..eff5335 100644
--- a/frontend/src/pages/FillPage.tsx
+++ b/frontend/src/pages/FillPage.tsx
@@ -28,6 +28,8 @@ import type {
   PublicIntakeState,
 } from "../features/intake/types";
 import { keyStatusOptions } from "../lib/customerDisplay";
+import { MultiDateCalendar } from "../components/ui/MultiDateCalendar";
+import { expandDateRange } from "../components/ui/calendarDates";
 
 const inputClass = "mt-2 min-h-12 w-full rounded-2xl border border-slate-300 bg-white px-4 py-3 text-base text-slate-950 outline-none transition placeholder:text-slate-400 focus:border-orange-500 focus:ring-4 focus:ring-orange-100";
 const textareaClass = `${inputClass} min-h-28 resize-y leading-6`;
@@ -156,6 +158,7 @@ export function FillPage({ token }: { token: string | null }) {
   const [confirmOpen, setConfirmOpen] = useState(false);
   const [addressOpen, setAddressOpen] = useState(false);
   const [catsOpen, setCatsOpen] = useState(false);
+  const [scheduleTouched, setScheduleTouched] = useState(false);
   const [error, setError] = useState<string | null>(
     token ? null : "当前链接缺少专属 Token，请向服务人员索取完整填写链接。",
   );
@@ -248,6 +251,9 @@ export function FillPage({ token }: { token: string | null }) {
 
   const terminalCopy = state && state !== "editable" ? statusCopy(state) : null;
   const keyOptions = keyStatusOptions.map((value) => ({ value, label: keyLabels[value] ?? value }));
+  const selectedDates = draft
+    ? draft.service.service_dates ?? expandDateRange(draft.service.start_date, draft.service.end_date)
+    : [];
 
   return <main className="min-h-screen overflow-x-hidden bg-[#FFF9F1] px-4 py-5 text-[#1D1D1F] sm:py-8">
     <section className="mx-auto max-w-xl" aria-labelledby="fill-title">
@@ -278,20 +284,24 @@ export function FillPage({ token }: { token: string | null }) {
         </section>
 
         <section className="rounded-[2rem] border border-orange-100 bg-white p-5 shadow-sm sm:p-6" aria-labelledby="schedule-title">
-          <div className="flex items-start gap-3"><span className="flex size-10 shrink-0 items-center justify-center rounded-2xl bg-orange-100 text-orange-700"><CalendarDays size={19} /></span><div><h2 id="schedule-title" className="text-lg font-bold">预计服务时间</h2><p className="mt-1 text-xs leading-5 text-slate-500">日期和次数都可以暂不确定。</p></div></div>
-          <div className="mt-6 space-y-5">
-            <Field label="开始日期" type="date" value={draft.service.start_date} onChange={(value) => setDraft({ ...draft, service: { ...draft.service, start_date: value } })} />
-            <Field label="结束日期" type="date" value={draft.service.end_date} onChange={(value) => setDraft({ ...draft, service: { ...draft.service, end_date: value } })} />
-            <fieldset>
-              <legend className="text-sm font-semibold text-slate-800">每天上门次数</legend>
-              <div className="mt-2 grid grid-cols-3 gap-2">
-                {[
-                  { label: "每天 1 次", value: 1 },
-                  { label: "每天 2 次", value: 2 },
-                  { label: "待确认", value: null },
-                ].map((option) => <button key={option.label} type="button" className={`min-h-12 rounded-2xl border px-2 text-sm font-semibold transition ${draft.service.visits_per_day === option.value ? "border-orange-500 bg-orange-50 text-orange-800 ring-2 ring-orange-100" : "border-slate-200 bg-white text-slate-600 hover:border-orange-200"}`} aria-pressed={draft.service.visits_per_day === option.value} onClick={() => setDraft({ ...draft, service: { ...draft.service, visits_per_day: option.value } })}>{option.label}</button>)}
-              </div>
-            </fieldset>
+          <div className="flex items-start gap-3"><span className="flex size-10 shrink-0 items-center justify-center rounded-2xl bg-orange-100 text-orange-700"><CalendarDays size={19} /></span><div><h2 id="schedule-title" className="text-lg font-bold">预计上门时间</h2><p className="mt-1 text-xs leading-5 text-slate-500">可以选择多个不连续日期；暂不确定也可以留空。</p></div></div>
+          <div className="mt-6 min-w-0 max-w-full">
+            <MultiDateCalendar
+              values={selectedDates}
+              onChange={(values) => {
+                setScheduleTouched(true);
+                setDraft({
+                  ...draft,
+                  service: {
+                    service_dates: values,
+                    start_date: null,
+                    end_date: null,
+                    visits_per_day: null,
+                  },
+                });
+              }}
+            />
+            {!scheduleTouched && !draft.service.service_dates && draft.service.start_date ? <p className="mt-3 rounded-xl bg-blue-50 px-3 py-2 text-xs leading-5 text-blue-800">这是旧草稿的连续日期安排；不修改会按原安排保留，点击日历修改后将改为每个选中日期一次。</p> : null}
           </div>
         </section>
 
diff --git a/frontend/src/test/setup.ts b/frontend/src/test/setup.ts
index f149f27..aaddd54 100644
--- a/frontend/src/test/setup.ts
+++ b/frontend/src/test/setup.ts
@@ -1 +1,9 @@
 import "@testing-library/jest-dom/vitest";
+
+class TestResizeObserver {
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+}
+
+globalThis.ResizeObserver = TestResizeObserver;

From 1d8550b7df310e1aa65c8f217e3ecc2186dc06c6 Mon Sep 17 00:00:00 2001
From: damingishere-coder <damingishere@gmail.com>
Date: Sat, 29 Aug 2026 23:03:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E7=AE=80=E5=8C=96=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/api/intake.py                     |  6 ----
 backend/tests/test_intake_api.py              | 10 +-----
 .../features/intake/AdminIntakePage.test.tsx  | 33 +++++++------------
 .../src/features/intake/AdminIntakePage.tsx   | 30 ++++++++++-------
 4 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/backend/app/api/intake.py b/backend/app/api/intake.py
index dc9cf6c..974b689 100644
--- a/backend/app/api/intake.py
+++ b/backend/app/api/intake.py
@@ -357,12 +357,6 @@ def update_submission_list_state(
     )
     if detail.revision != payload.expected_revision:
         raise HTTPException(status_code=409, detail="提交记录已变化，请刷新后重试")
-    voided = detail.status is FormSubmissionStatus.VOIDED or (
-        detail.status is FormSubmissionStatus.REDACTED
-        and detail.decision_mode == "void"
-    )
-    if payload.removed and not voided:
-        raise HTTPException(status_code=409, detail="只有已作废记录可以从列表移除")
     key = _removed_key(detail.submission_uuid)
     flag = session.get(SystemFlag, key)
     if payload.removed and flag is None:
diff --git a/backend/tests/test_intake_api.py b/backend/tests/test_intake_api.py
index 839c8f4..152dd55 100644
--- a/backend/tests/test_intake_api.py
+++ b/backend/tests/test_intake_api.py
@@ -644,19 +644,11 @@ def test_sparse_service_dates_are_canonical_and_create_one_task_per_selected_day
     assert rejected.status_code == 422
 
 
-def test_voided_submission_can_be_removed_and_restored_without_deletion(
+def test_any_submission_can_be_removed_and_restored_without_deletion(
     intake_api_context: IntakeApiContext,
 ) -> None:
     client = intake_api_context.client
     _, summary = submit_for_review(client)
-    voided = client.post(
-        f"/api/admin/intake/submissions/{summary['id']}/void",
-        json={
-            "expected_revision": summary["revision"],
-            "idempotency_key": "list-state-void-0001",
-        },
-    )
-    assert voided.status_code == 200
     detail = client.get(f"/api/admin/intake/submissions/{summary['id']}").json()
     removed = client.patch(
         f"/api/admin/intake/submissions/{summary['id']}/list-state",
diff --git a/frontend/src/features/intake/AdminIntakePage.test.tsx b/frontend/src/features/intake/AdminIntakePage.test.tsx
index 78f3da0..aaf876b 100644
--- a/frontend/src/features/intake/AdminIntakePage.test.tsx
+++ b/frontend/src/features/intake/AdminIntakePage.test.tsx
@@ -126,43 +126,34 @@ it("shows only the newest three links until expanded", async () => {
   expect(screen.queryByText("链接 #17")).not.toBeInTheDocument();
 });
 
-it("moves a voided record out of the current list and can restore it", async () => {
-  const voidedSummary: IntakeSubmissionSummary = {
-    ...summary,
-    status: "voided",
-    removed_at: null,
-  };
-  const voidedDetail: IntakeSubmissionDetail = {
-    ...detail,
-    ...voidedSummary,
-    status: "voided",
-    voided_at: timestamp,
-    decision_mode: "void",
-  };
-  const removedDetail = { ...voidedDetail, removed_at: "2031-05-02T08:00:00Z" };
-  apiMocks.listIntakeSubmissions.mockResolvedValue({ items: [voidedSummary], total: 1 });
-  apiMocks.getIntakeSubmission.mockResolvedValue(voidedDetail);
+it("removes any record from the list with a direct x and can restore it", async () => {
+  const removedDetail = { ...detail, removed_at: "2031-05-02T08:00:00Z" };
   apiMocks.updateIntakeSubmissionListState
     .mockResolvedValueOnce(removedDetail)
-    .mockResolvedValueOnce(voidedDetail);
+    .mockResolvedValueOnce(detail);
   renderPage();
 
-  fireEvent.click(await screen.findByRole("button", { name: "从列表移除" }));
+  fireEvent.click(await screen.findByRole("button", { name: "从列表删除 P10 后台虚构客户" }));
   await waitFor(() => expect(apiMocks.updateIntakeSubmissionListState).toHaveBeenCalledWith(
     9,
     true,
     revision,
   ));
-  expect(await screen.findByRole("button", { name: "恢复到当前列表" })).toBeInTheDocument();
+  expect(within(screen.getByLabelText("提交记录列表")).getByText("还没有客户提交。")).toBeInTheDocument();
+
+  fireEvent.click(screen.getByRole("button", { name: "已移除记录" }));
   expect(within(screen.getByLabelText("提交记录列表")).getByText("P10 后台虚构客户")).toBeInTheDocument();
 
-  fireEvent.click(screen.getByRole("button", { name: "恢复到当前列表" }));
+  fireEvent.click(screen.getByRole("button", { name: "恢复 P10 后台虚构客户" }));
   await waitFor(() => expect(apiMocks.updateIntakeSubmissionListState).toHaveBeenLastCalledWith(
     9,
     false,
     revision,
   ));
-  expect(await screen.findByRole("button", { name: "从列表移除" })).toBeInTheDocument();
+  expect(within(screen.getByLabelText("提交记录列表")).getByText("还没有已移除记录。")).toBeInTheDocument();
+
+  fireEvent.click(screen.getByRole("button", { name: "当前记录" }));
+  expect(within(screen.getByLabelText("提交记录列表")).getByText("P10 后台虚构客户")).toBeInTheDocument();
 });
 
 it("shows the full editable review while keeping the submission list privacy-minimized", async () => {
diff --git a/frontend/src/features/intake/AdminIntakePage.tsx b/frontend/src/features/intake/AdminIntakePage.tsx
index 69a26cf..e1d902e 100644
--- a/frontend/src/features/intake/AdminIntakePage.tsx
+++ b/frontend/src/features/intake/AdminIntakePage.tsx
@@ -13,6 +13,7 @@ import {
   ShieldCheck,
   ShoppingCart,
   Trash2,
+  X,
 } from "lucide-react";
 import { type FormEvent, useCallback, useEffect, useRef, useState } from "react";
 import { Link } from "react-router-dom";
@@ -455,17 +456,24 @@ export function IntakeWorkspace({ embedded = false }: { embedded?: boolean }) {
     }
   }
 
-  async function handleListState(removed: boolean) {
-    if (!detail) return;
-    setAction("list-state");
+  async function handleListState(item: IntakeSubmissionSummary, removed: boolean) {
+    setAction(`list-state-${item.id}`);
     setError(null);
     try {
-      const updated = await updateIntakeSubmissionListState(detail.id, removed, detail.revision);
-      setDetail(updated);
-      setSubmissions((current) => replaceSubmission(current, updated));
-      showRemovedRef.current = removed;
-      setShowRemoved(removed);
-      setSelectedId(updated.id);
+      const updated = await updateIntakeSubmissionListState(item.id, removed, item.revision);
+      const nextSubmissions = replaceSubmission(submissions, updated);
+      setSubmissions(nextSubmissions);
+      if (selectedIdRef.current === item.id) {
+        const nextVisible = nextSubmissions.find(
+          (candidate) => Boolean(candidate.removed_at) === showRemovedRef.current,
+        );
+        setSelectedId(nextVisible?.id ?? null);
+        if (!nextVisible) {
+          setDetail(null);
+          setReviewDraft(null);
+          setUnitPrice("");
+        }
+      }
     } catch (cause) {
       setError(cause instanceof Error ? cause.message : "列表状态修改失败，请刷新后重试。");
     } finally {
@@ -536,7 +544,7 @@ export function IntakeWorkspace({ embedded = false }: { embedded?: boolean }) {
         <section className="cc-surface min-w-0 overflow-hidden" aria-labelledby="submissions-title">
           <div className="flex flex-wrap items-center justify-between gap-3 border-b border-slate-200 px-5 py-4"><div><h2 id="submissions-title" className="font-semibold">提交审核（{visibleSubmissions.length}）</h2><p className="mt-1 text-xs text-slate-500">列表仅显示摘要；完整地址、门禁和钥匙只在右侧详情中读取。</p></div><div className="inline-flex rounded-lg border border-slate-200 bg-slate-50 p-1 text-xs font-medium"><button type="button" className={`rounded-md px-3 py-1.5 ${!showRemoved ? "bg-white text-slate-950 shadow-sm" : "text-slate-500"}`} onClick={() => selectSubmissionList(false)}>当前记录</button><button type="button" className={`rounded-md px-3 py-1.5 ${showRemoved ? "bg-white text-slate-950 shadow-sm" : "text-slate-500"}`} onClick={() => selectSubmissionList(true)}>已移除记录</button></div></div>
           <div className="grid min-h-[600px] lg:grid-cols-[260px_minmax(0,1fr)]">
-            <aside className="cc-scrollbar overflow-y-auto border-b border-slate-200 bg-slate-50/60 lg:border-r lg:border-b-0" aria-label="提交记录列表">{loading ? <div className="flex justify-center py-12"><LoaderCircle className="animate-spin text-slate-400" size={18} /></div> : !loadedOnce && error ? <p className="px-4 py-12 text-center text-sm font-medium text-red-700">云端暂不可用，请稍后刷新。</p> : visibleSubmissions.length === 0 ? <p className="px-4 py-12 text-center text-sm text-slate-500">{showRemoved ? "还没有已移除记录。" : "还没有客户提交。"}</p> : <ul className="p-2">{visibleSubmissions.map((item) => { const serviceDates = item.service_dates ?? []; return <li key={item.id}><button type="button" className={`mb-1 w-full rounded-xl px-3 py-3 text-left ${selectedId === item.id ? "bg-orange-50 text-slate-950 shadow-sm ring-1 ring-orange-200" : "hover:bg-slate-100"}`} onClick={() => { setSelectedId(item.id); setConfirmingDecision(null); }}><div className="flex items-start justify-between gap-2"><span className="truncate text-sm font-semibold">{item.customer_name || "未填写名称"}</span><span className={`shrink-0 text-[11px] ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{submissionStatusLabels[item.status]}</span></div><p className={`mt-1 truncate text-xs ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{item.cat_count} 只猫</p><p className={`mt-2 text-xs ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{serviceDates.length ? `${serviceDates.length} 天 · ${serviceDates.slice(0, 2).join("、")}${serviceDates.length > 2 ? "…" : ""}` : `${item.start_date || "日期未填"} 至 ${item.end_date || "—"}`}</p></button></li>; })}</ul>}</aside>
+            <aside className="cc-scrollbar overflow-y-auto border-b border-slate-200 bg-slate-50/60 lg:border-r lg:border-b-0" aria-label="提交记录列表">{loading ? <div className="flex justify-center py-12"><LoaderCircle className="animate-spin text-slate-400" size={18} /></div> : !loadedOnce && error ? <p className="px-4 py-12 text-center text-sm font-medium text-red-700">云端暂不可用，请稍后刷新。</p> : visibleSubmissions.length === 0 ? <p className="px-4 py-12 text-center text-sm text-slate-500">{showRemoved ? "还没有已移除记录。" : "还没有客户提交。"}</p> : <ul className="p-2">{visibleSubmissions.map((item) => { const serviceDates = item.service_dates ?? []; const customerName = item.customer_name || "未填写名称"; const listStateAction = action === `list-state-${item.id}`; return <li key={item.id} className="relative"><button type="button" className={`mb-1 w-full rounded-xl px-3 py-3 pr-11 text-left ${selectedId === item.id ? "bg-orange-50 text-slate-950 shadow-sm ring-1 ring-orange-200" : "hover:bg-slate-100"}`} onClick={() => { setSelectedId(item.id); setConfirmingDecision(null); }}><div className="flex items-start justify-between gap-2"><span className="truncate text-sm font-semibold">{customerName}</span><span className={`shrink-0 text-[11px] ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{submissionStatusLabels[item.status]}</span></div><p className={`mt-1 truncate text-xs ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{item.cat_count} 只猫</p><p className={`mt-2 text-xs ${selectedId === item.id ? "text-orange-800" : "text-slate-500"}`}>{serviceDates.length ? `${serviceDates.length} 天 · ${serviceDates.slice(0, 2).join("、")}${serviceDates.length > 2 ? "…" : ""}` : `${item.start_date || "日期未填"} 至 ${item.end_date || "—"}`}</p></button><button type="button" className="absolute top-2.5 right-2.5 inline-flex size-7 items-center justify-center rounded-full text-slate-400 transition hover:bg-red-50 hover:text-red-600 disabled:opacity-50" aria-label={showRemoved ? `恢复 ${customerName}` : `从列表删除 ${customerName}`} title={showRemoved ? "恢复到当前列表" : "从当前列表删除"} disabled={action !== null} onClick={() => void handleListState(item, !showRemoved)}>{listStateAction ? <LoaderCircle className="animate-spin" size={15} /> : showRemoved ? <RefreshCw size={15} /> : <X size={16} />}</button></li>; })}</ul>}</aside>
             <div className="min-w-0 bg-slate-50/40 p-4 sm:p-5">
               {selectedId !== null && detail?.id !== selectedId ? <div className="flex items-center justify-center gap-2 py-20 text-sm text-slate-500"><LoaderCircle className="animate-spin" size={18} />正在读取敏感详情…</div> : !detail ? <div className="flex min-h-80 flex-col items-center justify-center text-center text-sm text-slate-500"><FileCheck2 className="text-slate-300" size={34} /><p className="mt-3">选择一条提交查看详情。</p></div> : <div>
                 <div className="mb-4 flex flex-wrap items-start justify-between gap-3">
@@ -550,7 +558,7 @@ export function IntakeWorkspace({ embedded = false }: { embedded?: boolean }) {
                 </div>
                 {detail.status === "processing" ? <div className="mb-4 rounded-lg border border-blue-200 bg-blue-50 p-3 text-sm text-blue-800">云端记录正在处理。如上次因回写失败中断，请使用同一动作重试；本机唯一回执会阻止重复建档。</div> : null}
                 {confirmingDecision ? <div className="mb-4 rounded-lg border border-amber-300 bg-amber-50 p-4" role="alertdialog" aria-label="确认审核动作"><p className="text-sm font-semibold text-amber-950">{confirmingDecision === "customer" ? "确认新建客户档案（不会设置为已归档），并创建已补齐名称的猫咪？" : confirmingDecision === "order" ? "确认新建客户、猫咪、已确认订单和每日任务？" : "确认作废本次提交？"}</p><p className="mt-1 text-xs leading-5 text-amber-800">客户原稿保持只读；失败不会留下半套订单，重复重试不会重复建档。</p><div className="mt-3 flex justify-end gap-2"><button type="button" className="rounded-md border border-amber-300 bg-white px-3 py-2 text-sm font-medium text-amber-900" onClick={() => setConfirmingDecision(null)}>取消</button><button type="button" className="rounded-md bg-slate-900 px-3 py-2 text-sm font-medium text-white" onClick={() => void handleDecision(confirmingDecision)}>{action === `decision-${confirmingDecision}` ? <LoaderCircle className="inline animate-spin" size={14} /> : null}确认执行</button></div></div> : null}
-                {terminal ? <div className={`mb-4 rounded-lg border p-4 text-sm ${detail.status === "voided" ? "border-slate-300 bg-slate-100 text-slate-800" : "border-emerald-200 bg-emerald-50 text-emerald-900"}`}><p className="font-semibold">{detail.status === "voided" ? "该提交已作废。" : detail.status === "redacted" ? "云端敏感资料已按期限清理。" : "已完成本机幂等归档。"}</p><div className="mt-2 flex flex-wrap items-center gap-3">{detail.converted_customer_id ? <Link className="font-medium underline underline-offset-4" to="/admin/customers">查看客户 #{detail.converted_customer_id}</Link> : null}{detail.converted_order_id ? <Link className="font-medium underline underline-offset-4" to="/admin/orders">查看订单 #{detail.converted_order_id}</Link> : null}{detail.status === "voided" || (detail.status === "redacted" && detail.decision_mode === "void") ? <button type="button" className="font-medium text-slate-700 underline underline-offset-4 disabled:opacity-50" disabled={action !== null} onClick={() => void handleListState(!detail.removed_at)}>{detail.removed_at ? "恢复到当前列表" : "从列表移除"}</button> : null}</div></div> : null}
+                {terminal ? <div className={`mb-4 rounded-lg border p-4 text-sm ${detail.status === "voided" ? "border-slate-300 bg-slate-100 text-slate-800" : "border-emerald-200 bg-emerald-50 text-emerald-900"}`}><p className="font-semibold">{detail.status === "voided" ? "该提交已作废。" : detail.status === "redacted" ? "云端敏感资料已按期限清理。" : "已完成本机幂等归档。"}</p><div className="mt-2 flex flex-wrap items-center gap-3">{detail.converted_customer_id ? <Link className="font-medium underline underline-offset-4" to="/admin/customers">查看客户 #{detail.converted_customer_id}</Link> : null}{detail.converted_order_id ? <Link className="font-medium underline underline-offset-4" to="/admin/orders">查看订单 #{detail.converted_order_id}</Link> : null}</div></div> : null}
                 {terminal ? <PayloadDetail payload={detail.review_payload ?? detail.payload} /> : reviewDraft ? <><ReviewEditor payload={reviewDraft} sourceNote={detail.payload.notes} unitPrice={unitPrice} disabled={action !== null || detail.status === "processing"} onPayloadChange={setReviewDraft} onUnitPriceChange={setUnitPrice} /><details className="mt-4 rounded-lg border border-slate-200 bg-white p-4"><summary className="cursor-pointer text-sm font-semibold">查看客户原始提交（永久只读）</summary><div className="mt-4"><PayloadDetail payload={detail.payload} /></div></details></> : null}
                 <AuditTimeline events={detail.audit_events} />
               </div>}

From 463329c238f3d3cffe3022734aa02569a2a26e36 Mon Sep 17 00:00:00 2001
From: damingishere-coder <damingishere@gmail.com>
Date: Sat, 29 Aug 2026 23:27:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=97=A5=E5=8E=86=E5=B8=83=E5=B1=80=E4=B8=8E=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../P26_INTAKE_ORDER_CALENDAR_AND_MAP_PIN.md  |  19 +-
 .../features/orders/OrderScheduleCalendar.tsx | 186 ++++++++++----
 .../src/features/orders/OrdersPage.test.tsx   |  80 +++++-
 frontend/src/features/orders/OrdersPage.tsx   |  34 ++-
 frontend/src/features/plans/RouteMap.test.tsx | 104 ++++++++
 frontend/src/features/plans/RouteMap.tsx      |  38 +--
 .../src/features/plans/mapProvider.test.ts    |  46 +++-
 frontend/src/features/plans/mapProvider.ts    | 228 +++++++++++++-----
 8 files changed, 587 insertions(+), 148 deletions(-)
 create mode 100644 frontend/src/features/plans/RouteMap.test.tsx

diff --git a/docs/tasks/P26_INTAKE_ORDER_CALENDAR_AND_MAP_PIN.md b/docs/tasks/P26_INTAKE_ORDER_CALENDAR_AND_MAP_PIN.md
index 8cdff14..4c48ae4 100644
--- a/docs/tasks/P26_INTAKE_ORDER_CALENDAR_AND_MAP_PIN.md
+++ b/docs/tasks/P26_INTAKE_ORDER_CALENDAR_AND_MAP_PIN.md
@@ -2,15 +2,15 @@
 
 ## 背景
 
-公网客户填写页的原生日期区间控件在微信/iPhone 中会越界，也无法表达隔天或每周数次等不连续日期。后台订单详情占据主区域，缺少按月查看订单和按地理路线拖拽排班的统一工作区；自动地理编码发生偏差时也没有手动修正入口。客户填写链接和已作废提交的列表还需要收敛展示。
+公网客户填写页的原生日期区间控件在微信/iPhone 中会越界，也无法表达隔天或每周数次等不连续日期。后台订单需要按月查看并按日期读取当天全部上门任务，但路线编辑不应重复嵌入订单管理；订单详情也不应使用遮挡主内容的右侧固定抽屉。自动地理编码发生偏差时虽然已有手动修正入口，但临时坐标缺少明确准星，拖动后还会销毁并重建地图。客户填写链接和已作废提交的列表也需要收敛展示。
 
 ## 目标
 
 - 公网客户可用自绘日历多选不连续上门日期，也可暂不选择日期提交。
 - 后台审核兼容旧日期区间，新订单仅按选中日期生成一次上门任务。
-- 订单管理以月历和当天排班为主，订单详情改为次级面板。
-- 当天任务支持拖拽排序并与路线地图编号联动。
-- 管理员可在高德地图上点击或拖动锚点，修正客户及相同地址未执行任务的定位。
+- 订单管理以月历和当天只读上门列表为主，订单详情替换月历区域且不遮挡下方列表。
+- 当天任务的排序只由独立路线图保存，订单管理严格按该顺序展示每次上门。
+- 管理员可通过明确的十字准星在高德地图上点击或拖动定位，且交互时不重建地图实例。
 - 已作废提交可从当前列表移除并恢复；生成链接默认仅展示最新三条。
 
 ## 允许修改范围
@@ -32,8 +32,12 @@
 - 新 intake 日程使用排序去重后的 `service_dates`，最多 366 天；旧区间数据只读兼容，日历发生编辑后才切换为新语义。
 - 新日程每个日期一次；没有日期可以提交，但不能归档为订单。
 - 月历标记使用订单号，同一订单同日多次显示 `#订单号 ×N`，取消订单不显示。
-- 拖拽仅调整所选日期内的任务顺序，保存复用现有 schedule API 和 revision 校验。
+- 拖拽排序仅保留在独立路线图中，保存复用现有 schedule API 和 revision 校验；订单管理不提供拖拽、上下移动或保存排程。
+- 订单管理通过现有 DayPlan 接口读取所选日期的全部有效任务，每次上门独立一条，并严格沿用 `sort_order`；取消任务不进入有效路线列表。
+- 订单详情在正常文档流中替换月历区域并内部滚动，关闭后恢复月历，下方当天上门列表始终保留。
 - 手动锚点只接受 GCJ-02；只改坐标，不改地址文字。客户主档、相同地址未取消/未完成订单及无执行历史任务同步更新，历史任务保持不变。
+- 临时锚点使用以坐标为中心的十字准星，文字标签不得承担落点表达；点击或拖动只更新现有 marker，不得销毁地图或重复 `setFitView()`。
+- 高德地图实例与覆盖物更新分离；坐标、选中任务和编辑状态变化通过控制器更新，只有组件卸载或底图能力变化才销毁实例。
 - 手动来源使用现有 `geocode_status/geocode_fingerprint/geocode_level` 字段表达；地址改变后手动坐标失效。
 - 公网 Relay/Gateway 的 `service_dates` 协议必须同步，但真实更新需另行确认。
 
@@ -41,8 +45,9 @@
 
 - 公网填写页不存在原生日期输入框，390×844 与 430×932 无横向越界。
 - 非连续日期经审核归档后只生成对应日期任务，旧每天两次订单不丢失语义。
-- 订单月历、详情面板、拖拽列表和路线编号联动正确；锁定日与 revision 冲突不会被覆盖。
-- 点击/拖动地图锚点后，可信手动坐标按规则同步；自动恢复失败时保留原手动位置。
+- 订单月历点击日期后完整展示当天有效上门，顺序与路线图已保存顺序一致；同一订单同日多次上门逐条展示。
+- 订单详情替换月历区域且不遮挡当天列表；订单管理不出现地图或排程编辑控件。
+- 点击/拖动地图准星后地图不闪烁、不跳回、不重新缩放，可信手动坐标仍按原规则同步；自动恢复失败时保留原手动位置。
 - 已作废提交移除/恢复不改变原始提交；链接列表默认三条并可展开。
 - 前后端完整测试、lint、typecheck、普通构建和 public 构建通过。
 
diff --git a/frontend/src/features/orders/OrderScheduleCalendar.tsx b/frontend/src/features/orders/OrderScheduleCalendar.tsx
index 2329a5f..d153639 100644
--- a/frontend/src/features/orders/OrderScheduleCalendar.tsx
+++ b/frontend/src/features/orders/OrderScheduleCalendar.tsx
@@ -1,11 +1,19 @@
-import { CalendarDays, ChevronLeft, ChevronRight } from "lucide-react";
+import {
+  CalendarDays,
+  ChevronLeft,
+  ChevronRight,
+  Clock3,
+  LoaderCircle,
+  MapPin,
+} from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
+import { Link } from "react-router-dom";
 
 import { CalendarMonthGrid } from "../../components/ui/CalendarMonthGrid";
 import { localDateValue, parseLocalDate } from "../../components/ui/calendarDates";
-import { DailyPlansPage } from "../plans/DailyPlansPage";
-import { getPlanDays } from "../plans/api";
-import type { PlanDaySummary } from "../plans/types";
+import { getDayPlan, getPlanDays } from "../plans/api";
+import { planTaskStatusLabels } from "../plans/constants";
+import type { DayPlan, PlanDaySummary, PlanTaskStatus } from "../plans/types";
 
 function monthBounds(month: Date): [string, string] {
   return [
@@ -14,17 +22,39 @@ function monthBounds(month: Date): [string, string] {
   ];
 }
 
+function displayDate(value: string): string {
+  const [year, month, day] = value.split("-");
+  return `${year} 年 ${Number(month)} 月 ${Number(day)} 日`;
+}
+
+function taskStatusStyle(status: PlanTaskStatus): string {
+  return {
+    pending: "bg-amber-50 text-amber-700",
+    confirmed: "bg-blue-50 text-blue-700",
+    ready: "bg-cyan-50 text-cyan-700",
+    in_progress: "bg-violet-50 text-violet-700",
+    completed: "bg-emerald-50 text-emerald-700",
+    exception: "bg-red-50 text-red-700",
+    cancelled: "bg-slate-200 text-slate-600",
+  }[status];
+}
+
 interface OrderScheduleCalendarProps {
   selectedDate: string;
   onSelectDate: (date: string) => void;
   onSelectOrder: (orderId: number) => void;
+  refreshKey: number;
 }
 
-export function OrderScheduleCalendar({ selectedDate, onSelectDate, onSelectOrder }: OrderScheduleCalendarProps) {
+export function OrderScheduleCalendar({
+  selectedDate,
+  onSelectDate,
+  onSelectOrder,
+  refreshKey,
+}: OrderScheduleCalendarProps) {
   const [visibleMonth, setVisibleMonth] = useState(() => parseLocalDate(selectedDate));
   const [days, setDays] = useState<PlanDaySummary[]>([]);
   const [error, setError] = useState<string | null>(null);
-  const [dirty, setDirty] = useState(false);
   const dayMap = useMemo(() => new Map(days.map((day) => [day.service_date, day])), [days]);
 
   useEffect(() => {
@@ -40,58 +70,124 @@ export function OrderScheduleCalendar({ selectedDate, onSelectDate, onSelectOrde
         if (active) setError(cause instanceof Error ? cause.message : "月历排班加载失败，请重试。");
       });
     return () => { active = false; };
-  }, [visibleMonth]);
+  }, [refreshKey, visibleMonth]);
 
   function changeMonth(offset: number) {
-    if (dirty) return;
     setVisibleMonth((current) => new Date(current.getFullYear(), current.getMonth() + offset, 1));
   }
 
   function selectToday() {
-    if (dirty) return;
     const today = new Date();
     setVisibleMonth(new Date(today.getFullYear(), today.getMonth(), 1));
     onSelectDate(localDateValue(today));
   }
 
   return (
-    <main className="min-w-0 bg-slate-50/60 p-4 sm:p-5" aria-label="订单月历与当天排班">
-      <section className="rounded-xl border border-slate-200 bg-white p-4 shadow-sm" aria-labelledby="order-calendar-title">
-        <div className="flex flex-wrap items-center justify-between gap-3">
-          <div><h3 id="order-calendar-title" className="flex items-center gap-2 font-semibold"><CalendarDays size={18} />订单月历</h3><p className="mt-1 text-xs text-slate-500">点击日期查看当天排班；点击订单编号打开右侧详情。</p></div>
-          <div className="flex items-center gap-2">
-            <button type="button" className="cc-icon-button" aria-label="上个月" onClick={() => changeMonth(-1)} disabled={dirty}><ChevronLeft size={17} /></button>
-            <span className="min-w-28 text-center text-sm font-semibold">{visibleMonth.getFullYear()} 年 {visibleMonth.getMonth() + 1} 月</span>
-            <button type="button" className="cc-icon-button" aria-label="下个月" onClick={() => changeMonth(1)} disabled={dirty}><ChevronRight size={17} /></button>
-            <button type="button" className="cc-button cc-button--secondary min-h-9 px-3 text-xs whitespace-nowrap" onClick={selectToday} disabled={dirty}>今天</button>
-          </div>
+    <section className="rounded-xl border border-slate-200 bg-white p-4 shadow-sm" aria-labelledby="order-calendar-title">
+      <div className="flex flex-wrap items-center justify-between gap-3">
+        <div><h3 id="order-calendar-title" className="flex items-center gap-2 font-semibold"><CalendarDays size={18} />订单月历</h3><p className="mt-1 text-xs text-slate-500">点击日期查看当天全部上门；点击订单编号查看订单详情。</p></div>
+        <div className="flex items-center gap-2">
+          <button type="button" className="cc-icon-button" aria-label="上个月" onClick={() => changeMonth(-1)}><ChevronLeft size={17} /></button>
+          <span className="min-w-28 text-center text-sm font-semibold">{visibleMonth.getFullYear()} 年 {visibleMonth.getMonth() + 1} 月</span>
+          <button type="button" className="cc-icon-button" aria-label="下个月" onClick={() => changeMonth(1)}><ChevronRight size={17} /></button>
+          <button type="button" className="cc-button cc-button--secondary min-h-9 px-3 text-xs whitespace-nowrap" onClick={selectToday}>今天</button>
         </div>
-        {error ? <p className="mt-3 rounded-lg bg-red-50 px-3 py-2 text-xs text-red-700">{error}</p> : null}
-        <CalendarMonthGrid
-          month={visibleMonth}
-          fixedWeeks
-          weekdayPrefix="周"
-          className="mt-4 grid grid-cols-7 overflow-hidden rounded-lg border border-slate-200"
-          weekdayClassName="border-b border-slate-200 bg-slate-50 px-1 py-2 text-center text-xs font-medium whitespace-nowrap text-slate-500"
-          emptyClassName="min-h-24 border-r border-b border-slate-100 bg-slate-50/40"
-          renderDay={(date) => {
-            const value = localDateValue(date);
-            const day = dayMap.get(value);
-            return (
-              <div className={`min-h-24 min-w-0 border-r border-b border-slate-100 p-1.5 text-left align-top transition hover:bg-orange-50 ${selectedDate === value ? "bg-orange-50 ring-2 ring-inset ring-orange-400" : "bg-white"}`} onClick={() => !dirty && onSelectDate(value)}>
-                <button type="button" className={`inline-flex size-6 items-center justify-center rounded-full text-xs font-semibold ${value === localDateValue(new Date()) ? "bg-slate-900 text-white" : "text-slate-600"}`} onClick={() => !dirty && onSelectDate(value)} disabled={dirty} aria-label={`选择 ${value}`}>{date.getDate()}</button>
-                <span className="mt-1 block space-y-1">
-                  {(day?.orders ?? []).slice(0, 3).map((order) => <button key={order.order_id} type="button" className={`block w-full truncate rounded px-1.5 py-1 text-left text-[11px] font-semibold ${order.order_status === "completed" ? "bg-emerald-50 text-emerald-700" : "bg-orange-100 text-orange-900"}`} onClick={(event) => { event.stopPropagation(); onSelectOrder(order.order_id); }}>#{order.order_id}{order.visit_count > 1 ? ` ×${order.visit_count}` : ""} · {order.customer_name}</button>)}
-                  {(day?.orders?.length ?? 0) > 3 ? <span className="block px-1 text-[11px] text-slate-500">还有 {day!.orders!.length - 3} 笔</span> : null}
-                </span>
-              </div>
-            );
-          }}
-        />
-      </section>
-      <div className="mt-5">
-        <DailyPlansPage key={selectedDate} onDirtyChange={setDirty} />
       </div>
-    </main>
+      {error ? <p className="mt-3 rounded-lg bg-red-50 px-3 py-2 text-xs text-red-700">{error}</p> : null}
+      <CalendarMonthGrid
+        month={visibleMonth}
+        fixedWeeks
+        weekdayPrefix="周"
+        className="mt-4 grid grid-cols-7 overflow-hidden rounded-lg border border-slate-200"
+        weekdayClassName="border-b border-slate-200 bg-slate-50 px-1 py-2 text-center text-xs font-medium whitespace-nowrap text-slate-500"
+        emptyClassName="min-h-24 border-r border-b border-slate-100 bg-slate-50/40"
+        renderDay={(date) => {
+          const value = localDateValue(date);
+          const day = dayMap.get(value);
+          return (
+            <div className={`min-h-24 min-w-0 border-r border-b border-slate-100 p-1.5 text-left align-top transition hover:bg-orange-50 ${selectedDate === value ? "bg-orange-50 ring-2 ring-inset ring-orange-400" : "bg-white"}`} onClick={() => onSelectDate(value)}>
+              <button type="button" className={`inline-flex size-6 items-center justify-center rounded-full text-xs font-semibold ${value === localDateValue(new Date()) ? "bg-slate-900 text-white" : "text-slate-600"}`} onClick={() => onSelectDate(value)} aria-label={`选择 ${value}`}>{date.getDate()}</button>
+              <span className="mt-1 block space-y-1">
+                {(day?.orders ?? []).slice(0, 3).map((order) => <button key={order.order_id} type="button" className={`block w-full truncate rounded px-1.5 py-1 text-left text-[11px] font-semibold ${order.order_status === "completed" ? "bg-emerald-50 text-emerald-700" : "bg-orange-100 text-orange-900"}`} onClick={(event) => { event.stopPropagation(); onSelectOrder(order.order_id); }}>#{order.order_id}{order.visit_count > 1 ? ` ×${order.visit_count}` : ""} · {order.customer_name}</button>)}
+                {(day?.orders?.length ?? 0) > 3 ? <span className="block px-1 text-[11px] text-slate-500">还有 {day!.orders!.length - 3} 笔</span> : null}
+              </span>
+            </div>
+          );
+        }}
+      />
+    </section>
+  );
+}
+
+interface OrderDayVisitsProps {
+  selectedDate: string;
+  onSelectOrder: (orderId: number) => void;
+  refreshKey: number;
+}
+
+export function OrderDayVisits({ selectedDate, onSelectOrder, refreshKey }: OrderDayVisitsProps) {
+  const [retryKey, setRetryKey] = useState(0);
+  const requestKey = `${selectedDate}:${refreshKey}:${retryKey}`;
+  const [result, setResult] = useState<{
+    requestKey: string;
+    plan: DayPlan | null;
+    error: string | null;
+  }>({ requestKey: "", plan: null, error: null });
+
+  useEffect(() => {
+    let active = true;
+    getDayPlan(selectedDate)
+      .then((response) => {
+        if (active) setResult({ requestKey, plan: response, error: null });
+      })
+      .catch((cause: unknown) => {
+        if (!active) return;
+        setResult({
+          requestKey,
+          plan: null,
+          error: cause instanceof Error ? cause.message : "当天上门加载失败，请重试。",
+        });
+      });
+    return () => { active = false; };
+  }, [requestKey, selectedDate]);
+
+  const loading = result.requestKey !== requestKey;
+  const plan = loading ? null : result.plan;
+  const error = loading ? null : result.error;
+  const tasks = plan?.tasks.filter((task) => task.status !== "cancelled") ?? [];
+  const orderCount = new Set(tasks.map((task) => task.order_id)).size;
+
+  return (
+    <section className="rounded-xl border border-slate-200 bg-white shadow-sm" aria-label={`${selectedDate} 当天上门`}>
+      <div className="flex flex-wrap items-center justify-between gap-3 border-b border-slate-200 px-4 py-3">
+        <div>
+          <h3 className="font-semibold text-slate-950">{displayDate(selectedDate)} · 当天上门</h3>
+          <p className="mt-1 text-xs text-slate-500">{tasks.length} 次上门 · {orderCount} 笔订单；顺序来自路线图最后保存的排程。</p>
+        </div>
+        <Link className="cc-button cc-button--secondary min-h-9 px-3 text-xs" to={`/admin/routes?date=${selectedDate}`}><MapPin size={14} />去路线图调整顺序</Link>
+      </div>
+      {loading ? (
+        <div className="flex items-center justify-center gap-2 px-4 py-12 text-sm text-slate-500"><LoaderCircle className="animate-spin" size={17} />正在加载当天上门…</div>
+      ) : error ? (
+        <div className="px-4 py-8 text-center"><p className="text-sm text-red-700">{error}</p><button type="button" className="cc-button cc-button--secondary mt-3" onClick={() => setRetryKey((current) => current + 1)}>重试</button></div>
+      ) : tasks.length === 0 ? (
+        <div className="px-4 py-10 text-center text-sm text-slate-500"><CalendarDays className="mx-auto mb-3 text-slate-300" size={32} />这一天没有有效上门任务</div>
+      ) : (
+        <ol className="grid gap-2 p-3 2xl:grid-cols-2">
+          {tasks.map((task, index) => (
+            <li key={task.id}>
+              <button type="button" className="flex w-full items-start gap-3 rounded-xl border border-slate-200 bg-slate-50/70 p-3 text-left transition hover:border-orange-200 hover:bg-orange-50" onClick={() => onSelectOrder(task.order_id)} aria-label={`路线第 ${index + 1} 站，${task.customer.name}，订单 #${task.order_id}`}>
+                <span className="flex size-8 shrink-0 items-center justify-center rounded-full bg-[#FF9500] text-sm font-semibold text-slate-950">{index + 1}</span>
+                <span className="min-w-0 flex-1">
+                  <span className="flex flex-wrap items-center gap-2"><span className="truncate text-sm font-semibold text-slate-950">{task.customer.name}</span><span className={`rounded-full px-2 py-0.5 text-[11px] font-medium ${taskStatusStyle(task.status)}`}>{planTaskStatusLabels[task.status]}</span></span>
+                  <span className="mt-1 block truncate text-xs text-slate-500">订单 #{task.order_id} · {task.customer.address || "地址待补充"}</span>
+                  <span className="mt-2 flex flex-wrap items-center gap-x-3 gap-y-1 text-xs text-slate-600"><span className="inline-flex items-center gap-1"><Clock3 size={13} />{task.planned_time?.slice(0, 5) || "时间待设置"}</span><span>{task.cats.length ? task.cats.map((cat) => cat.name).join("、") : `${task.cat_count} 只猫`}</span></span>
+                </span>
+              </button>
+            </li>
+          ))}
+        </ol>
+      )}
+    </section>
   );
 }
diff --git a/frontend/src/features/orders/OrdersPage.test.tsx b/frontend/src/features/orders/OrdersPage.test.tsx
index d11b207..5535983 100644
--- a/frontend/src/features/orders/OrdersPage.test.tsx
+++ b/frontend/src/features/orders/OrdersPage.test.tsx
@@ -2,6 +2,7 @@ import { fireEvent, render, screen, waitFor, within } from "@testing-library/rea
 import { MemoryRouter } from "react-router-dom";
 
 import { OrdersPage } from "./OrdersPage";
+import type { PlanTaskSummary } from "../plans/types";
 import type {
   OrderDetail,
   OrderFormOptions,
@@ -21,10 +22,9 @@ const apiMocks = vi.hoisted(() => ({
   previewDemoData: vi.fn(),
   clearDemoData: vi.fn(),
 }));
-const planApiMocks = vi.hoisted(() => ({ getPlanDays: vi.fn() }));
+const planApiMocks = vi.hoisted(() => ({ getPlanDays: vi.fn(), getDayPlan: vi.fn() }));
 
 vi.mock("./api", () => apiMocks);
-vi.mock("../plans/DailyPlansPage", () => ({ DailyPlansPage: () => <div>当天排班工作区</div> }));
 vi.mock("../plans/api", () => planApiMocks);
 
 const timestamp = "2030-09-01T08:00:00";
@@ -180,6 +180,27 @@ beforeEach(() => {
   apiMocks.updateOrderStatus.mockResolvedValue(detail);
   apiMocks.deleteOrder.mockResolvedValue(undefined);
   planApiMocks.getPlanDays.mockResolvedValue({ items: [], total: 0 });
+  planApiMocks.getDayPlan.mockResolvedValue({
+    service_date: "2030-10-01",
+    task_count: 1,
+    order_count: 1,
+    cat_count: 2,
+    revision: "p".repeat(64),
+    schedule_locked: false,
+    tasks: [{
+      id: 1,
+      order_id: 1,
+      service_date: "2030-10-01",
+      planned_time: "09:30:00",
+      sort_order: 0,
+      status: "confirmed",
+      customer: summary.customer,
+      cat_count: 2,
+      cats: summary.cats.map((cat) => ({ id: cat.id, name: cat.name })),
+      items: tasks[0].items,
+      has_execution_history: false,
+    }],
+  });
 });
 
 it("uses the month calendar as the primary view and opens details on demand", async () => {
@@ -202,15 +223,68 @@ it("uses the month calendar as the primary view and opens details on demand", as
   fireEvent.click(marker);
   expect(await screen.findByRole("heading", { name: "订单 #1", level: 2 })).toBeInTheDocument();
   expect(apiMocks.getOrder).toHaveBeenCalledWith(1);
+  expect(screen.queryByRole("heading", { name: "订单月历" })).not.toBeInTheDocument();
+  expect(screen.getByLabelText("2030-10-01 当天上门")).toBeInTheDocument();
+  expect(screen.queryByRole("heading", { name: "路线地图" })).not.toBeInTheDocument();
+  expect(screen.queryByRole("button", { name: "保存排程" })).not.toBeInTheDocument();
 
   fireEvent.click(screen.getByRole("button", { name: "关闭订单详情" }));
   expect(screen.queryByRole("heading", { name: "订单 #1", level: 2 })).not.toBeInTheDocument();
+  expect(await screen.findByRole("heading", { name: "订单月历" })).toBeInTheDocument();
+  expect(screen.getByLabelText("2030-10-01 当天上门")).toBeInTheDocument();
   const collapse = screen.getByRole("button", { name: "收起订单列表" });
   fireEvent.click(collapse);
   expect(screen.getByLabelText("订单列表")).toHaveClass("hidden");
   expect(screen.getByRole("button", { name: "展开订单列表" })).toBeInTheDocument();
 });
 
+it("shows every active visit in the exact route-saved order", async () => {
+  const dayTask = (
+    id: number,
+    orderId: number,
+    customerName: string,
+    sortOrder: number,
+    status: PlanTaskSummary["status"] = "confirmed",
+  ): PlanTaskSummary => ({
+    id,
+    order_id: orderId,
+    service_date: "2030-10-01",
+    planned_time: sortOrder === 0 ? "08:30:00" : null,
+    sort_order: sortOrder,
+    status,
+    customer: { id: orderId, name: customerName, community: "虚构小区", address: `${customerName}地址` },
+    cat_count: 1,
+    cats: [{ id, name: `猫咪${id}` }],
+    items: [{ item_type: "feed", required: true, completed: false }],
+    has_execution_history: false,
+  });
+  planApiMocks.getDayPlan.mockResolvedValue({
+    service_date: "2030-10-01",
+    task_count: 4,
+    order_count: 3,
+    cat_count: 4,
+    revision: "r".repeat(64),
+    schedule_locked: false,
+    tasks: [
+      dayTask(8, 2, "路线第一位客户", 0),
+      dayTask(3, 1, "同单第一次上门", 1),
+      dayTask(4, 1, "同单第二次上门", 2),
+      dayTask(9, 3, "已取消客户", 3, "cancelled"),
+    ],
+  });
+  renderPage(false, "/admin/orders?date=2030-10-01");
+
+  const visitList = await screen.findByLabelText("2030-10-01 当天上门");
+  const visitButtons = within(visitList).getAllByRole("button", { name: /路线第/ });
+  expect(visitButtons.map((button) => button.getAttribute("aria-label"))).toEqual([
+    "路线第 1 站，路线第一位客户，订单 #2",
+    "路线第 2 站，同单第一次上门，订单 #1",
+    "路线第 3 站，同单第二次上门，订单 #1",
+  ]);
+  expect(within(visitList).queryByText("已取消客户")).not.toBeInTheDocument();
+  expect(within(visitList).getByRole("link", { name: "去路线图调整顺序" })).toHaveAttribute("href", "/admin/routes?date=2030-10-01");
+});
+
 it("shows an order, authoritative pricing, and seven generated tasks", async () => {
   renderPage();
 
@@ -223,7 +297,7 @@ it("shows an order, authoritative pricing, and seven generated tasks", async ()
   ).toBeInTheDocument();
   expect(screen.getByText("7 个日期 · 7 次")).toBeInTheDocument();
   expect(screen.getAllByText("¥245.00").length).toBeGreaterThanOrEqual(2);
-  expect(screen.getByText("共 7 个任务；具体时间与排序请在“按天计划”中设置。")).toBeInTheDocument();
+  expect(screen.getByText("共 7 个任务；具体时间与顺序由“路线图”维护。")).toBeInTheDocument();
   expect(screen.getAllByText("2030-10-01").length).toBeGreaterThanOrEqual(1);
   expect(screen.getAllByText("2030-10-07").length).toBeGreaterThanOrEqual(1);
   expect(apiMocks.getOrder).toHaveBeenCalledWith(1);
diff --git a/frontend/src/features/orders/OrdersPage.tsx b/frontend/src/features/orders/OrdersPage.tsx
index 7c38f07..a492bb0 100644
--- a/frontend/src/features/orders/OrdersPage.tsx
+++ b/frontend/src/features/orders/OrdersPage.tsx
@@ -32,7 +32,7 @@ import {
 } from "./api";
 import { serviceItemOptions } from "./constants";
 import { OrderForm } from "./OrderForm";
-import { OrderScheduleCalendar } from "./OrderScheduleCalendar";
+import { OrderDayVisits, OrderScheduleCalendar } from "./OrderScheduleCalendar";
 import type {
   OrderDetail,
   OrderCreateInput,
@@ -125,6 +125,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
   const [deleting, setDeleting] = useState(false);
   const [geocoding, setGeocoding] = useState(false);
   const [listCollapsed, setListCollapsed] = useState(false);
+  const [scheduleRefreshKey, setScheduleRefreshKey] = useState(0);
   const listRequestId = useRef(0);
 
   const applyOrders = useCallback((items: OrderSummary[]) => {
@@ -202,6 +203,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
     });
     setFormMode(null);
     await refreshOrders();
+    setScheduleRefreshKey((current) => current + 1);
   }
 
   function selectOrder(orderId: number) {
@@ -222,10 +224,12 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
   }
 
   function selectScheduleDate(date: string) {
+    setOrderDetail(null);
     setSearchParams((current) => {
       const next = new URLSearchParams(current);
       next.set("date", date);
       next.delete("task_id");
+      next.delete("order_id");
       return next;
     });
   }
@@ -240,6 +244,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
       const updated = await updateOrderStatus(orderDetail.id, status);
       setOrderDetail(updated);
       await refreshOrders();
+      setScheduleRefreshKey((current) => current + 1);
     } catch (cause) {
       setPageError(cause instanceof Error ? cause.message : "订单状态更新失败，请重试。");
     } finally {
@@ -256,6 +261,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
       await deleteOrder(orderDetail.id);
       closeOrderDetail();
       await refreshOrders();
+      setScheduleRefreshKey((current) => current + 1);
     } catch (cause) {
       setPageError(cause instanceof Error ? cause.message : "订单删除失败，请重试。");
     } finally {
@@ -277,6 +283,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
       await clearDemoData();
       closeOrderDetail();
       await refreshOrders();
+      setScheduleRefreshKey((current) => current + 1);
     } catch (cause) {
       setPageError(cause instanceof Error ? cause.message : "演示数据清理失败，请重试。");
     } finally {
@@ -292,6 +299,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
       const updated = await retryOrderGeocode(orderDetail.id);
       setOrderDetail(updated);
       await refreshOrders();
+      setScheduleRefreshKey((current) => current + 1);
     } catch (cause) {
       setPageError(cause instanceof Error ? cause.message : "地址定位重试失败。");
     } finally {
@@ -380,13 +388,16 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
           </div>
         </aside>
 
-        <OrderScheduleCalendar
-          selectedDate={requestedDate}
-          onSelectDate={selectScheduleDate}
-          onSelectOrder={selectOrder}
-        />
-
-        {selectedOrderId !== null ? <div className="fixed inset-0 z-50 min-w-0 overflow-y-auto bg-slate-50 shadow-2xl lg:left-auto lg:w-[min(920px,78vw)]">
+        <main className="min-w-0 bg-slate-50/60 p-4 sm:p-5" aria-label="订单月历与详情">
+          <div className="space-y-5">
+        {selectedOrderId === null ? (
+          <OrderScheduleCalendar
+            selectedDate={requestedDate}
+            onSelectDate={selectScheduleDate}
+            onSelectOrder={selectOrder}
+            refreshKey={scheduleRefreshKey}
+          />
+        ) : <section className="cc-scrollbar h-[min(620px,72vh)] min-h-[480px] overflow-y-auto rounded-xl border border-slate-200 bg-slate-50 shadow-sm" aria-label="订单详情区域">
           {selectedOrderId !== null && orderDetail?.id !== selectedOrderId ? (
             <div className="flex h-full min-h-96 items-center justify-center gap-2 text-sm text-slate-500"><LoaderCircle className="animate-spin" size={18} />正在加载订单详情…</div>
           ) : selectedOrderId === null || !orderDetail ? (
@@ -464,7 +475,7 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
                 <div className="flex items-center justify-between gap-3">
                   <div>
                     <h3 id="generated-tasks-title" className="text-base font-semibold text-slate-950">已生成任务</h3>
-                    <p className="mt-1 text-xs text-slate-500">共 {orderDetail.task_count} 个任务；具体时间与排序请在“按天计划”中设置。</p>
+                    <p className="mt-1 text-xs text-slate-500">共 {orderDetail.task_count} 个任务；具体时间与顺序由“路线图”维护。</p>
                   </div>
                   <span className="inline-flex items-center gap-1.5 rounded-full bg-emerald-50 px-2.5 py-1 text-xs font-medium text-emerald-700"><CheckCircle2 size={13} />自动生成完成</span>
                 </div>
@@ -488,7 +499,10 @@ export function OrdersPage({ initialCreate = false }: OrdersPageProps) {
               </section>
             </div>
           )}
-        </div> : null}
+        </section>}
+            <OrderDayVisits selectedDate={requestedDate} onSelectOrder={selectOrder} refreshKey={scheduleRefreshKey} />
+          </div>
+        </main>
       </div>
 
       {formMode && formOptions ? (
diff --git a/frontend/src/features/plans/RouteMap.test.tsx b/frontend/src/features/plans/RouteMap.test.tsx
new file mode 100644
index 0000000..f8ffa56
--- /dev/null
+++ b/frontend/src/features/plans/RouteMap.test.tsx
@@ -0,0 +1,104 @@
+import { render, waitFor } from "@testing-library/react";
+
+import { RouteMap } from "./RouteMap";
+import type { MapRenderModel } from "./mapProvider";
+import type { PlanRouteMarker } from "./types";
+
+const mapMocks = vi.hoisted(() => ({
+  mount: vi.fn(),
+  update: vi.fn(),
+  dispose: vi.fn(),
+}));
+
+vi.mock("./mapProvider", async () => {
+  const actual = await vi.importActual<typeof import("./mapProvider")>("./mapProvider");
+  return {
+    ...actual,
+    hasAmapBrowserKey: () => true,
+    hasAmapBrowserSecurityCode: () => true,
+    AmapMapProvider: class {
+      mount(container: HTMLElement, model: MapRenderModel) {
+        mapMocks.mount(container, model);
+        return Promise.resolve({ update: mapMocks.update, dispose: mapMocks.dispose });
+      }
+    },
+  };
+});
+
+const markers: PlanRouteMarker[] = [{
+  task_id: 7,
+  sequence: 1,
+  customer_name: "虚构定位客户",
+  community: "虚构小区",
+  address: "虚构地址",
+  position: { latitude: 22.55, longitude: 114.06 },
+  navigation_url: null,
+}];
+
+beforeEach(() => {
+  vi.resetAllMocks();
+});
+
+it("keeps one map controller while draft coordinates and selection change", async () => {
+  const onAmapReadyChange = vi.fn();
+  const view = render(
+    <RouteMap
+      providerName="amap"
+      start={{ label: "家", position: { latitude: 22.54, longitude: 114.05 } }}
+      markers={markers}
+      route={null}
+      selectedTaskId={7}
+      onSelectTask={vi.fn()}
+      locationEditing
+      draftPosition={{ latitude: 22.56, longitude: 114.07 }}
+      onDraftPositionChange={vi.fn()}
+      onAmapReadyChange={onAmapReadyChange}
+    />,
+  );
+
+  await waitFor(() => expect(mapMocks.mount).toHaveBeenCalledTimes(1));
+  expect(onAmapReadyChange).toHaveBeenCalledWith(true);
+
+  view.rerender(
+    <RouteMap
+      providerName="amap"
+      start={{ label: "家", position: { latitude: 22.54, longitude: 114.05 } }}
+      markers={markers}
+      route={null}
+      selectedTaskId={7}
+      onSelectTask={vi.fn()}
+      locationEditing
+      draftPosition={{ latitude: 22.58, longitude: 114.09 }}
+      onDraftPositionChange={vi.fn()}
+      onAmapReadyChange={onAmapReadyChange}
+    />,
+  );
+
+  await waitFor(() => expect(mapMocks.update).toHaveBeenCalledWith(expect.objectContaining({
+    draftPosition: { latitude: 22.58, longitude: 114.09 },
+  })));
+  expect(mapMocks.mount).toHaveBeenCalledTimes(1);
+  expect(mapMocks.dispose).not.toHaveBeenCalled();
+
+  view.rerender(
+    <RouteMap
+      providerName="amap"
+      start={{ label: "家", position: { latitude: 22.54, longitude: 114.05 } }}
+      markers={markers}
+      route={null}
+      selectedTaskId={null}
+      onSelectTask={vi.fn()}
+      locationEditing
+      draftPosition={{ latitude: 22.58, longitude: 114.09 }}
+      onDraftPositionChange={vi.fn()}
+      onAmapReadyChange={onAmapReadyChange}
+    />,
+  );
+
+  await waitFor(() => expect(mapMocks.update).toHaveBeenCalledWith(expect.objectContaining({ selectedTaskId: null })));
+  expect(mapMocks.mount).toHaveBeenCalledTimes(1);
+  expect(mapMocks.dispose).not.toHaveBeenCalled();
+
+  view.unmount();
+  expect(mapMocks.dispose).toHaveBeenCalledTimes(1);
+});
diff --git a/frontend/src/features/plans/RouteMap.tsx b/frontend/src/features/plans/RouteMap.tsx
index 888a1a6..c671a15 100644
--- a/frontend/src/features/plans/RouteMap.tsx
+++ b/frontend/src/features/plans/RouteMap.tsx
@@ -5,6 +5,7 @@ import {
   hasAmapBrowserKey,
   hasAmapBrowserSecurityCode,
   markerDisplayOffset,
+  type MapController,
 } from "./mapProvider";
 import type {
   PlanGeoPoint,
@@ -126,19 +127,21 @@ export function RouteMap(props: RouteMapProps) {
   const selectTask = useRef(props.onSelectTask);
   const changeDraft = useRef(props.onDraftPositionChange);
   const readyChange = useRef(props.onAmapReadyChange);
+  const controller = useRef<MapController | null>(null);
   const [amapFailed, setAmapFailed] = useState(false);
   const canUseAmap = props.providerName === "amap" && hasAmapBrowserKey() && hasAmapBrowserSecurityCode() && !amapFailed;
-  const modelKey = useMemo(
-    () => JSON.stringify({
+  const model = useMemo(
+    () => ({
       start: props.start,
       markers: props.markers,
-      route: props.route,
+      polyline: props.route?.polyline ?? [],
       selectedTaskId: props.selectedTaskId,
       locationEditing: props.locationEditing,
       draftPosition: props.draftPosition,
     }),
     [props.draftPosition, props.locationEditing, props.markers, props.route, props.selectedTaskId, props.start],
   );
+  const latestModel = useRef(model);
 
   useEffect(() => {
     selectTask.current = props.onSelectTask;
@@ -154,31 +157,26 @@ export function RouteMap(props: RouteMapProps) {
 
   useEffect(() => {
     if (!canUseAmap || !container.current) return;
-    let cleanup: (() => void) | undefined;
+    let mountedController: MapController | null = null;
     let active = true;
     const provider = new AmapMapProvider();
     provider
       .mount(
         container.current,
-        {
-          start: props.start,
-          markers: props.markers,
-          polyline: props.route?.polyline ?? [],
-          selectedTaskId: props.selectedTaskId,
-          locationEditing: props.locationEditing,
-          draftPosition: props.draftPosition,
-        },
+        latestModel.current,
         {
           onSelectTask: (taskId) => selectTask.current(taskId),
           onDraftPositionChange: (point) => changeDraft.current?.(point),
         },
       )
-      .then((dispose) => {
+      .then((nextController) => {
         if (active) {
-          cleanup = dispose;
+          mountedController = nextController;
+          controller.current = nextController;
+          nextController.update(latestModel.current);
           readyChange.current?.(true);
         }
-        else dispose();
+        else nextController.dispose();
       })
       .catch(() => {
         if (active) {
@@ -189,9 +187,15 @@ export function RouteMap(props: RouteMapProps) {
     return () => {
       active = false;
       readyChange.current?.(false);
-      cleanup?.();
+      if (controller.current === mountedController) controller.current = null;
+      mountedController?.dispose();
     };
-  }, [canUseAmap, modelKey, props.draftPosition, props.locationEditing, props.markers, props.route, props.selectedTaskId, props.start]);
+  }, [canUseAmap]);
+
+  useEffect(() => {
+    latestModel.current = model;
+    controller.current?.update(model);
+  }, [model]);
 
   return (
     <div className="relative h-[390px] overflow-hidden rounded-[10px] border border-slate-200/80 bg-slate-100 shadow-inner">
diff --git a/frontend/src/features/plans/mapProvider.test.ts b/frontend/src/features/plans/mapProvider.test.ts
index c5c5468..0ff8ddb 100644
--- a/frontend/src/features/plans/mapProvider.test.ts
+++ b/frontend/src/features/plans/mapProvider.test.ts
@@ -14,6 +14,7 @@ const mapInstances: FakeMap[] = [];
 
 class FakeMarker {
   handlers = new Map<string, EventHandler>();
+  positions: Array<[number, number]> = [];
 
   constructor(public options: Record<string, unknown>) {
     markerInstances.push(this);
@@ -22,6 +23,10 @@ class FakeMarker {
   on(event: string, handler: EventHandler) {
     this.handlers.set(event, handler);
   }
+
+  setPosition(position: [number, number]) {
+    this.positions.push(position);
+  }
 }
 
 class FakePolyline extends FakeMarker {}
@@ -30,16 +35,24 @@ class FakeMap {
   handlers = new Map<string, EventHandler>();
   overlays: FakeMarker[] = [];
   destroyed = false;
+  fitViewCalls = 0;
 
   constructor(_container: HTMLElement, public options: Record<string, unknown>) {
     mapInstances.push(this);
   }
 
   add(overlays: FakeMarker[]) {
-    this.overlays = overlays;
+    this.overlays.push(...overlays);
   }
 
-  setFitView() {}
+  remove(overlays: FakeMarker[]) {
+    const removed = new Set(overlays);
+    this.overlays = this.overlays.filter((overlay) => !removed.has(overlay));
+  }
+
+  setFitView() {
+    this.fitViewCalls += 1;
+  }
 
   destroy() {
     this.destroyed = true;
@@ -67,7 +80,7 @@ afterEach(() => {
 it("places a GCJ-02 draft pin on map click and updates it after dragging", async () => {
   const onDraftPositionChange = vi.fn();
   const provider = new AmapMapProvider();
-  const cleanup = await provider.mount(document.createElement("div"), {
+  const controller = await provider.mount(document.createElement("div"), {
     start: { label: "家", position: { latitude: 22.54, longitude: 114.05 } },
     markers: [{
       task_id: 7,
@@ -94,13 +107,38 @@ it("places a GCJ-02 draft pin on map click and updates it after dragging", async
 
   const draftMarker = markerInstances.find((marker) => marker.options.draggable === true);
   expect(draftMarker).toBeDefined();
+  expect(draftMarker?.positions).toContainEqual([114.08, 22.57]);
+  const crosshair = draftMarker?.options.content as HTMLDivElement;
+  expect(crosshair.dataset.mapDraftCrosshair).toBe("true");
+  expect(crosshair.querySelector("[data-map-draft-center='true']")).not.toBeNull();
   draftMarker?.handlers.get("dragend")?.({
     target: { getPosition: () => ({ getLat: () => 22.58, getLng: () => 114.09 }) },
   });
   expect(onDraftPositionChange).toHaveBeenLastCalledWith({ latitude: 22.58, longitude: 114.09 });
 
+  controller.update({
+    start: { label: "家", position: { latitude: 22.54, longitude: 114.05 } },
+    markers: [{
+      task_id: 7,
+      sequence: 1,
+      customer_name: "虚构定位客户",
+      community: "虚构小区",
+      address: "虚构地址",
+      position: { latitude: 22.55, longitude: 114.06 },
+      navigation_url: null,
+    }],
+    polyline: [],
+    selectedTaskId: 7,
+    locationEditing: true,
+    draftPosition: { latitude: 22.58, longitude: 114.09 },
+  });
+  expect(mapInstances).toHaveLength(1);
+  expect(mapInstances[0].destroyed).toBe(false);
+  expect(mapInstances[0].fitViewCalls).toBe(1);
+  expect(draftMarker?.positions).toContainEqual([114.09, 22.58]);
+
   const previousMarker = markerInstances.find((marker) => marker.options.title === "虚构地址");
   expect((previousMarker?.options.content as HTMLDivElement).className).toContain("bg-slate-400");
-  cleanup();
+  controller.dispose();
   expect(mapInstances[0].destroyed).toBe(true);
 });
diff --git a/frontend/src/features/plans/mapProvider.ts b/frontend/src/features/plans/mapProvider.ts
index 00fa8c9..94171bb 100644
--- a/frontend/src/features/plans/mapProvider.ts
+++ b/frontend/src/features/plans/mapProvider.ts
@@ -14,12 +14,17 @@ export interface MapInteractionCallbacks {
   onDraftPositionChange?: (position: PlanGeoPoint) => void;
 }
 
+export interface MapController {
+  update(model: MapRenderModel): void;
+  dispose(): void;
+}
+
 export interface MapProvider {
   mount(
     container: HTMLElement,
     model: MapRenderModel,
     callbacks: MapInteractionCallbacks,
-  ): Promise<() => void>;
+  ): Promise<MapController>;
 }
 
 export interface MarkerDisplayOffset {
@@ -61,10 +66,12 @@ interface AMapEvent {
 
 interface AMapOverlay {
   on?: (event: string, handler: (event: AMapEvent) => void) => void;
+  setPosition?: (position: [number, number]) => void;
 }
 
 interface AMapMap {
   add: (overlays: AMapOverlay[]) => void;
+  remove: (overlays: AMapOverlay[]) => void;
   setFitView: (
     overlays?: AMapOverlay[],
     immediately?: boolean,
@@ -147,85 +154,182 @@ function markerContent(
   return content;
 }
 
+function draftMarkerContent(): HTMLDivElement {
+  const content = document.createElement("div");
+  content.className = "relative flex size-12 cursor-move items-center justify-center";
+  content.dataset.mapDraftCrosshair = "true";
+  content.setAttribute("aria-label", "新客户定位准星");
+
+  const ring = document.createElement("span");
+  ring.className = "absolute size-8 rounded-full border-2 border-orange-600 bg-white/35 shadow-[0_0_0_2px_rgba(255,255,255,0.9)]";
+  const horizontal = document.createElement("span");
+  horizontal.className = "absolute h-0.5 w-11 bg-orange-700 shadow-[0_0_0_1px_rgba(255,255,255,0.9)]";
+  const vertical = document.createElement("span");
+  vertical.className = "absolute h-11 w-0.5 bg-orange-700 shadow-[0_0_0_1px_rgba(255,255,255,0.9)]";
+  const center = document.createElement("span");
+  center.className = "absolute size-2 rounded-full border-2 border-white bg-red-600 shadow-md";
+  center.dataset.mapDraftCenter = "true";
+  const label = document.createElement("span");
+  label.className = "absolute top-full left-1/2 mt-1 -translate-x-1/2 rounded-full bg-orange-600 px-2 py-1 text-[11px] font-bold whitespace-nowrap text-white shadow-md";
+  label.textContent = "新客户定位";
+
+  content.append(ring, horizontal, vertical, center, label);
+  return content;
+}
+
+function staticModelKey(model: MapRenderModel): string {
+  return JSON.stringify({ start: model.start, markers: model.markers, polyline: model.polyline });
+}
+
+function appearanceModelKey(model: MapRenderModel): string {
+  return JSON.stringify({ selectedTaskId: model.selectedTaskId, locationEditing: model.locationEditing });
+}
+
+function samePoint(left: PlanGeoPoint | null | undefined, right: PlanGeoPoint | null | undefined): boolean {
+  if (!left || !right) return left === right;
+  return left.latitude === right.latitude && left.longitude === right.longitude;
+}
+
 export class AmapMapProvider implements MapProvider {
   async mount(
     container: HTMLElement,
-    model: MapRenderModel,
+    initialModel: MapRenderModel,
     callbacks: MapInteractionCallbacks,
-  ): Promise<() => void> {
+  ): Promise<MapController> {
     const AMap = await loadAmap();
-    const center = model.start?.position ?? model.markers[0]?.position;
+    const center = initialModel.start?.position ?? initialModel.markers[0]?.position;
     const map = new AMap.Map(container, {
       center: center ? position(center) : [116.397428, 39.90923],
       zoom: center ? 13 : 4,
       viewMode: "2D",
       resizeEnable: true,
     });
-    const overlays: AMapOverlay[] = [];
+    let currentModel = initialModel;
+    let overlays: AMapOverlay[] = [];
+    let draftMarker: AMapOverlay | null = null;
+    let renderedStaticKey = "";
+    let renderedAppearanceKey = "";
+    let disposed = false;
 
-    if (model.start) {
-      overlays.push(
-        new AMap.Marker({
-          position: position(model.start.position),
-          title: model.start.label,
-          anchor: "center",
-          content: markerContent("家", "起终点"),
-        }),
-      );
-    }
-    for (const [index, item] of model.markers.entries()) {
+    const emitDraftPosition = (point: PlanGeoPoint) => {
+      callbacks.onDraftPositionChange?.(point);
+    };
+
+    const createDraftMarker = (point: PlanGeoPoint): AMapOverlay => {
       const marker = new AMap.Marker({
-        position: position(item.position),
-        title: item.address || item.community || item.customer_name,
-        anchor: "center",
-        content: markerContent(
-          String(item.sequence),
-          item.customer_name,
-          item.task_id === model.selectedTaskId && !model.locationEditing,
-          markerDisplayOffset(model.markers, index),
-          model.locationEditing && item.task_id === model.selectedTaskId,
-        ),
-      });
-      marker.on?.("click", () => callbacks.onSelectTask(item.task_id));
-      overlays.push(marker);
-    }
-    if (model.locationEditing && model.draftPosition) {
-      const draftMarker = new AMap.Marker({
-        position: position(model.draftPosition),
+        position: position(point),
         title: "新客户定位",
         anchor: "center",
         draggable: true,
-        content: markerContent("新", "拖动微调", true),
-      });
-      draftMarker.on?.("dragend", (event) => {
-        const point = event.target?.getPosition?.();
-        if (point) callbacks.onDraftPositionChange?.({ latitude: point.getLat(), longitude: point.getLng() });
+        raiseOnDrag: true,
+        zIndex: 500,
+        content: draftMarkerContent(),
       });
-      overlays.push(draftMarker);
-    }
-    if (model.locationEditing) {
-      map.on?.("click", (event) => {
-        if (event.lnglat) callbacks.onDraftPositionChange?.({ latitude: event.lnglat.getLat(), longitude: event.lnglat.getLng() });
+      marker.on?.("dragend", (event) => {
+        const next = event.target?.getPosition?.();
+        if (next) emitDraftPosition({ latitude: next.getLat(), longitude: next.getLng() });
       });
-    }
-    if (model.polyline.length > 1) {
-      overlays.push(
-        new AMap.Polyline({
-          path: model.polyline.map(position),
-          strokeColor: "#0f172a",
-          strokeWeight: 5,
-          strokeOpacity: 0.82,
-          lineJoin: "round",
-          showDir: true,
-        }),
-      );
-    }
-
-    if (overlays.length) {
-      map.add(overlays);
-      map.setFitView(overlays, false, [60, 60, 60, 60], 15);
-    }
-    return () => map.destroy();
+      return marker;
+    };
+
+    const moveDraftMarker = (point: PlanGeoPoint) => {
+      if (!draftMarker) {
+        draftMarker = createDraftMarker(point);
+        overlays.push(draftMarker);
+        map.add([draftMarker]);
+        return;
+      }
+      draftMarker.setPosition?.(position(point));
+    };
+
+    const renderOverlays = (model: MapRenderModel, fitView: boolean) => {
+      if (overlays.length) map.remove(overlays);
+      overlays = [];
+      draftMarker = null;
+
+      if (model.start) {
+        overlays.push(
+          new AMap.Marker({
+            position: position(model.start.position),
+            title: model.start.label,
+            anchor: "center",
+            content: markerContent("家", "起终点"),
+          }),
+        );
+      }
+      for (const [index, item] of model.markers.entries()) {
+        const marker = new AMap.Marker({
+          position: position(item.position),
+          title: item.address || item.community || item.customer_name,
+          anchor: "center",
+          content: markerContent(
+            String(item.sequence),
+            item.customer_name,
+            item.task_id === model.selectedTaskId && !model.locationEditing,
+            markerDisplayOffset(model.markers, index),
+            model.locationEditing && item.task_id === model.selectedTaskId,
+          ),
+        });
+        marker.on?.("click", () => callbacks.onSelectTask(item.task_id));
+        overlays.push(marker);
+      }
+      if (model.locationEditing && model.draftPosition) {
+        draftMarker = createDraftMarker(model.draftPosition);
+        overlays.push(draftMarker);
+      }
+      if (model.polyline.length > 1) {
+        overlays.push(
+          new AMap.Polyline({
+            path: model.polyline.map(position),
+            strokeColor: "#0f172a",
+            strokeWeight: 5,
+            strokeOpacity: 0.82,
+            lineJoin: "round",
+            showDir: true,
+          }),
+        );
+      }
+
+      if (overlays.length) {
+        map.add(overlays);
+        if (fitView) map.setFitView(overlays, false, [60, 60, 60, 60], 15);
+      }
+      renderedStaticKey = staticModelKey(model);
+      renderedAppearanceKey = appearanceModelKey(model);
+    };
+
+    map.on?.("click", (event) => {
+      if (!currentModel.locationEditing || !event.lnglat) return;
+      const point = { latitude: event.lnglat.getLat(), longitude: event.lnglat.getLng() };
+      moveDraftMarker(point);
+      emitDraftPosition(point);
+    });
+
+    renderOverlays(initialModel, true);
+
+    return {
+      update(nextModel) {
+        if (disposed) return;
+        const nextStaticKey = staticModelKey(nextModel);
+        const nextAppearanceKey = appearanceModelKey(nextModel);
+        const staticChanged = nextStaticKey !== renderedStaticKey;
+        const appearanceChanged = nextAppearanceKey !== renderedAppearanceKey;
+        const draftPresenceChanged = Boolean(nextModel.draftPosition) !== Boolean(currentModel.draftPosition);
+        const draftChanged = !samePoint(nextModel.draftPosition, currentModel.draftPosition);
+        currentModel = nextModel;
+
+        if (staticChanged || appearanceChanged || draftPresenceChanged) {
+          renderOverlays(nextModel, staticChanged);
+        } else if (nextModel.locationEditing && nextModel.draftPosition && draftChanged) {
+          moveDraftMarker(nextModel.draftPosition);
+        }
+      },
+      dispose() {
+        if (disposed) return;
+        disposed = true;
+        map.destroy();
+      },
+    };
   }
 }