feat: 信息架构重组 + 变更追踪 + 图片预览增强

- 信息架构重组: 周报精简为拜访+纪要两个Tab，工作计划/商机/要客独立为侧边栏「工作」分组下的独立页面 - 侧边栏分组: 汇总/工作/管理三层分组，仪表盘四卡可点击跳转 - 变更追踪(edit_log): 5张表新增JSONB edit_log列，POST创建/PUT diff自动记录，编辑弹窗变更时间轴，表格🕐编辑标记 - 图片预览增强: ImagePreview统一组件，支持适应页面/缩放/拖拽平移/滚轮缩放/键盘快捷键 - 修复客户导入500错误(errors变量未初始化) - 移除工作计划/商机/要客页面冗余编辑按钮 Co-Authored-By: Claude <noreply@anthropic.com>
2026-06-24 08:28:46 +08:00
parent aa3fbca710
commit bf67e0575f
27 changed files with 1332 additions and 117 deletions
@@ -196,6 +196,7 @@ async def import_customers(
    ws = wb.active
    created, updated, skipped = 0, 0, 0
    reasons = []
+    errors = []

    # Build user name → id lookup (all users, not just managers)
    user_rows = await db.execute(select(User.name, User.id))
@@ -10,6 +10,7 @@ from app.models.daily_note import DailyNote
 from app.models.user import User
 from app.schemas.daily_note import DailyNoteCreate, DailyNoteUpdate, DailyNoteOut
 from app.utils.timezone import today_cst, parse_date
+from app.utils.edit_log import compute_diff, append_entry, init_entry

 router = APIRouter(prefix="/daily-notes", tags=["DailyNotes"])

@@ -20,8 +21,8 @@ async def _enrich(note: DailyNote, db: AsyncSession) -> dict:
        "id": note.id, "manager_id": note.manager_id,
        "note_date": note.note_date, "category": note.category,
        "content": note.content, "time_range": note.time_range,
-        "created_at": note.created_at, "updated_at": note.updated_at,
-        "manager_name": mgr.scalar_one_or_none(),
+        "edit_log": note.edit_log or [], "created_at": note.created_at,
+        "updated_at": note.updated_at, "manager_name": mgr.scalar_one_or_none(),
    }


@@ -85,6 +86,7 @@ async def create_note(
        content=data.content,
        time_range=data.time_range,
    )
+    init_entry(note, current_user["name"])
    db.add(note)
    await db.commit()
    await db.refresh(note)
@@ -104,11 +106,16 @@ async def update_note(
    if current_user["role"] == "manager" and str(note.manager_id) != current_user["user_id"]:
        raise HTTPException(status_code=403, detail="Access denied")

+    old_snapshot = {"note_date": str(note.note_date), "category": note.category, "content": note.content, "time_range": note.time_range}
    update_data = data.model_dump(exclude_unset=True)
    if "note_date" in update_data and update_data["note_date"]:
        update_data["note_date"] = parse_date(update_data["note_date"])
    for k, v in update_data.items():
        setattr(note, k, v)
+    new_snapshot = {"note_date": str(note.note_date), "category": note.category, "content": note.content, "time_range": note.time_range}
+    changes = compute_diff(old_snapshot, new_snapshot)
+    if changes:
+        append_entry(note, current_user["name"], changes, getattr(data, "edit_reason", None))
    await db.commit()
    await db.refresh(note)
    return await _enrich(note, db)
@@ -9,6 +9,7 @@ from app.models.key_visit import KeyVisit
 from app.models.customer import Customer
 from app.models.user import User
 from app.schemas.key_visit import KeyVisitCreate, KeyVisitUpdate, KeyVisitOut
+from app.utils.edit_log import compute_diff, append_entry, init_entry

 router = APIRouter(prefix="/key-visits", tags=["KeyVisits"])

@@ -27,6 +28,7 @@ async def _enrich(k: KeyVisit, db: AsyncSession) -> dict:
        "planned_visitor": k.planned_visitor,
        "visit_target": k.visit_target,
        "manager_id": str(k.manager_id),
+        "edit_log": k.edit_log or [],
        "manager_name": mgr.scalar_one_or_none(),
    }

@@ -63,6 +65,7 @@ async def create_key_visit(
        visit_target=data.visit_target,
        manager_id=uuid.UUID(current_user["user_id"]),
    )
+    init_entry(k, current_user["name"])
    db.add(k)
    await db.commit()
    await db.refresh(k)
@@ -82,9 +85,14 @@ async def update_key_visit(
    if current_user["role"] == "manager" and str(k.manager_id) != current_user["user_id"]:
        raise HTTPException(status_code=403, detail="Access denied")

+    old_snapshot = {"customer_id": str(k.customer_id), "urgency_level": k.urgency_level, "description": k.description, "progress_status": k.progress_status, "planned_date": k.planned_date, "planned_visitor": k.planned_visitor, "visit_target": k.visit_target}
    update_data = data.model_dump(exclude_unset=True)
    for key, v in update_data.items():
        setattr(k, key, v)
+    new_snapshot = {"customer_id": str(k.customer_id), "urgency_level": k.urgency_level, "description": k.description, "progress_status": k.progress_status, "planned_date": k.planned_date, "planned_visitor": k.planned_visitor, "visit_target": k.visit_target}
+    changes = compute_diff(old_snapshot, new_snapshot)
+    if changes:
+        append_entry(k, current_user["name"], changes, getattr(data, "edit_reason", None))
    await db.commit()
    await db.refresh(k)
    return await _enrich(k, db)
@@ -9,6 +9,7 @@ from app.models.mini_business import MiniBusiness
 from app.models.customer import Customer
 from app.models.user import User
 from app.schemas.mini_business import MiniBusinessCreate, MiniBusinessUpdate, MiniBusinessOut
+from app.utils.edit_log import compute_diff, append_entry, init_entry

 router = APIRouter(prefix="/mini-business", tags=["MiniBusiness"])

@@ -26,6 +27,7 @@ async def _enrich(m: MiniBusiness, db: AsyncSession) -> dict:
        "status": m.status,
        "manager_id": str(m.manager_id),
        "manager_name": mgr.scalar_one_or_none(),
+        "edit_log": m.edit_log or [],
        "expected_revenue_date": m.expected_revenue_date,
    }

@@ -61,6 +63,7 @@ async def create_mini_business(
        manager_id=uuid.UUID(current_user["user_id"]),
        expected_revenue_date=data.expected_revenue_date,
    )
+    init_entry(m, current_user["name"])
    db.add(m)
    await db.commit()
    await db.refresh(m)
@@ -80,9 +83,14 @@ async def update_mini_business(
    if current_user["role"] == "manager" and str(m.manager_id) != current_user["user_id"]:
        raise HTTPException(status_code=403, detail="Access denied")

+    old_snapshot = {"customer_id": str(m.customer_id), "product_type": m.product_type, "amount": m.amount, "follow_up_detail": m.follow_up_detail, "status": m.status, "expected_revenue_date": m.expected_revenue_date}
    update_data = data.model_dump(exclude_unset=True)
    for k, v in update_data.items():
        setattr(m, k, v)
+    new_snapshot = {"customer_id": str(m.customer_id), "product_type": m.product_type, "amount": m.amount, "follow_up_detail": m.follow_up_detail, "status": m.status, "expected_revenue_date": m.expected_revenue_date}
+    changes = compute_diff(old_snapshot, new_snapshot)
+    if changes:
+        append_entry(m, current_user["name"], changes, getattr(data, "edit_reason", None))
    await db.commit()
    await db.refresh(m)
    return await _enrich(m, db)
@@ -12,6 +12,7 @@ from app.models.user import User
 from app.schemas.visit import VisitCreate, VisitUpdate, VisitOut, VisitListOut
 from app.utils.timezone import today_cst, parse_date
 from app.services.minio_client import delete_objects
+from app.utils.edit_log import compute_diff, append_entry, init_entry

 router = APIRouter(prefix="/visits", tags=["Visits"])

@@ -42,6 +43,7 @@ async def _enrich_visit(visit: Visit, db: AsyncSession) -> dict:
        "photos": visit.photos,
        "manager_id": str(visit.manager_id),
        "manager_name": manager_name,
+        "edit_log": visit.edit_log or [],
        "created_at": str(visit.created_at),
        "updated_at": str(visit.updated_at),
    }
@@ -138,6 +140,7 @@ async def create_visit(
        photos=data.photos,
        manager_id=uuid.UUID(current_user["user_id"]),
    )
+    init_entry(visit, current_user["name"])
    db.add(visit)

    # Create draft copies for companions
@@ -176,6 +179,14 @@ async def update_visit(
    if current_user["role"] == "manager" and str(visit.manager_id) != current_user["user_id"]:
        raise HTTPException(status_code=403, detail="Access denied")

+    # Snapshot old values for diff
+    old_snapshot = {
+        "customer_id": str(visit.customer_id), "visit_date": str(visit.visit_date),
+        "visit_method": visit.visit_method, "time_range": visit.time_range,
+        "visitor_name": visit.visitor_name or "", "visitor_phone": visit.visitor_phone or "",
+        "communication_content": visit.communication_content, "customer_demand": visit.customer_demand,
+    }
+
    update_data = data.model_dump(exclude_unset=True)
    if "visit_date" in update_data and update_data["visit_date"]:
        update_data["visit_date"] = parse_date(update_data["visit_date"])
@@ -183,6 +194,17 @@ async def update_visit(
    for key, value in update_data.items():
        setattr(visit, key, value)

+    # Compute diff and append to edit_log
+    new_snapshot = {
+        "customer_id": str(visit.customer_id), "visit_date": str(visit.visit_date),
+        "visit_method": visit.visit_method, "time_range": visit.time_range,
+        "visitor_name": visit.visitor_name or "", "visitor_phone": visit.visitor_phone or "",
+        "communication_content": visit.communication_content, "customer_demand": visit.customer_demand,
+    }
+    changes = compute_diff(old_snapshot, new_snapshot)
+    if changes:
+        append_entry(visit, current_user["name"], changes, getattr(data, "edit_reason", None))
+
    await db.commit()
    await db.refresh(visit)
    return await _enrich_visit(visit, db)
@@ -7,6 +7,7 @@ from sqlalchemy import select
 from app.database import get_db
 from app.middleware.auth import get_current_user, require_any_role
 from app.utils.timezone import parse_date
+from app.utils.edit_log import compute_diff, append_entry, init_entry
 from app.models.work_plan import WorkPlan
 from app.models.customer import Customer
 from app.models.user import User
@@ -27,6 +28,7 @@ async def _enrich(wp: WorkPlan, db: AsyncSession) -> dict:
        "manager_id": str(wp.manager_id),
        "manager_name": mgr.scalar_one_or_none(),
        "status": wp.status,
+        "edit_log": wp.edit_log or [],
    }


@@ -59,6 +61,7 @@ async def create_work_plan(
        manager_id=uuid.UUID(current_user["user_id"]),
        status=data.status,
    )
+    init_entry(wp, current_user["name"])
    db.add(wp)
    await db.commit()
    await db.refresh(wp)
@@ -78,11 +81,16 @@ async def update_work_plan(
    if current_user["role"] == "manager" and str(wp.manager_id) != current_user["user_id"]:
        raise HTTPException(status_code=403, detail="Access denied")

+    old_snapshot = {"customer_id": str(wp.customer_id), "plan_content": wp.plan_content, "plan_date": str(wp.plan_date), "status": wp.status}
    update_data = data.model_dump(exclude_unset=True)
    if "plan_date" in update_data and update_data["plan_date"]:
        update_data["plan_date"] = parse_date(update_data["plan_date"])
    for k, v in update_data.items():
        setattr(wp, k, v)
+    new_snapshot = {"customer_id": str(wp.customer_id), "plan_content": wp.plan_content, "plan_date": str(wp.plan_date), "status": wp.status}
+    changes = compute_diff(old_snapshot, new_snapshot)
+    if changes:
+        append_entry(wp, current_user["name"], changes, getattr(data, "edit_reason", None))
    await db.commit()
    await db.refresh(wp)
    return await _enrich(wp, db)
@@ -23,6 +23,11 @@ async def lifespan(app: FastAPI):
        await conn.run_sync(lambda c: c.exec_driver_sql(
            "ALTER TABLE visits ADD COLUMN IF NOT EXISTS visitor_phone VARCHAR(20) DEFAULT ''"
        ))
+        # edit_log columns for change tracking
+        for tbl in ["visits", "daily_notes", "work_plans", "mini_business", "key_visits"]:
+            await conn.run_sync(lambda c, t=tbl: c.exec_driver_sql(
+                f"ALTER TABLE {t} ADD COLUMN IF NOT EXISTS edit_log JSONB DEFAULT '[]'"
+            ))
    yield
    # Shutdown
    await engine.dispose()
@@ -2,7 +2,7 @@ import uuid
 from datetime import date, datetime
 from sqlalchemy import String, Text, Date, DateTime, ForeignKey, func
 from sqlalchemy.orm import Mapped, mapped_column
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.dialects.postgresql import UUID, JSONB
 from app.database import Base


@@ -15,5 +15,6 @@ class DailyNote(Base):
    category: Mapped[str] = mapped_column(String(20), default="其他")  # 行政事务/合同整理/发票处理/内部会议/培训学习/其他
    content: Mapped[str] = mapped_column(Text, default="")
    time_range: Mapped[str] = mapped_column(String(30), default="")
+    edit_log: Mapped[list] = mapped_column(JSONB, default=list)
    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now())
    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
@@ -1,7 +1,7 @@
 import uuid
 from sqlalchemy import String, Text, ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.dialects.postgresql import UUID, JSONB
 from app.database import Base


@@ -17,3 +17,4 @@ class KeyVisit(Base):
    planned_visitor: Mapped[str] = mapped_column(String(100), default="")
    visit_target: Mapped[str] = mapped_column(String(100), default="")
    manager_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), index=True)
+    edit_log: Mapped[list] = mapped_column(JSONB, default=list)
@@ -1,7 +1,7 @@
 import uuid
 from sqlalchemy import String, Text, ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.dialects.postgresql import UUID, JSONB
 from app.database import Base


@@ -16,3 +16,4 @@ class MiniBusiness(Base):
    status: Mapped[str] = mapped_column(String(50), default="跟进中")
    manager_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), index=True)
    expected_revenue_date: Mapped[str] = mapped_column(String(50), default="")
+    edit_log: Mapped[list] = mapped_column(JSONB, default=list)
@@ -2,7 +2,7 @@ import uuid
 from datetime import datetime, date
 from sqlalchemy import String, Text, Date, DateTime, ForeignKey, func
 from sqlalchemy.orm import Mapped, mapped_column
-from sqlalchemy.dialects.postgresql import UUID, ARRAY
+from sqlalchemy.dialects.postgresql import UUID, ARRAY, JSONB
 from app.database import Base


@@ -21,5 +21,6 @@ class Visit(Base):
    companions: Mapped[list | None] = mapped_column(ARRAY(UUID(as_uuid=True)), nullable=True)
    photos: Mapped[list | None] = mapped_column(ARRAY(Text), nullable=True)
    manager_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), index=True)
+    edit_log: Mapped[list] = mapped_column(JSONB, default=list)
    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now())
    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
@@ -2,7 +2,7 @@ import uuid
 from datetime import date
 from sqlalchemy import String, Text, Date, ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.dialects.postgresql import UUID, JSONB
 from app.database import Base


@@ -15,3 +15,4 @@ class WorkPlan(Base):
    plan_date: Mapped[date] = mapped_column(Date, index=True)
    manager_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), index=True)
    status: Mapped[str] = mapped_column(String(20), default="计划中")  # 计划中/已完成/已取消
+    edit_log: Mapped[list] = mapped_column(JSONB, default=list)
@@ -0,0 +1,43 @@
+"""Edit log helpers for change tracking."""
+import json
+from datetime import datetime, timezone
+
+
+def compute_diff(old: dict, new: dict, exclude: set = None) -> dict:
+    """Compare old and new values, return {field: [old, new]} for changed fields."""
+    if exclude is None:
+        exclude = {"edit_log", "updated_at", "created_at", "id"}
+    changes = {}
+    for key, new_val in new.items():
+        if key in exclude:
+            continue
+        old_val = old.get(key)
+        # Normalize for comparison
+        old_str = str(old_val) if old_val is not None else ""
+        new_str = str(new_val) if new_val is not None else ""
+        if old_str != new_str:
+            changes[key] = [old_str, new_str]
+    return changes
+
+
+def append_entry(record, editor_name: str, changes: dict, reason: str = None):
+    """Append an edit log entry to a record's edit_log JSON list."""
+    log = list(record.edit_log) if record.edit_log else []
+    entry = {
+        "editor": editor_name,
+        "time": datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
+        "changes": changes,
+    }
+    if reason:
+        entry["reason"] = reason
+    log.append(entry)
+    record.edit_log = log
+
+
+def init_entry(record, creator_name: str):
+    """Initialize edit_log with a creation entry."""
+    record.edit_log = [{
+        "editor": creator_name,
+        "time": datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
+        "changes": {},
+    }]