fix: 计划总览独立数据源+实际模块表头修复

- 计划月度/季度总览: 改用planFinances计算,不再引用实际模块数据 - 新增computePlanMonthly函数从planFinances计算月度数据 - 实际模块SIGNED_COLS/UNSIGNED_COLS补全client_name列 - theadCols计数修正(14/7) - 版本号 v1.0.0.28
feat: 计划+实际模块增加月度总览和季度总览
2026-07-08 16:05:45 +08:00 · 2026-07-08 15:52:45 +08:00 · 2026-07-08 15:11:26 +08:00 · 2026-07-08 14:50:14 +08:00 · 2026-07-08 14:16:31 +08:00 · 2026-07-08 13:46:10 +08:00
12 changed files with 505 additions and 350 deletions
--- a/backend/helpers.py
+++ b/backend/helpers.py
@@ -65,7 +65,7 @@ def monthly_finance(conn, tenant="科普·无界"):
    _year = date.today().year
    months = [f"{_year}-{m:02d}" for m in range(1, 13)]
    pfs = rows(conn,
-        "SELECT sign_amount, sign_month, status, budget_data, expense_data FROM project_finances WHERE tenant=? AND status='已签约'",
+        "SELECT sign_amount, sign_month, budget_data, expense_data FROM project_finances WHERE tenant=?",
        [tenant])

    parsed_budgets = []
@@ -104,7 +104,7 @@ def monthly_finance(conn, tenant="科普·无界"):
        key = month.replace("-", "_")
        revenue = gross = payment = cost = paid = sign = 0
        for pf, budget_map in parsed_budgets:
-            if pf["status"] == "已签约" and (pf.get("sign_month") or "") == month:
+            if (pf.get("sign_month") or "") == month:
                sign += float(pf["sign_amount"] or 0)
            b = budget_map.get(key)
            if b:
--- a/backend/migrations/init.py
+++ b/backend/migrations/init.py
@@ -17,7 +17,7 @@ def run_migrations():
    """
    from migrations.tables import migrate_create_tables
    from migrations.columns import migrate_add_columns
-    from migrations.data_fixes import migrate_fix_task_status, migrate_rename_tenant, migrate_drop_product_fields, migrate_fix_service_fee_standard, migrate_fix_expense_status, migrate_move_pending_to_plan
+    from migrations.data_fixes import migrate_fix_task_status, migrate_rename_tenant, migrate_drop_product_fields, migrate_fix_service_fee_standard, migrate_fix_expense_status
    from migrations.data_split import migrate_data_split
    from migrations.seed import migrate_seed_users, migrate_seed_demo_data

@@ -28,7 +28,6 @@ def run_migrations():
    migrate_drop_product_fields()
    migrate_fix_service_fee_standard()
    migrate_fix_expense_status()
-    migrate_move_pending_to_plan()
    migrate_data_split()
    migrate_seed_users()
    migrate_seed_demo_data()
--- a/backend/migrations/columns.py
+++ b/backend/migrations/columns.py
@@ -114,5 +114,30 @@ def migrate_add_columns():

        conn.commit()
        print("[migrate] 加列迁移完成")
+
+        # plan_finances 新增字段
+        _add_column_if_missing(conn, "plan_finances", "client_name",
+            "ALTER TABLE plan_finances ADD COLUMN client_name VARCHAR(200) NOT NULL DEFAULT ''")
+        _add_column_if_missing(conn, "plan_finances", "project_type",
+            "ALTER TABLE plan_finances ADD COLUMN project_type VARCHAR(50) NOT NULL DEFAULT '待签约'")
+        _add_column_if_missing(conn, "plan_finances", "weight",
+            "ALTER TABLE plan_finances ADD COLUMN weight VARCHAR(10) NOT NULL DEFAULT '20%'")
+        # 删除 plan_finances.status 列（计划模块不再需要状态字段）
+        cur = conn.cursor()
+        cur.execute("SHOW COLUMNS FROM plan_finances LIKE 'status'")
+        if cur.fetchone():
+            cur.execute("ALTER TABLE plan_finances DROP COLUMN status")
+            conn.commit()
+            print("[migrate] plan_finances.status 列已删除")
+        # project_finances 新增客户名称字段
+        _add_column_if_missing(conn, "project_finances", "client_name",
+            "ALTER TABLE project_finances ADD COLUMN client_name VARCHAR(200) NOT NULL DEFAULT ''")
+        # 删除 project_finances.status 列（实际模块不再需要状态字段）
+        cur.execute("SHOW COLUMNS FROM project_finances LIKE 'status'")
+        if cur.fetchone():
+            cur.execute("ALTER TABLE project_finances DROP COLUMN status")
+            conn.commit()
+            print("[migrate] project_finances.status 列已删除")
+        cur.close()
    finally:
        conn.close()
--- a/backend/migrations/data_fixes.py
+++ b/backend/migrations/data_fixes.py
@@ -114,29 +114,3 @@ def migrate_fix_expense_status():
        conn.close()


-def migrate_move_pending_to_plan():
-    """迁移业务待签约项目到计划模块（幂等）"""
-    from db import db
-
-    conn = db()
-    try:
-        cur = conn.cursor()
-        # 仅迁移 id 不存在于计划表的待签约项目
-        cur.execute(
-            "INSERT INTO plan_finances "
-            "SELECT * FROM project_finances WHERE status='待签约' "
-            "AND id NOT IN (SELECT id FROM plan_finances)"
-        )
-        moved = cur.rowcount
-        if moved:
-            # 删除已迁移的原记录
-            cur.execute(
-                "DELETE FROM project_finances WHERE status='待签约' "
-                "AND id IN (SELECT id FROM plan_finances)"
-            )
-            deleted = cur.rowcount
-            conn.commit()
-            print(f"[migrate] 待签约项目迁移到计划: {moved} 条 (已删除 {deleted} 条)")
-        cur.close()
-    finally:
-        conn.close()
--- a/backend/migrations/seed_data.py
+++ b/backend/migrations/seed_data.py
@@ -72,7 +72,7 @@ def make_budget_data(sign_amount, signed_month, status):
    """生成12个月的预算数据"""
    months = []
    start_m = int(signed_month.split("-")[1]) if signed_month else 1
-    rev_total = sign_amount if status == "已签约" else int(sign_amount * random.uniform(0.3, 0.7))
+    rev_total = sign_amount
    gross_rate = random.uniform(0.25, 0.55)
    payment_rate = random.uniform(0.7, 0.95)

@@ -135,17 +135,17 @@ def seed_db():
                cust_idx += i % 3

                # 70% 已签约, 30% 待签约
-                status = "已签约" if random.random() < 0.7 else "待签约"
-                sign_month = f"2026-{random.randint(1, 6):02d}" if status == "已签约" else ""
+                status = "已签约"
+                sign_month = f"2026-{random.randint(1, 6):02d}"
                project_code = f"{tenant[:2]}-2026-{i+1:03d}"
                business_type = random.choice(["学术推广", "医生教育", "患者管理", "科研合作", "科普内容"])

                # 如果签约，总额 = 签约额；否则为0
-                total_rev = int(sign_amount * random.uniform(0.8, 1.0)) if status == "已签约" else 0
-                total_gross = int(total_rev * random.uniform(0.25, 0.5)) if status == "已签约" else 0
-                total_payment = int(total_rev * random.uniform(0.7, 0.9)) if status == "已签约" else 0
-                total_cost = int(total_rev * random.uniform(0.3, 0.5)) if status == "已签约" else 0
-                total_paid = int(total_cost * random.uniform(0.7, 0.95)) if status == "已签约" else 0
+                total_rev = int(sign_amount * random.uniform(0.8, 1.0))
+                total_gross = int(total_rev * random.uniform(0.25, 0.5))
+                total_payment = int(total_rev * random.uniform(0.7, 0.9))
+                total_cost = int(total_rev * random.uniform(0.3, 0.5))
+                total_paid = int(total_cost * random.uniform(0.7, 0.95))

                budget_data = make_budget_data(sign_amount, sign_month, status)
                expense_data = make_expense_data() if status == "已签约" else "[]"
@@ -157,16 +157,16 @@ def seed_db():

                cur = _exec(conn, """
                    INSERT INTO project_finances
-                    (tenant, project_id, business_type, customer_name, sign_amount, sign_month, status,
+                    (tenant, project_id, business_type, customer_name, sign_amount, sign_month,
                     sales_person, total_rev, total_gross, total_payment, total_cost, total_paid,
                     budget_data, expense_data, task_data,
                     project_code, start_date, end_date, task_type, task_count,
                     service_fee_standard, project_manager, contact_name, contact_phone, other_info,
                     created_at, updated_at)
-                    VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+                    VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
                """, (
                    tenant, f"PF-{tenant[:2]}-{i+1:04d}", business_type, cust_name,
-                    sign_amount, sign_month, status,
+                    sign_amount, sign_month,
                    f"销售{random.choice(['A','B','C','D'])}", total_rev, total_gross,
                    total_payment, total_cost, total_paid,
                    budget_data, expense_data, task_data,
@@ -178,7 +178,7 @@ def seed_db():
                    today, today,
                ))
                # Store for later use
-                pf_ids.setdefault(tenant, []).append((cur.lastrowid, proj_name, cust_name, status))
+                pf_ids.setdefault(tenant, []).append((cur.lastrowid, proj_name, cust_name))

            # operation_projects: 每个工作台 3-5 个
            op_count = random.randint(3, 5)
--- a/backend/routes.py
+++ b/backend/routes.py
@@ -23,9 +23,9 @@ TABLES = {
    "products": ("product_versions", ["product_name", "version", "version_goal", "priority", "start_date", "plan_date", "dev_done_date", "test_date", "launch_date", "status", "notes", "tenant"]),
    "finance": ("finance_records", ["month", "project_name", "record_type", "category", "amount", "occurred_date", "notes", "tenant"]),
    "tasks": ("project_tasks", ["project_id", "phase", "milestone", "task", "owner", "due_date", "blockers", "notes", "status", "sort_order", "priority", "tenant"]),
-    "projectFinances": ("project_finances", ["project_id", "tenant", "business_type", "customer_name", "sign_amount", "sign_month", "status", "sales_person", "owner", "total_rev", "total_gross", "total_payment", "total_cost", "total_paid", "budget_data", "expense_data", "start_date", "end_date", "task_type", "task_count", "service_fee_standard", "project_manager", "task_data", "project_code", "contact_name", "contact_phone", "other_info"]),
+    "projectFinances": ("project_finances", ["project_id", "tenant", "business_type", "customer_name", "client_name", "sign_amount", "sign_month", "sales_person", "owner", "total_rev", "total_gross", "total_payment", "total_cost", "total_paid", "budget_data", "expense_data", "start_date", "end_date", "task_type", "task_count", "service_fee_standard", "project_manager", "task_data", "project_code", "contact_name", "contact_phone", "other_info"]),
    "expense": ("expense_records", ["expense_type", "expense_month", "amount", "incurred_amount", "notes", "status", "tenant"]),
-    "planFinances": ("plan_finances", ["project_id", "tenant", "business_type", "customer_name", "sign_amount", "sign_month", "status", "sales_person", "owner", "total_rev", "total_gross", "total_payment", "total_cost", "total_paid", "budget_data", "expense_data", "start_date", "end_date", "task_type", "task_count", "service_fee_standard", "project_manager", "task_data", "project_code", "contact_name", "contact_phone", "other_info"]),
+    "planFinances": ("plan_finances", ["project_id", "tenant", "business_type", "customer_name", "client_name", "sign_amount", "sign_month", "sales_person", "owner", "total_rev", "total_gross", "total_payment", "total_cost", "total_paid", "budget_data", "expense_data", "start_date", "end_date", "task_type", "task_count", "service_fee_standard", "project_manager", "task_data", "project_code", "contact_name", "contact_phone", "other_info", "client_name", "project_type", "weight"]),
    "planExpense": ("plan_expense_records", ["expense_type", "expense_month", "amount", "incurred_amount", "notes", "status", "tenant"]),
 }

@@ -276,7 +276,7 @@ def bootstrap():
                t_products = attach_common(conn, "products", rows(conn, "SELECT * FROM product_versions WHERE tenant=? ORDER BY id DESC", [t]))
                t_expense = rows(conn, "SELECT * FROM expense_records WHERE tenant=?", [t])
                t_proposals = attach_common(conn, "proposals", rows(conn, "SELECT * FROM business_proposals WHERE tenant=? ORDER BY id DESC", [t]))
-                t_signed_pfs = [x for x in t_pfs if x["status"] == "已签约"]
+                t_signed_pfs = t_pfs
                def t_parse_budget(pf):
                    try:
                        budget = json.loads(pf.get("budget_data") or "[]")
@@ -326,12 +326,12 @@ def bootstrap():
                    "total_proposals": len(t_ops),
                    "total_products": len(t_proposals),
                    "upcoming_products": len(t_products),
-                    "signed_amount": sum(x["sign_amount"] or 0 for x in t_pfs if x["status"] == "已签约"),
-                    "signed_annual": sum(x["sign_amount"] or 0 for x in t_pfs if x["status"] == "已签约"),
-                    "signed_q2": sum(x["sign_amount"] or 0 for x in t_pfs if x["status"] == "已签约" and (x.get("sign_month") or "")[:7] in _q_months),
-                    "signed_month": sum(x["sign_amount"] or 0 for x in t_pfs if x["status"] == "已签约" and (x.get("sign_month") or "")[:7] == f"{_year}-{_now_month:02d}"),
-                    "signed_prev_q": sum(x["sign_amount"] or 0 for x in t_pfs if x["status"] == "已签约" and (x.get("sign_month") or "")[:7] in _prev_q_months),
-                    "signed_prev_month": sum(x["sign_amount"] or 0 for x in t_pfs if x["status"] == "已签约" and (x.get("sign_month") or "")[:7] == f"{_year}-{_prev_month:02d}") if _prev_month else 0,
+                    "signed_amount": sum(x["sign_amount"] or 0 for x in t_pfs),
+                    "signed_annual": sum(x["sign_amount"] or 0 for x in t_pfs),
+                    "signed_q2": sum(x["sign_amount"] or 0 for x in t_pfs if (x.get("sign_month") or "")[:7] in _q_months),
+                    "signed_month": sum(x["sign_amount"] or 0 for x in t_pfs if (x.get("sign_month") or "")[:7] == f"{_year}-{_now_month:02d}"),
+                    "signed_prev_q": sum(x["sign_amount"] or 0 for x in t_pfs if (x.get("sign_month") or "")[:7] in _prev_q_months),
+                    "signed_prev_month": sum(x["sign_amount"] or 0 for x in t_pfs if (x.get("sign_month") or "")[:7] == f"{_year}-{_prev_month:02d}") if _prev_month else 0,
                    "revenue_annual": t_sum_budget("rev", range(1, 13)),
                    "revenue_q2": t_sum_budget("rev", _q_range),
                    "monthly_revenue": t_sum_budget("rev", [_now_month]),
@@ -442,7 +442,7 @@ def bootstrap():
        expense = q("SELECT * FROM expense_records WHERE tenant=? ORDER BY id DESC", tenant)
        planPfs = q("SELECT * FROM plan_finances WHERE tenant=? ORDER BY id DESC", tenant)
        planExpense = q("SELECT * FROM plan_expense_records WHERE tenant=? ORDER BY id DESC", tenant)
-        signed_pfs = [x for x in pfs if x["status"] == "已签约"]
+        signed_pfs = pfs

        def parse_budget(pf):
            try:
@@ -563,16 +563,14 @@ def bootstrap():
        profit_month = gross_month - proj_expense_month
        profit_prev_q = gross_prev_q - proj_expense_prev_q
        profit_prev_month = gross_prev_month - proj_expense_prev_month
-        def pf_status_sum(status):
-            return sum(x["sign_amount"] or 0 for x in pfs if x["status"] == status)
-        signed_amount = pf_status_sum("已签约")
-        signed_annual = sum(x["sign_amount"] or 0 for x in pfs if x["status"] == "已签约")
+        signed_amount = sum(x["sign_amount"] or 0 for x in pfs)
+        signed_annual = sum(x["sign_amount"] or 0 for x in pfs)
        _q_months = [f"{_year}-{m:02d}" for m in _q_range]
-        signed_q2 = sum(x["sign_amount"] or 0 for x in pfs if x["status"] == "已签约" and (x.get("sign_month") or "")[:7] in _q_months)
-        signed_month = sum(x["sign_amount"] or 0 for x in pfs if x["status"] == "已签约" and (x.get("sign_month") or "")[:7] == f"{_year}-{_now_month:02d}")
+        signed_q2 = sum(x["sign_amount"] or 0 for x in pfs if (x.get("sign_month") or "")[:7] in _q_months)
+        signed_month = sum(x["sign_amount"] or 0 for x in pfs if (x.get("sign_month") or "")[:7] == f"{_year}-{_now_month:02d}")
        _prev_q_months = [f"{_year}-{m:02d}" for m in _prev_q_range]
-        signed_prev_q = sum(x["sign_amount"] or 0 for x in pfs if x["status"] == "已签约" and (x.get("sign_month") or "")[:7] in _prev_q_months)
-        signed_prev_month = sum(x["sign_amount"] or 0 for x in pfs if x["status"] == "已签约" and (x.get("sign_month") or "")[:7] == f"{_year}-{_prev_month:02d}") if _prev_month else 0
+        signed_prev_q = sum(x["sign_amount"] or 0 for x in pfs if (x.get("sign_month") or "")[:7] in _prev_q_months)
+        signed_prev_month = sum(x["sign_amount"] or 0 for x in pfs if (x.get("sign_month") or "")[:7] == f"{_year}-{_prev_month:02d}") if _prev_month else 0
        pipeline_amount = sum(x["expected_contract_amount"] or 0 for x in operations if x["project_status"] not in ["已签约","已丢单","已归档","已完成"])
        signed_not_executed = sum(x["expected_contract_amount"] or 0 for x in operations if x["project_type"] == "execution" and x["execution_progress"] < 100)
        summary = {
--- a/static/modules/finance.js
+++ b/static/modules/finance.js
@@ -24,8 +24,8 @@ function renderFinance() {
  const months = displayMonths.map(d => d.key);
  const monthLabels = displayMonths.map(d => d.label);

-  const signed = pfs.filter(x => x.status === "已签约");
-    const pending = pfs.filter(x => x.status === "待签约");
+  const signed = pfs;
+    const pending = pfs;
  const sumSign = Math.round(signed.reduce((s,x) => s + (x.sign_amount||0), 0));
  const sumPending = Math.round(pending.reduce((s,x) => s + (x.sign_amount||0), 0));
  
@@ -98,29 +98,26 @@ function renderFinance() {
    })();
    const sm = pf.sign_month || "";
    const signMonthCell = `<td class="p-2 text-center align-middle text-sm"><span class="pf-sm-text cursor-pointer hover:text-blue-600" id="pf-sm-${pf.id}" onclick="event.stopPropagation(); editPfSignMonth(event, ${pf.id})">${sm || '—'}</span></td>`;
-    return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium text-center align-middle">${esc(pf.customer_name)}</td>${signMonthCell}<td class="p-2 text-center align-middle text-sm">${money(pf.sign_amount)}</td>${mCols}${totalCol}</tr>`;
+    return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-center align-middle text-sm">${esc(pf.client_name || "")}</td><td class="p-2 text-sm font-medium text-center align-middle">${esc(pf.customer_name)}</td>${signMonthCell}<td class="p-2 text-center align-middle text-sm">${money(pf.sign_amount)}</td>${mCols}${totalCol}</tr>`;
  };

  const now2 = new Date();
  const defaultMonth2 = now2.getFullYear() + "-" + String(now2.getMonth()+1).padStart(2,"0");
  if (!state.finMonth) state.finMonth = defaultMonth2;
  if (state.finQuarter === undefined) state.finQuarter = Math.floor(now2.getMonth() / 3);
-  const monthSet2 = new Set([defaultMonth2]);
-  pfs.forEach(pf => { let bd = []; try { bd = JSON.parse(pf.budget_data || "[]"); } catch(e) {} bd.forEach(b => { if (b.month) monthSet2.add(b.month); }); });
-  const allMonths = [...monthSet2].sort().reverse();
-  const qLabels2 = ["Q1 (1-3月)","Q2 (4-6月)","Q3 (7-9月)","Q4 (10-12月)"];
-  const toolMonthSelect = allMonths.map(m => '<option value="'+m+'" '+(m===state.finMonth?'selected':'')+'>'+m+'</option>').join("");
-  const toolQuarterSelect = qLabels2.map((l,i) => '<option value="'+i+'" '+(i===state.finQuarter?'selected':'')+'>'+l+'</option>').join("");
-  const toolDateSelect = state.finView==='monthly'?'<span class="text-sm text-slate-500 ml-2">月份：</span><select onchange="state.finMonth=this.value;renderFinance()" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">'+toolMonthSelect+'</select>':state.finView==='quarterly'?'<span class="text-sm text-slate-500 ml-2">季度：</span><select onchange="state.finQuarter=parseInt(this.value);localStorage.setItem(\'opc-fin-quarter\',this.value);renderFinance()" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">'+toolQuarterSelect+'</select>':'';
-
-  const finHeaderBase = `<span class="text-sm text-slate-500">视图：</span><select onchange="setFinView(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value="overview" ${state.finView==='overview'?'selected':''}>总视图</option><option value="quarterly" ${state.finView==='quarterly'?'selected':''}>季度视图</option><option value="monthly" ${state.finView==='monthly'?'selected':''}>月度视图</option></select>${toolDateSelect}`;
+  const qLabels = ['Q1','Q2','Q3','Q4'];
+  const qMonths = [[1,2,3],[4,5,6],[7,8,9],[10,11,12]];
+  const nowD = new Date();
+  const activeQ = state.finQuarter !== undefined ? state.finQuarter : Math.floor(nowD.getMonth() / 3);
+  const activeMonths = qMonths[activeQ];
+  const finHeaderBase = `<div class="flex items-center gap-2"><button onclick="setFinView('overview')" class="px-3 py-1 rounded text-sm font-medium ${state.finView==='overview'?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">总视图</button><span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">按季度：</span>${qLabels.map((q,i) => `<button onclick="setFinQuarter(${i})" class="px-3 py-1 rounded text-sm font-medium ${state.finView==='quarterly'&&activeQ===i?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${q}</button>`).join('')}<span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">按月度：</span>${activeMonths.map(m => { const ms = `2026-${String(m).padStart(2,'0')}`; return `<button onclick="setFinMonth('${ms}')" class="px-3 py-1 rounded text-sm font-medium ${state.finView==='monthly'&&state.finMonth===ms?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${m}月</button>`; }).join('')}</div>`;
  const finAddBtn = `<button class="btn btn-primary btn-sm" onclick="openFinanceModal()">新增财务项目</button>`;

-  const finFilterTabs = `<div class="finance-tabs" style="padding:0;border-bottom:1px solid #e2e8f0;margin-bottom:0"><button onclick="switchFinFilter('overview')" class="finance-tab${state.finFilter==='overview'?' active':''}" style="font-size:14px;font-weight:600">总览</button><button onclick="switchFinFilter('已签约')" class="finance-tab${state.finFilter==='已签约'?' active':''}" style="font-size:14px;font-weight:600">项目 (${pfs.filter(x=>x.status==='已签约').length})</button><button onclick="switchFinFilter('待签约')" class="finance-tab${state.finFilter==='待签约'?' active':''}" style="font-size:14px;font-weight:600">待签约 (${pfs.filter(x=>x.status==='待签约').length})</button><button onclick="switchFinFilter('expense')" class="finance-tab${state.finFilter==='expense'?' active':''}" style="font-size:14px;font-weight:600">平台费用</button></div>`;
+  const finFilterTabs = `<div class="finance-tabs" style="padding:0;border-bottom:1px solid #e2e8f0;margin-bottom:0"><button onclick="switchFinFilter('overview')" class="finance-tab${state.finFilter==='overview'?' active':''}" style="font-size:14px;font-weight:600">月度总览</button><button onclick="switchFinFilter('quarterlyOverview')" class="finance-tab${state.finFilter==='quarterlyOverview'?' active':''}" style="font-size:14px;font-weight:600">季度总览</button><button onclick="switchFinFilter('projects')" class="finance-tab${state.finFilter==='projects'?' active':''}" style="font-size:14px;font-weight:600">项目 (${pfs.length})</button><button onclick="switchFinFilter('expense')" class="finance-tab${state.finFilter==='expense'?' active':''}" style="font-size:14px;font-weight:600">平台费用</button></div>`;

  document.querySelector("#finance").innerHTML = `<div class="grid gap-4">
    ${finFilterTabs}
-    ${state.finFilter !== 'expense' && state.finFilter !== 'overview' ? card(`<div class="flex justify-between items-center"><div class="flex items-center gap-2">${finHeaderBase}</div>${finAddBtn}</div>`, "p-4") : ''}
+    ${state.finFilter !== 'expense' && state.finFilter !== 'overview' && state.finFilter !== 'quarterlyOverview' ? card(`<div class="flex justify-between items-center"><div class="flex items-center gap-2">${finHeaderBase}</div>${finAddBtn}</div>`, "p-4") : ''}
    <div id="financeModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closeFinanceModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-6xl mx-4 max-h-[92vh] overflow-y-auto" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-8 py-5 flex items-center justify-between"><div><h3 class="text-xl font-bold text-slate-800" id="financeModalTitle">新增项目财务</h3><p class="text-xs text-slate-400 mt-0.5">填写项目财务信息与月度预算</p></div><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="financeDeleteBtn" onclick="deleteFinanceItem()"><i data-lucide="trash-2"></i>删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closeFinanceModal()"><i data-lucide="x"></i></button></div></div>
  <div class="finance-tabs">
    <button class="finance-tab active" data-tab="info" onclick="switchFinanceTab('info')"><i data-lucide="info" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>基本信息</button>
@@ -137,12 +134,12 @@ function renderFinance() {
    <div class="grid grid-cols-3 gap-3">
      <label class="block"><span class="fin-label">部门</span><input type="hidden" name="project_id" value="${state.tenant}"><input class="form-ctrl bg-slate-50 cursor-not-allowed" value="${state.tenant}" disabled></label>
      <label class="block"><span class="fin-label">项目编号</span><input name="project_code" class="form-ctrl" placeholder="如：KP-2026-001"></label>
-      <label class="block"><span class="fin-label">项目名称 <span class="text-red-500">*</span></span><input name="customer_name" required class="form-ctrl" placeholder="请输入项目名称"></label>
+      <label class="block"><span class="fin-label">项目名称 <span class="text-red-500">*</span></span><input name="customer_name" required class="form-ctrl" placeholder="请输入项目名称"></label><label class="block"><span class="fin-label">客户名称</span><input name="client_name" class="form-ctrl" placeholder="客户名称"></label>
    </div>
    <div class="grid grid-cols-3 gap-3">
      <label class="block"><span class="fin-label">签约金额（元） <span class="text-red-500">*</span></span><input name="sign_amount" class="form-ctrl" placeholder="必须大于 0"></label>
      <label class="block"><span class="fin-label">签约月份 <span class="text-red-500">*</span></span><select name="sign_month" required class="form-ctrl bg-white"><option value="">选择</option>${monthOptions('')}</select></label>
-      <label class="block"><span class="fin-label">项目状态</span><select name="status" class="form-ctrl bg-white"><option>已签约</option><option>待签约</option></select></label>
+      
    </div>
    <div class="grid grid-cols-3 gap-3">
      <label class="block"><span class="fin-label">商务负责人 <span class="text-red-500">*</span></span><input name="sales_person" required class="form-ctrl" placeholder="请输入商务负责人"></label>
@@ -241,11 +238,15 @@ function renderFinance() {
        setTimeout(() => renderFinanceOverview(), 10);
        return `<div id="financeOverview"></div>`;
      }
+      if (state.finFilter === 'quarterlyOverview') {
+        setTimeout(() => renderFinanceQuarterlyOverview(), 10);
+        return `<div id="financeQuarterlyOverview"></div>`;
+      }
      if (state.finFilter === 'expense') {
        setTimeout(() => renderExpense(), 10);
        return `<div id="financeExpense"></div>`;
      }
-      const isUnsigned = state.finFilter === '待签约';
+      const isUnsigned = false;
      const METRIC_CARDS = [
        { label: '签约金额', value: ctx => moneyWan(ctx.signTotal), color: 'text-slate-700' },
        { label: '已确收', hideUnsigned: true, value: ctx => moneyWan(ctx.sumRev), color: 'text-blue-700' },
@@ -259,7 +260,7 @@ function renderFinance() {
        { label: '毛利率', hideUnsigned: true, value: ctx => ctx.sumRev && ctx.sumGross ? Math.round(ctx.sumGross / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
        { label: '回款率', hideUnsigned: true, value: ctx => ctx.sumRev && ctx.sumPay ? Math.round(ctx.sumPay / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
        { label: '付款率', hideUnsigned: true, value: ctx => ctx.sumCost && ctx.sumPaid ? Math.round(ctx.sumPaid / ctx.sumCost * 100) + '%' : '—', color: 'text-slate-500' },
-      ].filter(c => state.finFilter !== '待签约' || !c.hideUnsigned);
+      ].filter(c => true);

      // 列排序
      if (!state.finSort) state.finSort = { key: null, asc: true };
@@ -285,14 +286,14 @@ function renderFinance() {
        return h;
      };
      const SIGNED_COLS = [
-        { key: 'customer_name', label: '项目名称' }, { key: 'status', label: '状态' }, { key: 'sign_amount', label: '签约金额' },
+        { key: 'client_name', label: '客户' }, { key: 'customer_name', label: '项目名称' }, { key: 'sign_amount', label: '签约金额' },
        { key: 'rev', label: '已确收' }, { key: 'gross', label: '毛利' }, { key: 'cost', label: '成本' },
        { key: 'profit', label: '项目利润' }, { key: 'payment', label: '已回款' }, { key: 'paid', label: '已付' },
        { key: 'cashflow', label: '现金流' }, { key: 'exe_rate', label: '执行率' }, { key: 'gross_rate', label: '毛利率' },
        { key: 'pay_rate', label: '回款率' }, { key: 'paid_rate', label: '付款率' },
      ];
      const UNSIGNED_COLS = [
-        { key: 'customer_name', label: '项目名称' }, { key: 'status', label: '状态' }, { key: 'sign_amount', label: '签约金额' },
+        { key: 'client_name', label: '客户' }, { key: 'customer_name', label: '项目名称' }, { key: 'sign_amount', label: '签约金额' },
        { key: 'sign_month', label: '签约月份' }, { key: 'gross', label: '毛利' }, { key: 'cost', label: '成本' },
        { key: 'profit', label: '项目利润' },
      ];
@@ -324,25 +325,23 @@ function renderFinance() {
        const payR = payRVal !== null ? '<span class="' + payRCls + ' font-semibold">' + payRVal + '%</span>' : '<span class="text-slate-300">—</span>';
        const paidR = cost && paid ? Math.round(paid / cost * 100) + '%' : '<span class="text-slate-300">—</span>';
        const grossR = rev && gross ? Math.round(gross / rev * 100) + '%' : '<span class="text-slate-300">—</span>';
-        const st = pf.status === '已签约' ? '<span class="text-green-600">已签约</span>' : '<span class="text-amber-600">待签约</span>';
-        const cf = cashflow ? money(cashflow) : '<span class="text-slate-300">—</span>';
+                const cf = cashflow ? money(cashflow) : '<span class="text-slate-300">—</span>';
        const cfCls = cashflow >= 0 ? 'text-green-600' : 'text-red-600';
        const profit = gross;
        const pfCls = profit >= 0 ? 'text-green-600' : 'text-red-600';
        const pfVal = profit ? money(profit) : '<span class="text-slate-300">—</span>';
-        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm">${st}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center text-blue-700 align-middle">${fmtNoUnit(rev)}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td><td class="p-2 text-center text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</td><td class="p-2 text-center align-middle text-sm">${exe}</td><td class="p-2 text-center align-middle text-sm">${grossR}</td><td class="p-2 text-center align-middle text-sm">${payR}</td><td class="p-2 text-center align-middle text-sm">${paidR}</td></tr>`;
+        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-center align-middle text-sm">${esc(pf.client_name || "")}</td><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center text-blue-700 align-middle">${fmtNoUnit(rev)}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td><td class="p-2 text-center text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</td><td class="p-2 text-center align-middle text-sm">${exe}</td><td class="p-2 text-center align-middle text-sm">${grossR}</td><td class="p-2 text-center align-middle text-sm">${payR}</td><td class="p-2 text-center align-middle text-sm">${paidR}</td></tr>`;
      };
      // 待签约简版行
      const tdRowUnsigned = (pf, cost, gross) => {
-        const st = pf.status === '待签约' ? '<span class="text-amber-600">待签约</span>' : '<span class="text-green-600">已签约</span>';
-        const profit = gross;
+                const profit = gross;
        const pfCls = profit >= 0 ? 'text-green-600' : 'text-red-600';
        const pfVal = profit ? money(profit) : '<span class="text-slate-300">—</span>';
-        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm">${st}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center align-middle text-sm">${pf.sign_month || '—'}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td></tr>`;
+        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center align-middle text-sm">${pf.sign_month || '—'}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td></tr>`;
      };

      if (state.finView === 'monthly') {
-        const allPfs = pfs.filter(x => x.status === state.finFilter);
+        const allPfs = pfs;
        const now = new Date();
        const defaultMonth = now.getFullYear() + "-" + String(now.getMonth() + 1).padStart(2, "0");
        if (!state.finMonth) state.finMonth = defaultMonth;
@@ -360,8 +359,7 @@ function renderFinance() {
          const paid = Math.round(parseFloat(e.paid || 0) || 0);
          if (!rev && !payment && !cost && !paid && !gross) return;
          dataItems.push({
-            pf: pf, customer_name: pf.customer_name || '', status: pf.status || '',
-            sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
+            pf: pf, customer_name: pf.customer_name || '',             sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
            rev: rev, gross: gross, cost: cost, profit: gross, payment: payment, paid: paid,
            cashflow: payment - paid,
            exe_rate: rev && pf.sign_amount ? Math.round(rev / pf.sign_amount * 100) : 0,
@@ -379,12 +377,12 @@ function renderFinance() {
          rows.push(isUnsigned ? tdRowUnsigned(d.pf, d.cost, d.gross) : tdRow(d.pf, d.rev, d.payment, d.cost, d.paid, d.gross));
        });
        const signTotal = Math.round(allPfs.filter(x => (x.sign_month || "").substring(0, 7) === selMonth).reduce((a, p) => a + (p.sign_amount || 0), 0));
-        const signCnt = allPfs.filter(x => x.status === "已签约" && (x.sign_month || "").substring(0, 7) === selMonth).length;
+        const signCnt = allPfs.filter(x => (x.sign_month || "").substring(0, 7) === selMonth).length;
        return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '该月份暂无数据');
      }

      if (state.finView === 'quarterly') {
-        const allPfs = pfs.filter(x => x.status === state.finFilter);
+        const allPfs = pfs;
        const qRanges = [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10, 11, 12]];
        const now = new Date();
        if (state.finQuarter === undefined) {
@@ -412,8 +410,7 @@ function renderFinance() {
          const paid = sumExpense(pf, "paid");
          if (!rev && !payment && !cost && !paid && !gross) return;
          dataItems.push({
-            pf: pf, customer_name: pf.customer_name || '', status: pf.status || '',
-            sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
+            pf: pf, customer_name: pf.customer_name || '',             sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
            rev: rev, gross: gross, cost: cost, profit: gross, payment: payment, paid: paid,
            cashflow: payment - paid,
            exe_rate: rev && pf.sign_amount ? Math.round(rev / pf.sign_amount * 100) : 0,
@@ -431,7 +428,7 @@ function renderFinance() {
          rows.push(isUnsigned ? tdRowUnsigned(d.pf, d.cost, d.gross) : tdRow(d.pf, d.rev, d.payment, d.cost, d.paid, d.gross));
        });
        const signTotal = Math.round(allPfs.filter(x => { const m = parseInt((x.sign_month || "0").substring(5)) || 0; return qRange.includes(m); }).reduce((a, p) => a + (p.sign_amount || 0), 0));
-        const signCnt = allPfs.filter(x => x.status === "已签约" && qRange.includes(parseInt((x.sign_month || "0").substring(5)) || 0)).length;
+        const signCnt = allPfs.filter(x => qRange.includes(parseInt((x.sign_month || "0").substring(5)) || 0)).length;
        return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '该季度暂无数据');
      }

@@ -445,12 +442,11 @@ function renderFinance() {
        expense.forEach(e => { cost += parseFloat(e.cost || 0) || 0; paid += parseFloat(e.paid || 0) || 0; });
        return { rev: Math.round(rev), payment: Math.round(payment), cost: Math.round(cost), paid: Math.round(paid), gross: Math.round(gross) };
      };
-      const allPfs = pfs.filter(x => x.status === state.finFilter);
+      const allPfs = pfs;
      var dataItems = allPfs.map(pf => {
        var t = calcTotals(pf);
        return {
-          pf: pf, customer_name: pf.customer_name || '', status: pf.status || '',
-          sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
+          pf: pf, customer_name: pf.customer_name || '',           sign_amount: pf.sign_amount || 0, sign_month: pf.sign_month || '',
          rev: t.rev, gross: t.gross, cost: t.cost, profit: t.gross,
          payment: t.payment, paid: t.paid, cashflow: t.payment - t.paid,
          exe_rate: t.rev && pf.sign_amount ? Math.round(t.rev / pf.sign_amount * 100) : 0,
@@ -468,7 +464,7 @@ function renderFinance() {
        rows.push(isUnsigned ? tdRowUnsigned(d.pf, d.cost, d.gross) : tdRow(d.pf, d.rev, d.payment, d.cost, d.paid, d.gross));
      });
      const signTotal = Math.round(allPfs.reduce((a, p) => a + (p.sign_amount || 0), 0));
-      const signCnt = allPfs.filter(x => x.status === "已签约").length;
+      const signCnt = allPfs.length;
      return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '暂无数据');
    })()}
  </div>`;
@@ -780,6 +776,7 @@ window.openPfEditModal = (pfId) => {
    }
  });
  form.querySelector('[name="customer_name"]').value = pf.customer_name || "";
+  const clientInput = form.querySelector('[name="client_name"]'); if (clientInput) clientInput.value = pf.client_name || "";
  const setVal = (name, val) => { const el = form.querySelector(`[name="${name}"]`); if (el) el.value = val || ""; };
  setVal("project_code", pf.project_code);
  form.querySelector('[name="sign_amount"]').value = pf.sign_amount || "";
@@ -789,7 +786,6 @@ window.openPfEditModal = (pfId) => {
    signMonthEl.innerHTML = monthOptions(signMonthValue);
    signMonthEl.value = signMonthValue;
  }
-  form.querySelector('[name="status"]').value = pf.status || "待签约";
  form.querySelector('[name="sales_person"]').value = pf.sales_person || "";
  form.querySelector('[name="owner"]').value = pf.owner || "";
  setVal("start_date", pf.start_date);
@@ -937,55 +933,43 @@ window.deleteFinanceItem = async () => {
  }
 }

-// 总览渲染
+// 月度总览渲染
 function renderFinanceOverview() {
  const { summary, financeMonthly } = state.data;
  if (!summary) return;
  const m = summary.metrics;
-  const moneyIntL = (v) => `${Math.round(Number(v || 0)).toLocaleString("zh-CN")} 元`;
-  const moneyWan = (v) => {
-    const n = Number(v || 0);
-    return n >= 10000 ? (n / 10000).toFixed(0) + "万" : n.toLocaleString("zh-CN");
-  };
+  const moneyIntL = (v) => Math.round(Number(v || 0)).toLocaleString("zh-CN");
+  const moneyWan = (v) => { const n = Number(v || 0); return n >= 10000 ? (n / 10000).toFixed(0) + "万" : n.toLocaleString("zh-CN"); };
  const card = (body, cls) => '<div class="card ' + (cls || 'p-4') + '">' + body + '</div>';
-
-  const rows1 = [["年度累计", moneyIntL(m.signed_annual || m.signed_amount)], ["本季度累计", moneyIntL(m.signed_q2 || 0)], ["本月累计", moneyIntL(m.signed_month || 0)], ["上本季度累计", moneyIntL(m.signed_prev_q || 0)], ["上月累计", moneyIntL(m.signed_prev_month || 0)]];
-  const rows2 = [["年度累计", moneyIntL(m.revenue_annual || 0)], ["本季度累计", moneyIntL(m.revenue_q2 || 0)], ["本月累计", moneyIntL(m.monthly_revenue || 0)], ["上本季度累计", moneyIntL(m.revenue_prev_q || 0)], ["上月累计", moneyIntL(m.revenue_prev_month || 0)]];
-  const rows3 = [["年度累计", moneyIntL(m.gross_annual || 0)], ["本季度累计", moneyIntL(m.gross_q2 || 0)], ["本月累计", moneyIntL(m.monthly_net_profit || 0)], ["上本季度累计", moneyIntL(m.gross_prev_q || 0)], ["上月累计", moneyIntL(m.gross_prev_month || 0)]];
-  const rows4 = [["年度累计", moneyIntL(m.cost_annual || 0)], ["本季度累计", moneyIntL(m.cost_q2 || 0)], ["本月累计", moneyIntL(m.cost_month || 0)], ["上本季度累计", moneyIntL(m.cost_prev_q || 0)], ["上月累计", moneyIntL(m.cost_prev_month || 0)]];
-  const rows5 = [["年度累计", moneyIntL(m.profit_annual || 0)], ["本季度累计", moneyIntL(m.profit_q2 || 0)], ["本月累计", moneyIntL(m.profit_month || 0)], ["上本季度累计", moneyIntL(m.profit_prev_q || 0)], ["上月累计", moneyIntL(m.profit_prev_month || 0)]];
-  const rows7 = [["年度累计", moneyIntL(m.payment_annual || 0)], ["本季度累计", moneyIntL(m.payment_q2 || 0)], ["本月累计", moneyIntL(m.payment_month || 0)], ["上本季度累计", moneyIntL(m.payment_prev_q || 0)], ["上月累计", moneyIntL(m.payment_prev_month || 0)]];
-  const rows8 = [["年度累计", moneyIntL(m.paid_annual || 0)], ["本季度累计", moneyIntL(m.paid_q2 || 0)], ["本月累计", moneyIntL(m.paid_month || 0)], ["上本季度累计", moneyIntL(m.paid_prev_q || 0)], ["上月累计", moneyIntL(m.paid_prev_month || 0)]];
-  const rows9 = [["年度累计", moneyIntL(m.cashflow_annual || 0)], ["本季度累计", moneyIntL(m.cashflow_q2 || 0)], ["本月累计", moneyIntL(m.cashflow_month || 0)], ["上本季度累计", moneyIntL(m.cashflow_prev_q || 0)], ["上月累计", moneyIntL(m.cashflow_prev_month || 0)]];
-
-  const qoq = (cur, prev) => { if (!prev) return '<span class="text-slate-300">—</span>'; const pct = Math.round((cur - prev) / prev * 100); const cls = pct >= 0 ? 'text-green-600' : 'text-red-600'; const sign = pct >= 0 ? '+' : ''; return '<span class="' + cls + '">' + sign + pct + '%</span>'; };
+  const fm = financeMonthly || [];
+  const mLbl = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
  const LABELS = ['合同金额','确收金额','确收毛利','成本','项目利润','回款金额','已付','现金流'];
-  const Q_FIELDS = [m.signed_q2||0, m.revenue_q2, m.gross_q2, m.cost_q2||0, m.profit_q2||0, m.payment_q2||0, m.paid_q2||0, m.cashflow_q2||0];
-  const Q_PREV = [m.signed_prev_q||0, m.revenue_prev_q||0, m.gross_prev_q||0, m.cost_prev_q||0, m.profit_prev_q||0, m.payment_prev_q||0, m.paid_prev_q||0, m.cashflow_prev_q||0];
-  const M_FIELDS = [m.signed_month||0, m.monthly_revenue, m.monthly_net_profit, m.cost_month||0, m.profit_month||0, m.payment_month||0, m.paid_month||0, m.cashflow_month||0];
-  const M_PREV = [m.signed_prev_month||0, m.revenue_prev_month||0, m.gross_prev_month||0, m.cost_prev_month||0, m.profit_prev_month||0, m.payment_prev_month||0, m.paid_prev_month||0, m.cashflow_prev_month||0];
-  const ROWS = [rows1, rows2, rows3, rows4, rows5, rows7, rows8, rows9];
-  const CF_RAW = [m.cashflow_annual||0, m.cashflow_q2||0, m.cashflow_month||0, m.cashflow_prev_q||0, m.cashflow_prev_month||0];
-  const PF_RAW = [m.profit_annual||0, m.profit_q2||0, m.profit_month||0, m.profit_prev_q||0, m.profit_prev_month||0];
-
-  var tdVal = function(ri, col, val) {
-    if (ri === 4) return '<td class="py-2 text-right font-semibold ' + (PF_RAW[col] >= 0 ? 'text-green-600' : 'text-red-600') + '">' + val + '</td>';
-    if (ri === 7) return '<td class="py-2 text-right font-semibold ' + (CF_RAW[col] >= 0 ? 'text-green-600' : 'text-red-600') + '">' + val + '</td>';
-    return '<td class="py-2 text-right font-semibold text-slate-800">' + val + '</td>';
-  };
-  var thead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500">指标</th><th class="py-2 text-right font-semibold text-slate-700">年度累计</th><th class="py-2 text-right font-semibold text-slate-700">上季度累计</th><th class="py-2 text-right font-semibold text-slate-700">上月累计</th><th class="py-2 text-right font-semibold text-slate-700">本季度累计</th><th class="py-2 text-right font-semibold text-slate-400">季环比</th><th class="py-2 text-right font-semibold text-slate-700">本月累计</th><th class="py-2 text-right font-semibold text-slate-400">月环比</th></tr>';
+  const annualVals = [m.signed_annual||m.signed_amount||0, m.revenue_annual||0, m.gross_annual||0, m.cost_annual||0, m.profit_annual||0, m.payment_annual||0, m.paid_annual||0, m.cashflow_annual||0];
+  const fmFields = ['sign','revenue','gross','cost',null,'payment','paid',null];
+  var thead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500 whitespace-nowrap">指标</th><th class="py-2 text-right font-semibold text-slate-700 whitespace-nowrap">年度累计</th>';
+  for (var mi = 0; mi < 12; mi++) { thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">' + mLbl[mi] + '</th>'; }
+  thead += '</tr>';
  var tbody = '';
  for (var ri = 0; ri < 8; ri++) {
-    var vals = ROWS[ri];
-    tbody += '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700">' + LABELS[ri] + '</td>' +
-      tdVal(ri, 0, vals[0][1]) + tdVal(ri, 3, vals[3][1]) + tdVal(ri, 4, vals[4][1]) + tdVal(ri, 1, vals[1][1]) +
-      '<td class="py-2 text-right">' + qoq(Q_FIELDS[ri], Q_PREV[ri]) + '</td>' +
-      tdVal(ri, 2, vals[2][1]) +
-      '<td class="py-2 text-right">' + qoq(M_FIELDS[ri], M_PREV[ri]) + '</td></tr>';
+    var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700 whitespace-nowrap">' + LABELS[ri] + '</td>';
+    rowHtml += '<td class="py-2 text-right font-semibold text-slate-800 whitespace-nowrap">' + moneyIntL(annualVals[ri]) + '</td>';
+    for (var mi = 0; mi < 12; mi++) {
+      var val = 0;
+      if (fm[mi]) {
+        if (ri === 4) { val = (fm[mi].gross || 0) - (fm[mi].cost || 0); }
+        else if (ri === 7) { val = (fm[mi].payment || 0) - (fm[mi].paid || 0); }
+        else { var fk = fmFields[ri]; if (fk) val = fm[mi][fk] || 0; }
+      }
+      var cls = 'text-slate-700';
+      if (ri === 4) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
+      if (ri === 7) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
+      rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cls + '">' + moneyIntL(val) + '</td>';
+    }
+    tbody += rowHtml + '</tr>';
  }

  document.querySelector("#financeOverview").innerHTML = '<div class="grid gap-5">' +
-    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
+    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务月度概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
    '<div class="grid grid-cols-4 gap-5">' +
      card('<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度签约趋势</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="finChartSign"></canvas></div>', 'p-4') +
      card('<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度确收与毛利</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="finChartRev"></canvas></div>', 'p-4') +
@@ -994,12 +978,66 @@ function renderFinanceOverview() {
    '</div></div>';

  if (window.lucide) window.lucide.createIcons();
-  // 渲染图表（复用 home.js 的 moneyTick / chartOptions / monthLabels）
  if (financeMonthly && window.Chart) {
    renderOverviewCharts(financeMonthly);
  }
 }

+// 季度总览渲染
+function renderFinanceQuarterlyOverview() {
+  const { summary, financeMonthly } = state.data;
+  if (!summary) return;
+  const m = summary.metrics;
+  const moneyIntL = (v) => Math.round(Number(v || 0)).toLocaleString("zh-CN");
+  const card = (body, cls) => '<div class="card ' + (cls || 'p-4') + '">' + body + '</div>';
+  const fm = financeMonthly || [];
+  const LABELS = ['合同金额','确收金额','确收毛利','成本','项目利润','回款金额','已付','现金流'];
+  const qLbl = ['Q1','Q2','Q3','Q4'];
+  const qRanges = [[0,1,2],[3,4,5],[6,7,8],[9,10,11]];
+  const annualVals = [m.signed_annual||m.signed_amount||0, m.revenue_annual||0, m.gross_annual||0, m.cost_annual||0, m.profit_annual||0, m.payment_annual||0, m.paid_annual||0, m.cashflow_annual||0];
+  const fmFields = ['sign','revenue','gross','cost',null,'payment','paid',null];
+  var qData = [[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0]];
+  for (var qi = 0; qi < 4; qi++) {
+    for (var ri = 0; ri < 8; ri++) {
+      var sum = 0;
+      for (var mi = 0; mi < 3; mi++) {
+        var idx = qRanges[qi][mi];
+        if (fm[idx]) {
+          if (ri === 4) { sum += (fm[idx].gross||0) - (fm[idx].cost||0); }
+          else if (ri === 7) { sum += (fm[idx].payment||0) - (fm[idx].paid||0); }
+          else { var fk = fmFields[ri]; if (fk) sum += fm[idx][fk] || 0; }
+        }
+      }
+      qData[ri][qi] = sum;
+    }
+  }
+  var thead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500 whitespace-nowrap">指标</th><th class="py-2 text-right font-semibold text-slate-700 whitespace-nowrap">年度累计</th>';
+  thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">Q1</th>';
+  thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">Q2</th><th class="py-2 text-right font-semibold text-slate-400 whitespace-nowrap">环比</th>';
+  thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">Q3</th><th class="py-2 text-right font-semibold text-slate-400 whitespace-nowrap">环比</th>';
+  thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">Q4</th><th class="py-2 text-right font-semibold text-slate-400 whitespace-nowrap">环比</th>';
+  thead += '</tr>';
+  var qoq = function(cur, prev) { if (!prev) return '<span class="text-slate-300">—</span>'; var pct = Math.round((cur - prev) / prev * 100); var cls = pct >= 0 ? 'text-green-600' : 'text-red-600'; var sign = pct >= 0 ? '+' : ''; return '<span class="' + cls + '">' + sign + pct + '%</span>'; };
+  var tbody = '';
+  for (var ri = 0; ri < 8; ri++) {
+    var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700 whitespace-nowrap">' + LABELS[ri] + '</td>';
+    rowHtml += '<td class="py-2 text-right font-semibold text-slate-800 whitespace-nowrap">' + moneyIntL(annualVals[ri]) + '</td>';
+    for (var qi = 0; qi < 4; qi++) {
+      var val = qData[ri][qi];
+      var cls = 'text-slate-700';
+      if (ri === 4) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
+      if (ri === 7) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
+      rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cls + '">' + moneyIntL(val) + '</td>';
+      if (qi > 0) { rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap">' + qoq(val, qData[ri][qi - 1]) + '</td>'; }
+    }
+    tbody += rowHtml + '</tr>';
+  }
+  document.querySelector("#financeQuarterlyOverview").innerHTML = '<div class="grid gap-5">' +
+    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务季度概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
+    '</div>';
+  if (window.lucide) window.lucide.createIcons();
+}
+
 function renderOverviewCharts(data) {
  if (typeof monthLabels !== 'function') return;
  const labels = monthLabels(data);
--- a/static/modules/performance.js
+++ b/static/modules/performance.js
@@ -10,7 +10,7 @@ window.renderPerformance = () => {
  const qRange = qRanges[q];
  const storageKey = 'opc-performance-Q' + (q + 1);

-  const pfs = (data.projectFinances || []).filter(p => p.status === '已签约');
+  const pfs = (data.projectFinances || []);

  const sumQ = (field) => {
    let total = 0;
--- a/static/modules/plan.js
+++ b/static/modules/plan.js
@@ -22,8 +22,8 @@ function renderPlan() {
  const months = displayMonths.map(d => d.key);
  const monthLabels = displayMonths.map(d => d.label);

-  const signed = pfs.filter(x => x.status === "已签约");
-    const pending = pfs.filter(x => x.status === "待签约");
+  const signed = pfs;
+    const pending = pfs;
  const sumSign = Math.round(signed.reduce((s,x) => s + (x.sign_amount||0), 0));
  const sumPending = Math.round(pending.reduce((s,x) => s + (x.sign_amount||0), 0));
  
@@ -95,31 +95,32 @@ function renderPlan() {
      }
    })();
    const sm = pf.sign_month || "";
-    const signMonthCell = `<td class="p-2 text-center align-middle text-sm"><span class="pf-sm-text cursor-pointer hover:text-blue-600" id="pf-sm-${pf.id}" onclick="event.stopPropagation(); editPfSignMonth(event, ${pf.id})">${sm || '—'}</span></td>`;
-    return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium text-center align-middle">${esc(pf.customer_name)}</td>${signMonthCell}<td class="p-2 text-center align-middle text-sm">${money(pf.sign_amount)}</td>${mCols}${totalCol}</tr>`;
+    const signMonthCell = `<td class="p-2 text-center align-middle text-sm"><span class="pf-sm-text cursor-pointer hover:text-blue-600" id="pf-sm-${pf.id}" onclick="event.stopPropagation(); planEditSignMonth(event, ${pf.id})">${sm || '—'}</span></td>`;
+    return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="planOpenPfEditModal(${pf.id})"><td class="p-2 text-center align-middle text-sm">${esc(pf.client_name || "")}</td><td class="p-2 text-sm font-medium text-center align-middle">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm">${esc(pf.weight || "20%")}</td><td class="p-2 text-center align-middle text-sm">${esc(pf.project_type || "待签约")}</td>${signMonthCell}<td class="p-2 text-center align-middle text-sm">${money(pf.sign_amount)}</td>${mCols}${totalCol}</tr>`;
  };

  const now2 = new Date();
  const defaultMonth2 = now2.getFullYear() + "-" + String(now2.getMonth()+1).padStart(2,"0");
  if (!state.planMonth) state.planMonth = defaultMonth2;
  if (state.planQuarter === undefined) state.planQuarter = Math.floor(now2.getMonth() / 3);
-  const monthSet2 = new Set([defaultMonth2]);
-  pfs.forEach(pf => { let bd = []; try { bd = JSON.parse(pf.budget_data || "[]"); } catch(e) {} bd.forEach(b => { if (b.month) monthSet2.add(b.month); }); });
-  const allMonths = [...monthSet2].sort().reverse();
-  const qLabels2 = ["Q1 (1-3月)","Q2 (4-6月)","Q3 (7-9月)","Q4 (10-12月)"];
-  const toolMonthSelect = allMonths.map(m => '<option value="'+m+'" '+(m===state.planMonth?'selected':'')+'>'+m+'</option>').join("");
-  const toolQuarterSelect = qLabels2.map((l,i) => '<option value="'+i+'" '+(i===state.planQuarter?'selected':'')+'>'+l+'</option>').join("");
-  const toolDateSelect = state.planView==='monthly'?'<span class="text-sm text-slate-500 ml-2">月份：</span><select onchange="state.planMonth=this.value;renderPlan()" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">'+toolMonthSelect+'</select>':state.planView==='quarterly'?'<span class="text-sm text-slate-500 ml-2">季度：</span><select onchange="state.planQuarter=parseInt(this.value);localStorage.setItem(\'opc-fin-quarter\',this.value);renderPlan()" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px">'+toolQuarterSelect+'</select>':'';
-
-  const finHeaderBase = `<span class="text-sm text-slate-500">视图：</span><select onchange="setPlanView(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url(&apos;data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2212%22 height=%2212%22 viewBox=%220 0 24 24%22 fill=%22none%22 stroke=%22%236b7280%22 stroke-width=%222%22 stroke-linecap=%22round%22 stroke-linejoin=%22round%22%3E%3Cpolyline points=%226 9 12 15 18 9%22%3E%3C/polyline%3E%3C/svg%3E&apos;) no-repeat right 4px center;padding-right:22px;min-height:30px"><option value="overview" ${state.planView==='overview'?'selected':''}>总视图</option><option value="quarterly" ${state.planView==='quarterly'?'selected':''}>季度视图</option><option value="monthly" ${state.planView==='monthly'?'selected':''}>月度视图</option></select>${toolDateSelect}`;
+  const qLabels = ['Q1','Q2','Q3','Q4'];
+  const qMonths = [[1,2,3],[4,5,6],[7,8,9],[10,11,12]];
+  const nowD = new Date();
+  const activeQ = state.planQuarter !== undefined ? state.planQuarter : Math.floor(nowD.getMonth() / 3);
+  const activeMonths = qMonths[activeQ];
+  const finHeaderBase = `<div class="flex items-center gap-2"><button onclick="setPlanView('overview')" class="px-3 py-1 rounded text-sm font-medium ${state.planView==='overview'?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">总视图</button><span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">按季度：</span>${qLabels.map((q,i) => `<button onclick="setPlanQuarter(${i})" class="px-3 py-1 rounded text-sm font-medium ${state.planView==='quarterly'&&activeQ===i?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${q}</button>`).join('')}<span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">按月度：</span>${activeMonths.map(m => { const ms = `2026-${String(m).padStart(2,'0')}`; return `<button onclick="setPlanMonth('${ms}')" class="px-3 py-1 rounded text-sm font-medium ${state.planView==='monthly'&&state.planMonth===ms?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${m}月</button>`; }).join('')}</div>`;
  const finAddBtn = `<button class="btn btn-primary btn-sm" onclick="openPlanModal()">新增财务项目</button>`;

-  const planFilterTabs = `<div class="finance-tabs" style="padding:0 0 0 0;border-bottom:1px solid #e2e8f0;margin-bottom:0;display:flex;gap:4px"><button onclick="switchPlanFilter('overview')" class="finance-tab${state.planFilter==='overview'?' active':''}" style="font-size:14px;font-weight:600;padding:8px 16px;margin-right:0">总览</button><button onclick="switchPlanFilter('已签约')" class="finance-tab${state.planFilter==='已签约'?' active':''}" style="font-size:14px;font-weight:600">项目 (${pfs.filter(x=>x.status==='已签约').length})</button><button onclick="switchPlanFilter('待签约')" class="finance-tab${state.planFilter==='待签约'?' active':''}" style="font-size:14px;font-weight:600">待签约 (${pfs.filter(x=>x.status==='待签约').length})</button><button onclick="switchPlanFilter('expense')" class="finance-tab${state.planFilter==='expense'?' active':''}" style="font-size:14px;font-weight:600">平台费用</button></div>`;
+  const planFilterTabs = `<div class="finance-tabs" style="padding:0 0 0 0;border-bottom:1px solid #e2e8f0;margin-bottom:0;display:flex;gap:4px"><button onclick="switchPlanFilter('overview')" class="finance-tab${state.planFilter==='overview'?' active':''}" style="font-size:14px;font-weight:600;padding:8px 16px;margin-right:0">月度总览</button><button onclick="switchPlanFilter('quarterlyOverview')" class="finance-tab${state.planFilter==='quarterlyOverview'?' active':''}" style="font-size:14px;font-weight:600">季度总览</button><button onclick="switchPlanFilter('projects')" class="finance-tab${state.planFilter==='projects'?' active':''}" style="font-size:14px;font-weight:600">项目计划 (${pfs.length})</button><button onclick="switchPlanFilter('expense')" class="finance-tab${state.planFilter==='expense'?' active':''}" style="font-size:14px;font-weight:600">平台费用计划</button></div>`;

  document.querySelector("#plan").innerHTML = `<div class="grid gap-4">
    ${planFilterTabs}
-    ${state.planFilter !== 'expense' && state.planFilter !== 'overview' ? card(`<div class="flex justify-between items-center"><div class="flex items-center gap-2">${finHeaderBase}</div>${finAddBtn}</div>`, "p-4") : ''}
-    <div id="financeModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closePlanModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-6xl mx-4 max-h-[92vh] overflow-y-auto" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-8 py-5 flex items-center justify-between"><div><h3 class="text-xl font-bold text-slate-800" id="financeModalTitle">新增项目财务</h3><p class="text-xs text-slate-400 mt-0.5">填写项目财务信息与月度预算</p></div><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="financeDeleteBtn" onclick="deletePlanItem()"><i data-lucide="trash-2"></i>删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closePlanModal()"><i data-lucide="x"></i></button></div></div>
+    <div class="flex items-center gap-3 px-4 py-3 rounded-lg border" style="background:linear-gradient(135deg,#dbeafe,#bfdbfe);border-color:#3b82f6">
+      <i data-lucide="lightbulb" class="text-blue-600 flex-shrink-0" style="width:18px;height:18px"></i>
+      <span class="text-sm text-blue-900"><strong>计划提醒：</strong>计划也是预算，只有真正能够列出计划的预算，才有靠谱的落地可能性</span>
+    </div>
+    ${state.planFilter !== 'expense' && state.planFilter !== 'overview' && state.planFilter !== 'quarterlyOverview' ? card(`<div class="flex justify-between items-center"><div class="flex items-center gap-2">${finHeaderBase}</div>${finAddBtn}</div>`, "p-4") : ''}
+    <div id="planModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closePlanModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-6xl mx-4 max-h-[92vh] overflow-y-auto" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-8 py-5 flex items-center justify-between"><div><h3 class="text-xl font-bold text-slate-800" id="planModalTitle">新增项目财务</h3><p class="text-xs text-slate-400 mt-0.5">填写项目财务信息与月度预算</p></div><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="planDeleteBtn" onclick="deletePlanItem()"><i data-lucide="trash-2"></i>删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closePlanModal()"><i data-lucide="x"></i></button></div></div>
  <div class="finance-tabs">
    <button class="finance-tab active" data-tab="info" onclick="switchPlanTab('info')"><i data-lucide="info" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>基本信息</button>
    <button class="finance-tab" data-tab="revpay" onclick="switchPlanTab('revpay')"><i data-lucide="dollar-sign" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>确收与回款</button>
@@ -128,9 +129,9 @@ function renderPlan() {
    <button class="finance-tab" data-tab="tasks" onclick="switchPlanTab('tasks')"><i data-lucide="list-checks" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>任务管理</button>
    <button class="finance-tab" data-tab="activity" onclick="switchPlanTab('activity')"><i data-lucide="message-square" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>活动与跟进</button>
  </div>
-<form onsubmit="createPlanFinance(event)" class="plan-form" novalidate><input type="hidden" name="pf_id" id="pf-id-input" value="">
-<div class="plan-tab-body">
-<div id="financeTabInfo">
+<form onsubmit="createPlanFinance(event)" class="finance-form" novalidate><input type="hidden" name="pf_id" id="plan_pf-id-input" value="">
+<div class="finance-tab-body">
+<div id="plan_financeTabInfo">
  <div class="grid gap-4">
    <div class="grid grid-cols-3 gap-3">
      <label class="block"><span class="fin-label">部门</span><input type="hidden" name="project_id" value="${state.tenant}"><input class="form-ctrl bg-slate-50 cursor-not-allowed" value="${state.tenant}" disabled></label>
@@ -140,7 +141,7 @@ function renderPlan() {
    <div class="grid grid-cols-3 gap-3">
      <label class="block"><span class="fin-label">签约金额（元） <span class="text-red-500">*</span></span><input name="sign_amount" class="form-ctrl" placeholder="必须大于 0"></label>
      <label class="block"><span class="fin-label">签约月份 <span class="text-red-500">*</span></span><select name="sign_month" required class="form-ctrl bg-white"><option value="">选择</option>${monthOptions('')}</select></label>
-      <label class="block"><span class="fin-label">项目状态</span><select name="status" class="form-ctrl bg-white"><option>已签约</option><option>待签约</option></select></label>
+      
    </div>
    <div class="grid grid-cols-3 gap-3">
      <label class="block"><span class="fin-label">商务负责人 <span class="text-red-500">*</span></span><input name="sales_person" required class="form-ctrl" placeholder="请输入商务负责人"></label>
@@ -149,12 +150,12 @@ function renderPlan() {
    </div>
    <div class="grid grid-cols-3 gap-3">
      <label class="block"><span class="fin-label">联系电话</span><input name="contact_phone" class="form-ctrl" placeholder="请输入联系电话"></label>
-      <label class="block"><span class="fin-label">其他</span><input name="other_info" class="form-ctrl" placeholder="备注信息"></label>
+      <label class="block"><span class="fin-label">其他</span><input name="other_info" class="form-ctrl" placeholder="备注信息"></label></div><div class="grid grid-cols-3 gap-3"><label class="block"><span class="fin-label">客户名称</span><input name="client_name" class="form-ctrl" placeholder="客户名称"></label><label class="block"><span class="fin-label">项目类型</span><select name="project_type" class="form-ctrl bg-white"><option>待签约</option><option>已签约</option></select></label><label class="block"><span class="fin-label">加权</span><select name="weight" class="form-ctrl bg-white"><option>20%</option><option>40%</option><option>60%</option><option>80%</option><option>100%</option></select></label>
    </div>
-    <div class="block"><span class="fin-label">业务类型</span><div class="flex flex-wrap gap-2 mt-1" id="businessTypeChecks">${fmTypes.map(t => `<label class="inline-flex items-center gap-1 px-2.5 py-1 rounded-full border border-slate-200 cursor-pointer hover:border-blue-300 text-sm bt-chip" onclick="toggleBtChip(this)"><input type="checkbox" name="business_type[]" value="${t}" class="hidden"><span>${t}</span></label>`).join("")}</div></div>
+    <div class="block"><span class="fin-label">业务类型</span><div class="flex flex-wrap gap-2 mt-1" id="plan_businessTypeChecks">${fmTypes.map(t => `<label class="inline-flex items-center gap-1 px-2.5 py-1 rounded-full border border-slate-200 cursor-pointer hover:border-blue-300 text-sm bt-chip" onclick="planToggleBtChip(this)"><input type="checkbox" name="business_type[]" value="${t}" class="hidden"><span>${t}</span></label>`).join("")}</div></div>
  </div>
 </div>
-<div id="financeTabExec" class="hidden">
+<div id="plan_financeTabExec" class="hidden">
  <div class="fin-field-group">
    <p class="fin-section-label">执行信息</p>
    <div class="grid grid-cols-3 gap-4">
@@ -165,53 +166,53 @@ function renderPlan() {
    </div>
  </div>
 </div>
-<div id="financeTabRevpay" class="hidden">
-  <div class="grid grid-cols-3 gap-3 mb-4" id="revpaySummary">
+<div id="plan_financeTabRevpay" class="hidden">
+  <div class="grid grid-cols-3 gap-3 mb-4" id="plan_revpaySummary">
    <div class="bg-blue-50 rounded-lg p-3 text-center border border-blue-100">
      <p class="text-xs text-blue-600 font-medium">总确收</p>
-      <p class="text-lg font-bold text-blue-700" id="revpayTotalRev">¥0</p>
+      <p class="text-lg font-bold text-blue-700" id="plan_revpayTotalRev">¥0</p>
    </div>
    <div class="bg-green-50 rounded-lg p-3 text-center border border-green-100">
      <p class="text-xs text-green-600 font-medium">总毛利</p>
-      <p class="text-lg font-bold text-green-700" id="revpayTotalGross">¥0</p>
+      <p class="text-lg font-bold text-green-700" id="plan_revpayTotalGross">¥0</p>
    </div>
    <div class="bg-amber-50 rounded-lg p-3 text-center border border-amber-100">
      <p class="text-xs text-amber-600 font-medium">总回款</p>
-      <p class="text-lg font-bold text-amber-700" id="revpayTotalPayment">¥0</p>
+      <p class="text-lg font-bold text-amber-700" id="plan_revpayTotalPayment">¥0</p>
    </div>
  </div>
-  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="revpayTable">
+  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="plan_revpayTable">
    <thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2.5 text-left font-medium text-slate-500" style="min-width:140px">月份</th><th class="p-2.5 text-right font-medium text-slate-500">确收</th><th class="p-2.5 text-right font-medium text-slate-500">毛利</th><th class="p-2.5 text-right font-medium text-slate-500">回款</th><th class="p-2.5 text-left font-medium text-slate-500">备注</th><th class="p-2.5 w-8"></th></tr></thead>
-    <tbody id="revpayTbody"></tbody>
+    <tbody id="plan_revpayTbody"></tbody>
  </table>
-  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addRevpayRow()"><i data-lucide="plus"></i>添加月份</button>
+  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="planAddRevpayRow()"><i data-lucide="plus"></i>添加月份</button>
 </div>
-<div id="financeTabCost" class="hidden">
-  <div class="grid grid-cols-2 gap-3 mb-4" id="costSummary">
+<div id="plan_financeTabCost" class="hidden">
+  <div class="grid grid-cols-2 gap-3 mb-4" id="plan_costSummary">
    <div class="bg-rose-50 rounded-lg p-3 text-center border border-rose-100">
      <p class="text-xs text-rose-600 font-medium">总成本</p>
-      <p class="text-lg font-bold text-rose-700" id="costTotalCost">¥0</p>
+      <p class="text-lg font-bold text-rose-700" id="plan_costTotalCost">¥0</p>
    </div>
    <div class="bg-purple-50 rounded-lg p-3 text-center border border-purple-100">
      <p class="text-xs text-purple-600 font-medium">总已付</p>
-      <p class="text-lg font-bold text-purple-700" id="costTotalPaid">¥0</p>
+      <p class="text-lg font-bold text-purple-700" id="plan_costTotalPaid">¥0</p>
    </div>
  </div>
-  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="costTable">
+  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="plan_costTable">
    <thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2.5 text-left font-medium text-slate-500" style="min-width:140px">月份</th><th class="p-2.5 text-left font-medium text-slate-500" style="min-width:120px">费用类型</th><th class="p-2.5 text-right font-medium text-slate-500">成本</th><th class="p-2.5 text-right font-medium text-slate-500">已付</th><th class="p-2.5 text-left font-medium text-slate-500">备注</th><th class="p-2.5 w-8"></th></tr></thead>
-    <tbody id="costTbody"></tbody>
+    <tbody id="plan_costTbody"></tbody>
  </table>
-  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addCostRow()"><i data-lucide="plus"></i>添加月份</button>
+  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="planAddCostRow()"><i data-lucide="plus"></i>添加月份</button>
 </div>
-<div id="financeTabTasks" class="hidden">
-  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="taskTable">
+<div id="plan_financeTabTasks" class="hidden">
+  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="plan_taskTable">
    <thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2.5 text-left font-medium text-slate-500" style="min-width:120px">月份</th><th class="p-2.5 text-left font-medium text-slate-500" style="min-width:120px">任务类型</th><th class="p-2.5 text-right font-medium text-slate-500">任务数量</th><th class="p-2.5 text-right font-medium text-slate-500">已执行</th><th class="p-2.5 text-right font-medium text-slate-500">差额</th><th class="p-2.5 text-right font-medium text-slate-500">单价</th><th class="p-2.5 text-right font-medium text-slate-500">执行金额</th><th class="p-2.5 text-right font-medium text-slate-500">未执行金额</th><th class="p-2.5 w-8"></th></tr></thead>
-    <tbody id="taskTbody"></tbody>
+    <tbody id="plan_taskTbody"></tbody>
  </table>
-  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addTaskRow()"><i data-lucide="plus"></i>添加任务</button>
+  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="planAddTaskRow()"><i data-lucide="plus"></i>添加任务</button>
 </div>
-<div id="financeTabActivity" class="hidden">
-  <div class="grid gap-2" id="finActivityList"></div>
+<div id="plan_financeTabActivity" class="hidden">
+  <div class="grid gap-2" id="plan_finActivityList"></div>
  <div class="comment-box mt-3">
    <div class="squire-toolbar">
      <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('bold')" title="加粗"><i data-lucide="bold"></i></button>
@@ -226,24 +227,28 @@ function renderPlan() {
      <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('undo')" title="撤销"><i data-lucide="undo"></i></button>
      <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('redo')" title="重做"><i data-lucide="redo"></i></button>
    </div>
-    <div class="squire-editor" id="squire_finance" placeholder="添加评论"></div>
+    <div class="squire-editor" id="plan_squire_finance" placeholder="添加评论"></div>
    <div class="comment-toolbar">
      <span class="comment-hint">支持富文本编辑</span>
-      <button class="btn btn-primary btn-sm comment-submit" type="button" onclick="submitFinComment()">评论</button>
+      <button class="btn btn-primary btn-sm comment-submit" type="button" onclick="planSubmitComment()">评论</button>
    </div>
  </div>
 </div>
-</div><div class="flex justify-end gap-3 pt-2 plan-form-actions"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closePlanModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>
+</div><div class="flex justify-end gap-3 pt-2 finance-form-actions"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closePlanModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>
    ${(() => {
      if (state.planFilter === 'overview') {
        setTimeout(() => renderPlanOverview(), 10);
-        return `<div id="financeOverview"></div>`;
+        return `<div id="planOverview"></div>`;
+      }
+      if (state.planFilter === 'quarterlyOverview') {
+        setTimeout(() => renderPlanQuarterlyOverview(), 10);
+        return `<div id="planQuarterlyOverview"></div>`;
      }
      if (state.planFilter === 'expense') {
        setTimeout(() => renderPlanExpense(), 10);
        return `<div id="planExpenseModule"></div>`;
      }
-      const isUnsigned = state.planFilter === '待签约';
+      const isUnsigned = false;
      const METRIC_CARDS = [
        { label: '签约金额', value: ctx => moneyWan(ctx.signTotal), color: 'text-slate-700' },
        { label: '已确收', hideUnsigned: true, value: ctx => moneyWan(ctx.sumRev), color: 'text-blue-700' },
@@ -257,7 +262,7 @@ function renderPlan() {
        { label: '毛利率', hideUnsigned: true, value: ctx => ctx.sumRev && ctx.sumGross ? Math.round(ctx.sumGross / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
        { label: '回款率', hideUnsigned: true, value: ctx => ctx.sumRev && ctx.sumPay ? Math.round(ctx.sumPay / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
        { label: '付款率', hideUnsigned: true, value: ctx => ctx.sumCost && ctx.sumPaid ? Math.round(ctx.sumPaid / ctx.sumCost * 100) + '%' : '—', color: 'text-slate-500' },
-      ].filter(c => state.planFilter !== '待签约' || !c.hideUnsigned);
+      ].filter(c => true);

      // 列排序
      if (!state.planSort) state.planSort = { key: null, asc: true };
@@ -284,8 +289,10 @@ function renderPlan() {
        return h;
      };
      const SIGNED_COLS = [
+        { key: 'client_name', label: '客户' },
        { key: 'customer_name', label: '项目名称' },
-        { key: 'status', label: '状态' },
+        { key: 'weight', label: '加权' },
+        { key: 'project_type', label: '项目类型' },
        { key: 'sign_amount', label: '签约金额' },
        { key: 'rev', label: '已确收' },
        { key: 'gross', label: '毛利' },
@@ -295,13 +302,13 @@ function renderPlan() {
        { key: 'paid', label: '已付' },
        { key: 'cashflow', label: '现金流' },
        { key: 'exe_rate', label: '执行率' },
-        { key: 'gross_rate', label: '毛利率' },
        { key: 'pay_rate', label: '回款率' },
-        { key: 'paid_rate', label: '付款率' },
      ];
      const UNSIGNED_COLS = [
+        { key: 'client_name', label: '客户' },
        { key: 'customer_name', label: '项目名称' },
-        { key: 'status', label: '状态' },
+        { key: 'weight', label: '加权' },
+        { key: 'project_type', label: '项目类型' },
        { key: 'sign_amount', label: '签约金额' },
        { key: 'sign_month', label: '签约月份' },
        { key: 'gross', label: '毛利' },
@@ -316,13 +323,13 @@ function renderPlan() {
          return typeof v === 'object' ? [c.label, v.val, v.cls] : [c.label, v, c.color];
        });
        const thead = isUnsigned ? buildThead(UNSIGNED_COLS, 'uns') : buildThead(SIGNED_COLS, 'sig');
-        const theadCols = isUnsigned ? 7 : 14;
+        const theadCols = isUnsigned ? 9 : 14;
        const tbody = rows.length ? `<tbody>${rows.join("")}</tbody>` : `<tr><td colspan="${theadCols}" class="p-6 text-center text-slate-400">${emptyText}</td></tr>`;

        const cardGrid = isUnsigned ? 'grid-cols-4' : 'grid-cols-6';
        const subtitle = isUnsigned
          ? '合同 → 毛利 → 成本 → 项目利润'
-          : '合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流 → 执行率 → 毛利率 → 回款率 → 付款率';
+          : '合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流';
        return card(`<div class="grid ${cardGrid} gap-3 mb-3">${cards.map(([l, v, c]) => '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">' + l + '</span><strong class="mt-2 block text-xl ' + c + '">' + v + '</strong></div>').join("")}</div>`, "p-4") +
               card(`<h3 class="text-sm font-bold text-slate-700">项目财务明细</h3><p class="text-xs text-slate-400 mb-3">${subtitle}</p><div class="overflow-x-auto"><table class="w-full text-sm">${thead}${tbody}</table></div>`, "p-4");
      };
@@ -336,25 +343,23 @@ function renderPlan() {
        const payR = payRVal !== null ? '<span class="' + payRCls + ' font-semibold">' + payRVal + '%</span>' : '<span class="text-slate-300">—</span>';
        const paidR = cost && paid ? Math.round(paid / cost * 100) + '%' : '<span class="text-slate-300">—</span>';
        const grossR = rev && gross ? Math.round(gross / rev * 100) + '%' : '<span class="text-slate-300">—</span>';
-        const st = pf.status === '已签约' ? '<span class="text-green-600">已签约</span>' : '<span class="text-amber-600">待签约</span>';
-        const cf = cashflow ? money(cashflow) : '<span class="text-slate-300">—</span>';
+                const cf = cashflow ? money(cashflow) : '<span class="text-slate-300">—</span>';
        const cfCls = cashflow >= 0 ? 'text-green-600' : 'text-red-600';
        const profit = gross;
        const pfCls = profit >= 0 ? 'text-green-600' : 'text-red-600';
        const pfVal = profit ? money(profit) : '<span class="text-slate-300">—</span>';
-        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm">${st}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center text-blue-700 align-middle">${fmtNoUnit(rev)}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td><td class="p-2 text-center text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</td><td class="p-2 text-center align-middle text-sm">${exe}</td><td class="p-2 text-center align-middle text-sm">${grossR}</td><td class="p-2 text-center align-middle text-sm">${payR}</td><td class="p-2 text-center align-middle text-sm">${paidR}</td></tr>`;
+        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="planOpenPfEditModal(${pf.id})"><td class="p-2 text-center align-middle text-sm">${esc(pf.client_name || "")}</td><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm" onclick="event.stopPropagation()">${planInlineSelect('weight', pf.id, 'weight', pf.weight || '20%', ['20%','40%','60%','80%','100%'])}</td><td class="p-2 text-center align-middle text-sm" onclick="event.stopPropagation()">${planInlineSelect('ptype', pf.id, 'project_type', pf.project_type || '待签约', ['待签约','已签约'])}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center text-blue-700 align-middle">${fmtNoUnit(rev)}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td><td class="p-2 text-center text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</td><td class="p-2 text-center align-middle text-sm">${exe}</td><td class="p-2 text-center align-middle text-sm">${payR}</td></tr>`;
      };
      // 待签约简版行
      const tdRowUnsigned = (pf, cost, gross) => {
-        const st = pf.status === '待签约' ? '<span class="text-amber-600">待签约</span>' : '<span class="text-green-600">已签约</span>';
-        const profit = gross;
+                const profit = gross;
        const pfCls = profit >= 0 ? 'text-green-600' : 'text-red-600';
        const pfVal = profit ? money(profit) : '<span class="text-slate-300">—</span>';
-        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm">${st}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center align-middle text-sm">${pf.sign_month || '—'}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td></tr>`;
+        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="planOpenPfEditModal(${pf.id})"><td class="p-2 text-center align-middle text-sm">${esc(pf.client_name || "")}</td><td class="p-2 text-sm font-medium text-center align-middle truncate" style="min-width:300px;max-width:300px;width:300px" title="${esc(pf.customer_name)}">${esc(pf.customer_name)}</td><td class="p-2 text-center align-middle text-sm" onclick="event.stopPropagation()">${planInlineSelect('weight', pf.id, 'weight', pf.weight || '20%', ['20%','40%','60%','80%','100%'])}</td><td class="p-2 text-center align-middle text-sm" onclick="event.stopPropagation()">${planInlineSelect('ptype', pf.id, 'project_type', pf.project_type || '待签约', ['待签约','已签约'])}</td><td class="p-2 text-center align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="p-2 text-center align-middle text-sm">${pf.sign_month || '—'}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center font-semibold align-middle ${pfCls}">${pfVal}</td></tr>`;
      };

      if (state.planView === 'monthly') {
-        const allPfs = pfs.filter(x => x.status === state.planFilter);
+        const allPfs = pfs;
        const now = new Date();
        const defaultMonth = now.getFullYear() + "-" + String(now.getMonth() + 1).padStart(2, "0");
        if (!state.planMonth) state.planMonth = defaultMonth;
@@ -374,8 +379,7 @@ function renderPlan() {
          dataItems.push({
            pf: pf,
            customer_name: pf.customer_name || '',
-            status: pf.status || '',
-            sign_amount: pf.sign_amount || 0,
+                        sign_amount: pf.sign_amount || 0,
            sign_month: pf.sign_month || '',
            rev: rev, gross: gross, cost: cost,
            profit: gross, payment: payment, paid: paid,
@@ -395,12 +399,12 @@ function renderPlan() {
          rows.push(isUnsigned ? tdRowUnsigned(d.pf, d.cost, d.gross) : tdRow(d.pf, d.rev, d.payment, d.cost, d.paid, d.gross));
        });
        const signTotal = Math.round(allPfs.filter(x => (x.sign_month || "").substring(0, 7) === selMonth).reduce((a, p) => a + (p.sign_amount || 0), 0));
-        const signCnt = allPfs.filter(x => x.status === "已签约" && (x.sign_month || "").substring(0, 7) === selMonth).length;
+        const signCnt = allPfs.filter(x => (x.sign_month || "").substring(0, 7) === selMonth).length;
        return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '该月份暂无数据');
      }

      if (state.planView === 'quarterly') {
-        const allPfs = pfs.filter(x => x.status === state.planFilter);
+        const allPfs = pfs;
        const qRanges = [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10, 11, 12]];
        const now = new Date();
        if (state.planQuarter === undefined) {
@@ -430,8 +434,7 @@ function renderPlan() {
          dataItems.push({
            pf: pf,
            customer_name: pf.customer_name || '',
-            status: pf.status || '',
-            sign_amount: pf.sign_amount || 0,
+                        sign_amount: pf.sign_amount || 0,
            sign_month: pf.sign_month || '',
            rev: rev, gross: gross, cost: cost,
            profit: gross, payment: payment, paid: paid,
@@ -451,7 +454,7 @@ function renderPlan() {
          rows.push(isUnsigned ? tdRowUnsigned(d.pf, d.cost, d.gross) : tdRow(d.pf, d.rev, d.payment, d.cost, d.paid, d.gross));
        });
        const signTotal = Math.round(allPfs.filter(x => { const m = parseInt((x.sign_month || "0").substring(5)) || 0; return qRange.includes(m); }).reduce((a, p) => a + (p.sign_amount || 0), 0));
-        const signCnt = allPfs.filter(x => x.status === "已签约" && qRange.includes(parseInt((x.sign_month || "0").substring(5)) || 0)).length;
+        const signCnt = allPfs.filter(x => qRange.includes(parseInt((x.sign_month || "0").substring(5)) || 0)).length;
        return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '该季度暂无数据');
      }

@@ -465,15 +468,14 @@ function renderPlan() {
        expense.forEach(e => { cost += parseFloat(e.cost || 0) || 0; paid += parseFloat(e.paid || 0) || 0; });
        return { rev: Math.round(rev), payment: Math.round(payment), cost: Math.round(cost), paid: Math.round(paid), gross: Math.round(gross) };
      };
-      const allPfs = pfs.filter(x => x.status === state.planFilter);
+      const allPfs = pfs;
      var dataItems = allPfs.map(pf => {
        var t = calcTotals(pf);
        var cashflow = t.payment - t.paid;
        return {
          pf: pf,
          customer_name: pf.customer_name || '',
-          status: pf.status || '',
-          sign_amount: pf.sign_amount || 0,
+                    sign_amount: pf.sign_amount || 0,
          rev: t.rev, gross: t.gross, cost: t.cost,
          profit: t.gross, payment: t.payment, paid: t.paid,
          cashflow: cashflow,
@@ -493,7 +495,7 @@ function renderPlan() {
        rows.push(isUnsigned ? tdRowUnsigned(d.pf, d.cost, d.gross) : tdRow(d.pf, d.rev, d.payment, d.cost, d.paid, d.gross));
      });
      const signTotal = Math.round(allPfs.reduce((a, p) => a + (p.sign_amount || 0), 0));
-      const signCnt = allPfs.filter(x => x.status === "已签约").length;
+      const signCnt = allPfs.length;
      return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '暂无数据');
    })()}
  </div>`;
@@ -508,46 +510,46 @@ window.openPlanModal = () => {
  if (dept) dept.value = state.tenant;
  const pfIdInput = form.querySelector('[name="pf_id"]');
  if (!pfIdInput || !pfIdInput.value) {
-    initRevpayTable(null);
-    initCostTable(null);
-    initTaskTable(null);
+    planInitRevpayTable(null);
+    planInitCostTable(null);
+    planInitTaskTable(null);
    document.querySelector("#planDeleteBtn").classList.add("hidden");
  }
  modal.classList.remove("hidden");
 };

-window.addRevpayRow = (month = '', rev = '', gross = '', payment = '', rev_note = '') => {
-  const tbody = document.querySelector("#revpayTbody");
+window.planAddRevpayRow = (month = '', rev = '', gross = '', payment = '', rev_note = '') => {
+  const tbody = document.querySelector("#plan_revpayTbody");
  if (!tbody) return;
  const row = document.createElement("tr");
-  row.innerHTML = `<td><select name="budget_month[]" class="form-ctrl form-ctrl-sm w-full" style="min-width:140px" onchange="updateRevpaySummary()">${monthOptions(month)}</select></td>
-    <td><input name="budget_rev[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${rev}" oninput="updateRevpaySummary()"></td>
-    <td><input name="budget_gross[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${gross}" oninput="updateRevpaySummary()"></td>
-    <td><input name="budget_payment[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${payment}" oninput="updateRevpaySummary()"></td>
+  row.innerHTML = `<td><select name="budget_month[]" class="form-ctrl form-ctrl-sm w-full" style="min-width:140px" onchange="planUpdateRevpaySummary()">${monthOptions(month)}</select></td>
+    <td><input name="budget_rev[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${rev}" oninput="planUpdateRevpaySummary()"></td>
+    <td><input name="budget_gross[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${gross}" oninput="planUpdateRevpaySummary()"></td>
+    <td><input name="budget_payment[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${payment}" oninput="planUpdateRevpaySummary()"></td>
    <td><input name="budget_rev_note[]" class="form-ctrl form-ctrl-sm w-full" placeholder="备注" value="${rev_note}"></td>
-    <td><button type="button" class="btn btn-ghost btn-sm text-red-500 p-0 w-6 h-6" onclick="this.closest('tr').remove();updateRevpaySummary()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
+    <td><button type="button" class="btn btn-ghost btn-sm text-red-500 p-0 w-6 h-6" onclick="this.closest('tr').remove();planUpdateRevpaySummary()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
  tbody.appendChild(row);
  if (window.lucide) window.lucide.createIcons();
 };

-window.addCostRow = (month = '', expense_type = '', cost = '', paid = '', exp_note = '') => {
-  const tbody = document.querySelector("#costTbody");
+window.planAddCostRow = (month = '', expense_type = '', cost = '', paid = '', exp_note = '') => {
+  const tbody = document.querySelector("#plan_costTbody");
  if (!tbody) return;
  const row = document.createElement("tr");
-  row.innerHTML = `<td><select name="expense_month[]" class="form-ctrl form-ctrl-sm w-full" style="min-width:140px" onchange="updateCostSummary()">${monthOptions(month)}</select></td>
+  row.innerHTML = `<td><select name="expense_month[]" class="form-ctrl form-ctrl-sm w-full" style="min-width:140px" onchange="planUpdateCostSummary()">${monthOptions(month)}</select></td>
    <td><input name="expense_type[]" class="form-ctrl form-ctrl-sm w-full" placeholder="费用类型" value="${expense_type}"></td>
-    <td><input name="expense_cost[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${cost}" oninput="updateCostSummary()"></td>
-    <td><input name="expense_paid[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${paid}" oninput="updateCostSummary()"></td>
+    <td><input name="expense_cost[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${cost}" oninput="planUpdateCostSummary()"></td>
+    <td><input name="expense_paid[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${paid}" oninput="planUpdateCostSummary()"></td>
    <td><input name="expense_note[]" class="form-ctrl form-ctrl-sm w-full" placeholder="备注" value="${exp_note}"></td>
-    <td><button type="button" class="btn btn-ghost btn-sm text-red-500 p-0 w-6 h-6" onclick="this.closest('tr').remove();updateCostSummary()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
+    <td><button type="button" class="btn btn-ghost btn-sm text-red-500 p-0 w-6 h-6" onclick="this.closest('tr').remove();planUpdateCostSummary()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
  tbody.appendChild(row);
  if (window.lucide) window.lucide.createIcons();
 };

-window.updateRevpaySummary = () => {
-  const revEl = document.querySelector("#revpayTotalRev");
-  const grossEl = document.querySelector("#revpayTotalGross");
-  const paymentEl = document.querySelector("#revpayTotalPayment");
+window.planUpdateRevpaySummary = () => {
+  const revEl = document.querySelector("#plan_revpayTotalRev");
+  const grossEl = document.querySelector("#plan_revpayTotalGross");
+  const paymentEl = document.querySelector("#plan_revpayTotalPayment");
  if (!revEl || !paymentEl) return;
  const revInputs = document.querySelectorAll('[name="budget_rev[]"]');
  const grossInputs = document.querySelectorAll('[name="budget_gross[]"]');
@@ -561,9 +563,9 @@ window.updateRevpaySummary = () => {
  paymentEl.textContent = money(totalPayment);
 };

-window.updateCostSummary = () => {
-  const costEl = document.querySelector("#costTotalCost");
-  const paidEl = document.querySelector("#costTotalPaid");
+window.planUpdateCostSummary = () => {
+  const costEl = document.querySelector("#plan_costTotalCost");
+  const paidEl = document.querySelector("#plan_costTotalPaid");
  if (!costEl || !paidEl) return;
  const costInputs = document.querySelectorAll('[name="expense_cost[]"]');
  const paidInputs = document.querySelectorAll('[name="expense_paid[]"]');
@@ -574,27 +576,27 @@ window.updateCostSummary = () => {
  paidEl.textContent = money(totalPaid);
 };

-window.initRevpayTable = (budgetData) => {
-  const tbody = document.querySelector("#revpayTbody");
+window.planInitRevpayTable = (budgetData) => {
+  const tbody = document.querySelector("#plan_revpayTbody");
  if (!tbody) return;
  tbody.innerHTML = "";
  const rows = budgetData || [];
-  rows.forEach(r => addRevpayRow(r.month || '', r.rev || '', r.gross || '', r.payment || '', r.rev_note || ''));
-  setTimeout(() => updateRevpaySummary(), 50);
+  rows.forEach(r => planAddRevpayRow(r.month || '', r.rev || '', r.gross || '', r.payment || '', r.rev_note || ''));
+  setTimeout(() => planUpdateRevpaySummary(), 50);
 };

-window.initCostTable = (expenseData) => {
-  const tbody = document.querySelector("#costTbody");
+window.planInitCostTable = (expenseData) => {
+  const tbody = document.querySelector("#plan_costTbody");
  if (!tbody) return;
  tbody.innerHTML = "";
  const rows = expenseData || [];
-  rows.forEach(r => addCostRow(r.month || '', r.expense_type || '', r.cost || '', r.paid || '', r.exp_note || ''));
-  setTimeout(() => updateCostSummary(), 50);
+  rows.forEach(r => planAddCostRow(r.month || '', r.expense_type || '', r.cost || '', r.paid || '', r.exp_note || ''));
+  setTimeout(() => planUpdateCostSummary(), 50);
 };

 // ---------- 任务管理 tab ----------

-function taskMonthOptions(selected) {
+function planTaskMonthOptions(selected) {
  const now = new Date();
  const opts = [];
  for (let i = -2; i <= 12; i++) {
@@ -605,36 +607,36 @@ function taskMonthOptions(selected) {
  return opts.join("");
 }

-window.addTaskRow = (taskMonth = '', taskType = '', taskCount = '', executedCount = '', unitPrice = '') => {
-  const tbody = document.querySelector("#taskTbody");
+window.planAddTaskRow = (taskMonth = '', taskType = '', taskCount = '', executedCount = '', unitPrice = '') => {
+  const tbody = document.querySelector("#plan_taskTbody");
  if (!tbody) return;
  const row = document.createElement("tr");
  const defaultMonth = (() => { const n = new Date(); return n.getFullYear() + "-" + String(n.getMonth()+1).padStart(2,"0"); })();
  const isPreset = TASK_TYPES.includes(taskType);
  const typeCell = isPreset || !taskType
-    ? `<select name="task_type[]" class="form-ctrl form-ctrl-sm w-full" onchange="onTaskTypeChange(this)"><option value="">选择</option>${TASK_TYPES.map(t => `<option ${t === taskType ? 'selected' : ''}>${t}</option>`).join("")}<option value="__custom__" ${!isPreset && taskType ? 'selected' : ''}>自定义...</option></select>`
-    : `<input name="task_type[]" class="form-ctrl form-ctrl-sm w-full" value="${esc(taskType)}" placeholder="输入自定义类型"><button type="button" class="btn btn-ghost btn-sm text-slate-400 p-0 w-5 h-5 ml-1" onclick="revertTaskType(this)" title="返回选择"><i data-lucide="rotate-ccw" style="width:12px;height:12px"></i></button>`;
-  row.innerHTML = `<td><select name="task_month[]" class="form-ctrl form-ctrl-sm w-full">${taskMonthOptions(taskMonth || defaultMonth)}</select></td>
+    ? `<select name="task_type[]" class="form-ctrl form-ctrl-sm w-full" onchange="planOnTaskTypeChange(this)"><option value="">选择</option>${TASK_TYPES.map(t => `<option ${t === taskType ? 'selected' : ''}>${t}</option>`).join("")}<option value="__custom__" ${!isPreset && taskType ? 'selected' : ''}>自定义...</option></select>`
+    : `<input name="task_type[]" class="form-ctrl form-ctrl-sm w-full" value="${esc(taskType)}" placeholder="输入自定义类型"><button type="button" class="btn btn-ghost btn-sm text-slate-400 p-0 w-5 h-5 ml-1" onclick="planRevertTaskType(this)" title="返回选择"><i data-lucide="rotate-ccw" style="width:12px;height:12px"></i></button>`;
+  row.innerHTML = `<td><select name="task_month[]" class="form-ctrl form-ctrl-sm w-full">${planTaskMonthOptions(taskMonth || defaultMonth)}</select></td>
    <td class="flex items-center">${typeCell}</td>
-    <td><input name="task_count[]" type="number" step="1" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:100px" placeholder="0" value="${taskCount}" oninput="updateTaskDiff(this)"></td>
-    <td><input name="task_executed[]" type="number" step="1" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:100px" placeholder="0" value="${executedCount}" oninput="updateTaskDiff(this)"></td>
+    <td><input name="task_count[]" type="number" step="1" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:100px" placeholder="0" value="${taskCount}" oninput="planUpdateTaskDiff(this)"></td>
+    <td><input name="task_executed[]" type="number" step="1" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:100px" placeholder="0" value="${executedCount}" oninput="planUpdateTaskDiff(this)"></td>
    <td><input name="task_diff[]" type="number" class="form-ctrl form-ctrl-sm text-right" style="width:80px" placeholder="—" disabled></td>
-    <td><input name="task_unit_price[]" type="number" step="0.01" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:90px" placeholder="0" value="${unitPrice}" oninput="updateTaskDiff(this)"></td>
+    <td><input name="task_unit_price[]" type="number" step="0.01" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:90px" placeholder="0" value="${unitPrice}" oninput="planUpdateTaskDiff(this)"></td>
    <td><input name="task_exec_amount[]" type="number" class="form-ctrl form-ctrl-sm text-right" style="width:140px" placeholder="—" disabled></td>
    <td><input name="task_unexec_amount[]" type="number" class="form-ctrl form-ctrl-sm text-right" style="width:140px" placeholder="—" disabled></td>
    <td><button type="button" class="btn btn-ghost btn-sm text-red-500 p-0 w-6 h-6" onclick="this.closest('tr').remove()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
  tbody.appendChild(row);
  if (window.lucide) window.lucide.createIcons();
-  updateRowCalc(row);
+  planUpdateRowCalc(row);
 };

-window.updateTaskDiff = (el) => {
+window.planUpdateTaskDiff = (el) => {
  const row = el.closest('tr');
  if (!row) return;
-  updateRowCalc(row);
+  planUpdateRowCalc(row);
 };

-function updateRowCalc(row) {
+function planUpdateRowCalc(row) {
  const countInput = row.querySelector('[name="task_count[]"]');
  const execInput = row.querySelector('[name="task_executed[]"]');
  const priceInput = row.querySelector('[name="task_unit_price[]"]');
@@ -655,7 +657,7 @@ function updateRowCalc(row) {
  unexecAmtInput.value = unexecAmt ? unexecAmt.toFixed(2) : '';
 }

-window.toggleBtChip = (chip) => {
+window.planToggleBtChip = (chip) => {
  const cb = chip.querySelector('input');
  cb.checked = !cb.checked;
  chip.classList.toggle('bg-blue-50', cb.checked);
@@ -663,35 +665,35 @@ window.toggleBtChip = (chip) => {
  chip.classList.toggle('text-blue-600', cb.checked);
 };

-window.initTaskTable = (taskData) => {
-  const tbody = document.querySelector("#taskTbody");
+window.planInitTaskTable = (taskData) => {
+  const tbody = document.querySelector("#plan_taskTbody");
  if (!tbody) return;
  tbody.innerHTML = "";
  const rows = taskData || [];
-  rows.forEach(r => addTaskRow(r.task_month || '', r.task_type || '', r.task_count || '', r.task_executed || '', r.unit_price || ''));
+  rows.forEach(r => planAddTaskRow(r.task_month || '', r.task_type || '', r.task_count || '', r.task_executed || '', r.unit_price || ''));
 };

-window.onTaskTypeChange = (sel) => {
+window.planOnTaskTypeChange = (sel) => {
  if (sel.value !== '__custom__') return;
  const td = sel.parentElement;
  const oldVal = sel.value;
-  td.innerHTML = `<input name="task_type[]" class="form-ctrl form-ctrl-sm w-full" placeholder="输入自定义类型" autofocus><button type="button" class="btn btn-ghost btn-sm text-slate-400 p-0 w-5 h-5 ml-1" onclick="revertTaskType(this)" title="返回选择"><i data-lucide="rotate-ccw" style="width:12px;height:12px"></i></button>`;
+  td.innerHTML = `<input name="task_type[]" class="form-ctrl form-ctrl-sm w-full" placeholder="输入自定义类型" autofocus><button type="button" class="btn btn-ghost btn-sm text-slate-400 p-0 w-5 h-5 ml-1" onclick="planRevertTaskType(this)" title="返回选择"><i data-lucide="rotate-ccw" style="width:12px;height:12px"></i></button>`;
  if (window.lucide) window.lucide.createIcons();
  td.querySelector('input').focus();
 };

-window.revertTaskType = (btn) => {
+window.planRevertTaskType = (btn) => {
  const td = btn.parentElement;
-  td.innerHTML = `<select name="task_type[]" class="form-ctrl form-ctrl-sm w-full" onchange="onTaskTypeChange(this)"><option value="">选择</option>${TASK_TYPES.map(t => `<option>${t}</option>`).join("")}<option value="__custom__">自定义...</option></select>`;
+  td.innerHTML = `<select name="task_type[]" class="form-ctrl form-ctrl-sm w-full" onchange="planOnTaskTypeChange(this)"><option value="">选择</option>${TASK_TYPES.map(t => `<option>${t}</option>`).join("")}<option value="__custom__">自定义...</option></select>`;
  if (window.lucide) window.lucide.createIcons();
 };

 window.closePlanModal = () => {
  const modal = document.querySelector("#planModal");
-  modal.classList.add("hidden");
+  if (modal) modal.classList.add("hidden");
 };

-window.editPfSignMonth = (event, pfId) => {
+window.planEditSignMonth = (event, pfId) => {
  event.stopPropagation();
  const pf = (state.data.planFinances || []).find(x => x.id === pfId);
  if (!pf) return;
@@ -707,11 +709,11 @@ window.editPfSignMonth = (event, pfId) => {
    try {
      await api(`/api/planFinances/${pfId}`, { method: "PUT", body: JSON.stringify({ data: { sign_month: newValue } }) });
      pf.sign_month = newValue;
-      td.innerHTML = `<span class="pf-sm-text cursor-pointer hover:text-blue-600" onclick="editPfSignMonth(event, ${pfId})">${newValue || '—'}</span>`;
+      td.innerHTML = `<span class="pf-sm-text cursor-pointer hover:text-blue-600" onclick="planEditSignMonth(event, ${pfId})">${newValue || '—'}</span>`;
    } catch (e) { toast("修改失败：" + e.message, "error"); }
  });
  select.addEventListener("blur", () => {
-    td.innerHTML = `<span class="pf-sm-text cursor-pointer hover:text-blue-600" onclick="editPfSignMonth(event, ${pfId})">${currentValue || '—'}</span>`;
+    td.innerHTML = `<span class="pf-sm-text cursor-pointer hover:text-blue-600" onclick="planEditSignMonth(event, ${pfId})">${currentValue || '—'}</span>`;
  });
  td.innerHTML = "";
  td.appendChild(select);
@@ -720,25 +722,25 @@ window.editPfSignMonth = (event, pfId) => {

 window.switchPlanTab = (tab) => {
  document.querySelectorAll(".plan-tab").forEach(b => b.classList.toggle("active", b.dataset.tab === tab));
-  document.querySelector("#financeTabInfo").classList.toggle("hidden", tab !== "info");
-  document.querySelector("#financeTabRevpay").classList.toggle("hidden", tab !== "revpay");
-  document.querySelector("#financeTabCost").classList.toggle("hidden", tab !== "cost");
-  document.querySelector("#financeTabExec").classList.toggle("hidden", tab !== "exec");
-  document.querySelector("#financeTabTasks").classList.toggle("hidden", tab !== "tasks");
-  document.querySelector("#financeTabActivity").classList.toggle("hidden", tab !== "activity");
+  document.querySelector("#plan_financeTabInfo").classList.toggle("hidden", tab !== "info");
+  document.querySelector("#plan_financeTabRevpay").classList.toggle("hidden", tab !== "revpay");
+  document.querySelector("#plan_financeTabCost").classList.toggle("hidden", tab !== "cost");
+  document.querySelector("#plan_financeTabExec").classList.toggle("hidden", tab !== "exec");
+  document.querySelector("#plan_financeTabTasks").classList.toggle("hidden", tab !== "tasks");
+  document.querySelector("#plan_financeTabActivity").classList.toggle("hidden", tab !== "activity");
  document.querySelector(".plan-form-actions").classList.toggle("hidden", tab === "activity");
-  if (tab === "activity") initFinSquire();
+  if (tab === "activity") planInitSquire();
 };

 // ---------- 活动与跟进 ----------

-async function loadFinFollowups(pfId) {
-  const list = document.querySelector("#finActivityList");
+async function planLoadFollowups(pfId) {
+  const list = document.querySelector("#plan_finActivityList");
  if (!list || !pfId) return;
  try {
    const fups = await api(`/api/followups/project_finance/${pfId}`);
    list.innerHTML = fups.length
-      ? fups.map(f => `<div class="activity-item"><div class="activity-icon"><i data-lucide="message-square"></i></div><div class="min-w-0 flex-1"><div class="flex justify-between gap-3 text-[12px] text-slate-500"><span>${esc(f.follower)} · ${esc(f.follow_up_method)}</span><span>${esc(f.followed_at)}</span></div><div class="mt-1 leading-5 text-slate-800 rich-content" data-html="${encodeURIComponent(f.content || '')}"></div>${f.next_action ? `<p class="mt-1 leading-5 text-blue-700">下一步：${text(f.next_action)}</p>` : ""}</div><button class="activity-delete" type="button" onclick="deleteFinFollowup(event, ${f.id})" title="删除评论"><i data-lucide="trash-2"></i></button></div>`).join("")
+      ? fups.map(f => `<div class="activity-item"><div class="activity-icon"><i data-lucide="message-square"></i></div><div class="min-w-0 flex-1"><div class="flex justify-between gap-3 text-[12px] text-slate-500"><span>${esc(f.follower)} · ${esc(f.follow_up_method)}</span><span>${esc(f.followed_at)}</span></div><div class="mt-1 leading-5 text-slate-800 rich-content" data-html="${encodeURIComponent(f.content || '')}"></div>${f.next_action ? `<p class="mt-1 leading-5 text-blue-700">下一步：${text(f.next_action)}</p>` : ""}</div><button class="activity-delete" type="button" onclick="planDeleteFollowup(event, ${f.id})" title="删除评论"><i data-lucide="trash-2"></i></button></div>`).join("")
      : '<p class="text-sm text-slate-400 py-4 text-center">暂无跟进记录</p>';
    if (window.lucide) window.lucide.createIcons();
    list.querySelectorAll(".rich-content").forEach(el => {
@@ -748,8 +750,8 @@ async function loadFinFollowups(pfId) {
  } catch (e) { /* ignore */ }
 }

-function initFinSquire() {
-  const ed = document.querySelector("#squire_finance");
+function planInitSquire() {
+  const ed = document.querySelector("#plan_squire_finance");
  if (!ed || !window.Squire) return;
  if (window.squireInstances["squire_finance"]) { window.squireInstances["squire_finance"].destroy(); }
  const sq = new Squire(ed, { blockTag: "P" });
@@ -758,8 +760,8 @@ function initFinSquire() {
  ed.addEventListener("blur", () => { if (!ed.textContent.trim()) ed.classList.remove("focused"); });
 }

-window.submitFinComment = async () => {
-  const pfId = document.querySelector("#pf-id-input").value;
+window.planSubmitComment = async () => {
+  const pfId = document.querySelector("#plan_pf-id-input").value;
  if (!pfId) return;
  const sq = window.squireInstances["squire_finance"];
  const content = sq ? sq.getHTML().trim() : "";
@@ -771,24 +773,24 @@ window.submitFinComment = async () => {
  sq.setHTML("");
  btn.disabled = false;
  btn.textContent = "评论";
-  await loadFinFollowups(pfId);
+  await planLoadFollowups(pfId);
 };

-window.deleteFinFollowup = async (event, followupId) => {
+window.planDeleteFollowup = async (event, followupId) => {
  event.stopPropagation();
  if (!confirm("确认删除这条评论？")) return;
  await api(`/api/followups/${followupId}`, { method: "DELETE" });
-  const pfId = document.querySelector("#pf-id-input").value;
-  if (pfId) await loadFinFollowups(pfId);
+  const pfId = document.querySelector("#plan_pf-id-input").value;
+  if (pfId) await planLoadFollowups(pfId);
 };

-window.openPfEditModal = (pfId) => {
+window.planOpenPfEditModal = (pfId) => {
  const pf = (state.data.planFinances || []).find(x => x.id === pfId);
  if (!pf) return;
-  document.querySelector("#pf-id-input").value = pf.id;
-  document.querySelector("#financeModalTitle").textContent = "编辑项目财务";
+  document.querySelector("#plan_pf-id-input").value = pf.id;
+  document.querySelector("#planModalTitle").textContent = "编辑项目财务";
  document.querySelector("#planDeleteBtn").classList.remove("hidden");
-  const form = document.querySelector("#financeModal form");
+  const form = document.querySelector("#planModal form");
  form.querySelector('[name="project_id"]').value = pf.project_id || "";
  const deptDisplay = form.querySelector('.bg-slate-50 [disabled]');
  if (deptDisplay) deptDisplay.value = pf.project_id || "";
@@ -813,7 +815,6 @@ window.openPfEditModal = (pfId) => {
    signMonthEl.innerHTML = monthOptions(signMonthValue);
    signMonthEl.value = signMonthValue;
  }
-  form.querySelector('[name="status"]').value = pf.status || "待签约";
  form.querySelector('[name="sales_person"]').value = pf.sales_person || "";
  form.querySelector('[name="owner"]').value = pf.owner || "";
  setVal("start_date", pf.start_date);
@@ -825,17 +826,20 @@ window.openPfEditModal = (pfId) => {
  setVal("contact_name", pf.contact_name);
  setVal("contact_phone", pf.contact_phone);
  setVal("other_info", pf.other_info);
+  setVal("client_name", pf.client_name);
+  form.querySelector('[name="project_type"]').value = pf.project_type || "待签约";
+  form.querySelector('[name="weight"]').value = pf.weight || "20%";
  let budgetData = [];
  try { budgetData = JSON.parse(pf.budget_data || "[]"); } catch (e) { budgetData = []; }
-  initRevpayTable(budgetData.length ? budgetData : null);
+  planInitRevpayTable(budgetData.length ? budgetData : null);
  let expenseData = [];
  try { expenseData = JSON.parse(pf.expense_data || "[]"); } catch (e) { expenseData = []; }
-  initCostTable(expenseData.length ? expenseData : null);
+  planInitCostTable(expenseData.length ? expenseData : null);
  let taskData = [];
  try { taskData = JSON.parse(pf.task_data || "[]"); } catch (e) { taskData = []; }
-  initTaskTable(taskData.length ? taskData : null);
+  planInitTaskTable(taskData.length ? taskData : null);
  setTimeout(() => updateBudgetSummary(), 100);
-  loadFinFollowups(pf.id);
+  planLoadFollowups(pf.id);
  openPlanModal();
 };

@@ -936,8 +940,8 @@ window.createPlanFinance = async (event) => {
      if (result.id && data.customer_name) logActivity("finance", result.id, "创建了「" + data.customer_name + "」的财务项目");
    }
    form.reset();
-    document.querySelector("#pf-id-input").value = "";
-    document.querySelector("#financeModalTitle").textContent = "新增项目财务";
+    document.querySelector("#plan_pf-id-input").value = "";
+    document.querySelector("#planModalTitle").textContent = "新增项目财务";
    closePlanModal();
    await load();
  } catch (error) {
@@ -946,7 +950,7 @@ window.createPlanFinance = async (event) => {
 };

 window.deletePlanItem = async () => {
-  const pfId = document.querySelector("#pf-id-input").value;
+  const pfId = document.querySelector("#plan_pf-id-input").value;
  if (!pfId) return;
  const pf = (state.data.planFinances || []).find(x => x.id === parseInt(pfId));
  const name = pf ? (pf.customer_name || "此项目") : "此项目";
@@ -961,51 +965,79 @@ window.deletePlanItem = async () => {
  }
 }

+
+// 从 planFinances 计算月度数据
+function computePlanMonthly(planFinances) {
+  var pfs = planFinances || [];
+  var months = [];
+  var year = new Date().getFullYear();
+  for (var mi = 1; mi <= 12; mi++) { months.push(year + '-' + String(mi).padStart(2, '0')); }
+  var data = [];
+  for (var i = 0; i < 12; i++) {
+    var month = months[i];
+    var sign = 0, revenue = 0, gross = 0, payment = 0, cost = 0, paid = 0;
+    for (var j = 0; j < pfs.length; j++) {
+      var pf = pfs[j];
+      if ((pf.sign_month || '') === month) sign += parseFloat(pf.sign_amount || 0);
+      var bd = []; try { bd = JSON.parse(pf.budget_data || '[]'); } catch(e) {}
+      var b = bd.find(function(x) { return (x.month || '') === month; });
+      if (b) { revenue += parseFloat(b.rev || 0); gross += parseFloat(b.gross || 0); payment += parseFloat(b.payment || 0); }
+      var ed = []; try { ed = JSON.parse(pf.expense_data || '[]'); } catch(e) {}
+      var e = ed.find(function(x) { return (x.month || '') === month; });
+      if (e) { cost += parseFloat(e.cost || 0); paid += parseFloat(e.paid || 0); }
+    }
+    data.push({ month: month, sign: Math.round(sign), revenue: Math.round(revenue), gross: Math.round(gross), payment: Math.round(payment), cost: Math.round(cost), paid: Math.round(paid) });
+  }
+  return data;
+}
 // 总览渲染
 function renderPlanOverview() {
-  const { summary, financeMonthly } = state.data;
-  if (!summary) return;
-  const m = summary.metrics;
-  const moneyIntL = (v) => `${Math.round(Number(v || 0)).toLocaleString("zh-CN")} 元`;
+  const planFinances = state.data.planFinances || [];
+  const fm = computePlanMonthly(planFinances);
+  const moneyIntL = (v) => Math.round(Number(v || 0)).toLocaleString("zh-CN");
  const moneyWan = (v) => {
    const n = Number(v || 0);
    return n >= 10000 ? (n / 10000).toFixed(0) + "万" : n.toLocaleString("zh-CN");
  };
  const card = (body, cls) => '<div class="card ' + (cls || 'p-4') + '">' + body + '</div>';

-  const rows1 = [["年度累计", moneyIntL(m.signed_annual || m.signed_amount)], ["本季度累计", moneyIntL(m.signed_q2 || 0)], ["本月累计", moneyIntL(m.signed_month || 0)], ["上本季度累计", moneyIntL(m.signed_prev_q || 0)], ["上月累计", moneyIntL(m.signed_prev_month || 0)]];
-  const rows2 = [["年度累计", moneyIntL(m.revenue_annual || 0)], ["本季度累计", moneyIntL(m.revenue_q2 || 0)], ["本月累计", moneyIntL(m.monthly_revenue || 0)], ["上本季度累计", moneyIntL(m.revenue_prev_q || 0)], ["上月累计", moneyIntL(m.revenue_prev_month || 0)]];
-  const rows3 = [["年度累计", moneyIntL(m.gross_annual || 0)], ["本季度累计", moneyIntL(m.gross_q2 || 0)], ["本月累计", moneyIntL(m.monthly_net_profit || 0)], ["上本季度累计", moneyIntL(m.gross_prev_q || 0)], ["上月累计", moneyIntL(m.gross_prev_month || 0)]];
-  const rows4 = [["年度累计", moneyIntL(m.cost_annual || 0)], ["本季度累计", moneyIntL(m.cost_q2 || 0)], ["本月累计", moneyIntL(m.cost_month || 0)], ["上本季度累计", moneyIntL(m.cost_prev_q || 0)], ["上月累计", moneyIntL(m.cost_prev_month || 0)]];
-  const rows5 = [["年度累计", moneyIntL(m.profit_annual || 0)], ["本季度累计", moneyIntL(m.profit_q2 || 0)], ["本月累计", moneyIntL(m.profit_month || 0)], ["上本季度累计", moneyIntL(m.profit_prev_q || 0)], ["上月累计", moneyIntL(m.profit_prev_month || 0)]];
-  const rows7 = [["年度累计", moneyIntL(m.payment_annual || 0)], ["本季度累计", moneyIntL(m.payment_q2 || 0)], ["本月累计", moneyIntL(m.payment_month || 0)], ["上本季度累计", moneyIntL(m.payment_prev_q || 0)], ["上月累计", moneyIntL(m.payment_prev_month || 0)]];
-  const rows8 = [["年度累计", moneyIntL(m.paid_annual || 0)], ["本季度累计", moneyIntL(m.paid_q2 || 0)], ["本月累计", moneyIntL(m.paid_month || 0)], ["上本季度累计", moneyIntL(m.paid_prev_q || 0)], ["上月累计", moneyIntL(m.paid_prev_month || 0)]];
-  const rows9 = [["年度累计", moneyIntL(m.cashflow_annual || 0)], ["本季度累计", moneyIntL(m.cashflow_q2 || 0)], ["本月累计", moneyIntL(m.cashflow_month || 0)], ["上本季度累计", moneyIntL(m.cashflow_prev_q || 0)], ["上月累计", moneyIntL(m.cashflow_prev_month || 0)]];
-
-  const qoq = (cur, prev) => { if (!prev) return '<span class="text-slate-300">—</span>'; const pct = Math.round((cur - prev) / prev * 100); const cls = pct >= 0 ? 'text-green-600' : 'text-red-600'; const sign = pct >= 0 ? '+' : ''; return '<span class="' + cls + '">' + sign + pct + '%</span>'; };
+  // 从 planFinances 计算年度累计
+  var annualSums = { sign: 0, revenue: 0, gross: 0, cost: 0, payment: 0, paid: 0 };
+  for (var i = 0; i < fm.length; i++) {
+    annualSums.sign += fm[i].sign; annualSums.revenue += fm[i].revenue;
+    annualSums.gross += fm[i].gross; annualSums.cost += fm[i].cost;
+    annualSums.payment += fm[i].payment; annualSums.paid += fm[i].paid;
+  }
+  const mLbl = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
  const LABELS = ['合同金额','确收金额','确收毛利','成本','项目利润','回款金额','已付','现金流'];
-  const Q_FIELDS = [m.signed_q2||0, m.revenue_q2, m.gross_q2, m.cost_q2||0, m.profit_q2||0, m.payment_q2||0, m.paid_q2||0, m.cashflow_q2||0];
-  const Q_PREV = [m.signed_prev_q||0, m.revenue_prev_q||0, m.gross_prev_q||0, m.cost_prev_q||0, m.profit_prev_q||0, m.payment_prev_q||0, m.paid_prev_q||0, m.cashflow_prev_q||0];
-  const M_FIELDS = [m.signed_month||0, m.monthly_revenue, m.monthly_net_profit, m.cost_month||0, m.profit_month||0, m.payment_month||0, m.paid_month||0, m.cashflow_month||0];
-  const M_PREV = [m.signed_prev_month||0, m.revenue_prev_month||0, m.gross_prev_month||0, m.cost_prev_month||0, m.profit_prev_month||0, m.payment_prev_month||0, m.paid_prev_month||0, m.cashflow_prev_month||0];
-  const ROWS = [rows1, rows2, rows3, rows4, rows5, rows7, rows8, rows9];
-  const CF_RAW = [m.cashflow_annual||0, m.cashflow_q2||0, m.cashflow_month||0, m.cashflow_prev_q||0, m.cashflow_prev_month||0];
-  const PF_RAW = [m.profit_annual||0, m.profit_q2||0, m.profit_month||0, m.profit_prev_q||0, m.profit_prev_month||0];
-
-  var tdVal = function(ri, col, val) {
-    if (ri === 4) return '<td class="py-2 text-right font-semibold ' + (PF_RAW[col] >= 0 ? 'text-green-600' : 'text-red-600') + '">' + val + '</td>';
-    if (ri === 7) return '<td class="py-2 text-right font-semibold ' + (CF_RAW[col] >= 0 ? 'text-green-600' : 'text-red-600') + '">' + val + '</td>';
-    return '<td class="py-2 text-right font-semibold text-slate-800">' + val + '</td>';
-  };
-  var thead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500">指标</th><th class="py-2 text-right font-semibold text-slate-700">年度累计</th><th class="py-2 text-right font-semibold text-slate-700">上季度累计</th><th class="py-2 text-right font-semibold text-slate-700">上月累计</th><th class="py-2 text-right font-semibold text-slate-700">本季度累计</th><th class="py-2 text-right font-semibold text-slate-400">季环比</th><th class="py-2 text-right font-semibold text-slate-700">本月累计</th><th class="py-2 text-right font-semibold text-slate-400">月环比</th></tr>';
+  // 每行的年度累计 + 12个月值
+  const annualVals = [
+    annualSums.sign, annualSums.revenue, annualSums.gross, annualSums.cost,
+    annualSums.gross - annualSums.cost, annualSums.payment, annualSums.paid,
+    annualSums.payment - annualSums.paid,
+  ];
+  // 字段映射: sign, revenue, gross, cost, profit(=gross-cost), payment, paid, cashflow(=payment-paid)
+  const fmFields = ['sign','revenue','gross','cost',null,'payment','paid',null];
+  var thead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500 whitespace-nowrap">指标</th><th class="py-2 text-right font-semibold text-slate-700 whitespace-nowrap">年度累计</th>';
+  for (var mi = 0; mi < 12; mi++) { thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">' + mLbl[mi] + '</th>'; }
+  thead += '</tr>';
  var tbody = '';
  for (var ri = 0; ri < 8; ri++) {
-    var vals = ROWS[ri];
-    tbody += '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700">' + LABELS[ri] + '</td>' +
-      tdVal(ri, 0, vals[0][1]) + tdVal(ri, 3, vals[3][1]) + tdVal(ri, 4, vals[4][1]) + tdVal(ri, 1, vals[1][1]) +
-      '<td class="py-2 text-right">' + qoq(Q_FIELDS[ri], Q_PREV[ri]) + '</td>' +
-      tdVal(ri, 2, vals[2][1]) +
-      '<td class="py-2 text-right">' + qoq(M_FIELDS[ri], M_PREV[ri]) + '</td></tr>';
+    var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700 whitespace-nowrap">' + LABELS[ri] + '</td>';
+    rowHtml += '<td class="py-2 text-right font-semibold text-slate-800 whitespace-nowrap">' + moneyIntL(annualVals[ri]) + '</td>';
+    for (var mi = 0; mi < 12; mi++) {
+      var val = 0;
+      if (fm[mi]) {
+        if (ri === 4) { val = (fm[mi].gross || 0) - (fm[mi].cost || 0); }
+        else if (ri === 7) { val = (fm[mi].payment || 0) - (fm[mi].paid || 0); }
+        else { var fk = fmFields[ri]; if (fk) val = fm[mi][fk] || 0; }
+      }
+      var cls = 'text-slate-700';
+      if (ri === 4) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
+      if (ri === 7) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
+      rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cls + '">' + moneyIntL(val) + '</td>';
+    }
+    tbody += rowHtml + '</tr>';
  }

  document.querySelector("#planOverview").innerHTML = '<div class="grid gap-5">' +
@@ -1019,35 +1051,120 @@ function renderPlanOverview() {

  if (window.lucide) window.lucide.createIcons();
  // 渲染图表（复用 home.js 的 moneyTick / chartOptions / monthLabels）
-  if (financeMonthly && window.Chart) {
-    renderOverviewCharts(financeMonthly);
+  if (fm && window.Chart) {
+    renderPlanCharts(fm);
  }
 }

+
+function renderPlanQuarterlyOverview() {
+  const planFinances = state.data.planFinances || [];
+  const fm = computePlanMonthly(planFinances);
+  const moneyIntL = (v) => Math.round(Number(v || 0)).toLocaleString("zh-CN");
+  const card = (body, cls) => '<div class="card ' + (cls || 'p-4') + '">' + body + '</div>';
+  const LABELS = ['合同金额','确收金额','确收毛利','成本','项目利润','回款金额','已付','现金流'];
+  const qLbl = ['Q1','Q2','Q3','Q4'];
+  const qRanges = [[0,1,2],[3,4,5],[6,7,8],[9,10,11]];
+  var annualSums2 = { sign: 0, revenue: 0, gross: 0, cost: 0, payment: 0, paid: 0 };
+  for (var i2 = 0; i2 < fm.length; i2++) {
+    annualSums2.sign += fm[i2].sign; annualSums2.revenue += fm[i2].revenue;
+    annualSums2.gross += fm[i2].gross; annualSums2.cost += fm[i2].cost;
+    annualSums2.payment += fm[i2].payment; annualSums2.paid += fm[i2].paid;
+  }
+  const annualVals = [annualSums2.sign, annualSums2.revenue, annualSums2.gross, annualSums2.cost, annualSums2.gross - annualSums2.cost, annualSums2.payment, annualSums2.paid, annualSums2.payment - annualSums2.paid];
+  const fmFields = ['sign','revenue','gross','cost',null,'payment','paid',null];
+
+  // Calculate quarterly sums
+  var qData = [[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0]];
+  for (var qi = 0; qi < 4; qi++) {
+    for (var ri = 0; ri < 8; ri++) {
+      var sum = 0;
+      for (var mi = 0; mi < 3; mi++) {
+        var idx = qRanges[qi][mi];
+        if (fm[idx]) {
+          if (ri === 4) { sum += (fm[idx].gross||0) - (fm[idx].cost||0); }
+          else if (ri === 7) { sum += (fm[idx].payment||0) - (fm[idx].paid||0); }
+          else { var fk = fmFields[ri]; if (fk) sum += fm[idx][fk] || 0; }
+        }
+      }
+      qData[ri][qi] = sum;
+    }
+  }
+
+  var thead = '<tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500 whitespace-nowrap">指标</th><th class="py-2 text-right font-semibold text-slate-700 whitespace-nowrap">年度累计</th>';
+  thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">Q1</th>';
+  thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">Q2</th><th class="py-2 text-right font-semibold text-slate-400 whitespace-nowrap">环比</th>';
+  thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">Q3</th><th class="py-2 text-right font-semibold text-slate-400 whitespace-nowrap">环比</th>';
+  thead += '<th class="py-2 text-right font-semibold text-slate-600 whitespace-nowrap">Q4</th><th class="py-2 text-right font-semibold text-slate-400 whitespace-nowrap">环比</th>';
+  thead += '</tr>';
+
+  var qoq = function(cur, prev) { if (!prev) return '<span class="text-slate-300">—</span>'; var pct = Math.round((cur - prev) / prev * 100); var cls = pct >= 0 ? 'text-green-600' : 'text-red-600'; var sign = pct >= 0 ? '+' : ''; return '<span class="' + cls + '">' + sign + pct + '%</span>'; };
+
+  var tbody = '';
+  for (var ri = 0; ri < 8; ri++) {
+    var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700 whitespace-nowrap">' + LABELS[ri] + '</td>';
+    rowHtml += '<td class="py-2 text-right font-semibold text-slate-800 whitespace-nowrap">' + moneyIntL(annualVals[ri]) + '</td>';
+    for (var qi = 0; qi < 4; qi++) {
+      var val = qData[ri][qi];
+      var cls = 'text-slate-700';
+      if (ri === 4) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
+      if (ri === 7) cls = val >= 0 ? 'text-green-600' : 'text-red-600';
+      rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap ' + cls + '">' + moneyIntL(val) + '</td>';
+      if (qi > 0) {
+        rowHtml += '<td class="py-2 text-right text-sm whitespace-nowrap">' + qoq(val, qData[ri][qi - 1]) + '</td>';
+      }
+    }
+    tbody += rowHtml + '</tr>';
+  }
+
+  document.querySelector("#planQuarterlyOverview").innerHTML = '<div class="grid gap-5">' +
+    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务季度概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
+    '</div>';
+  if (window.lucide) window.lucide.createIcons();
+}
+
 function renderPlanCharts(data) {
  if (typeof monthLabels !== 'function') return;
  const labels = monthLabels(data);
  const baseOpts = typeof chartOptions === 'function' ? chartOptions(moneyTick) : { responsive: true, maintainAspectRatio: false };
  var iconf = { type: "line", options: baseOpts, data: { labels: labels } };

-  var c1 = document.querySelector("#finChartSign");
+  var c1 = document.querySelector("#planChartSign");
  if (c1 && window.Chart) {
    if (state.planChart1) state.planChart1.destroy();
    state.planChart1 = new Chart(c1, Object.assign({}, iconf, { data: { labels: labels, datasets: [{ label: "签约金额", data: data.map(function(x) { return x.sign || 0; }), borderColor: "#6366f1", backgroundColor: "rgba(99,102,241,0.06)", fill: true, tension: 0.3 }] } }));
  }
-  var c2 = document.querySelector("#finChartRev");
+  var c2 = document.querySelector("#planChartRev");
  if (c2 && window.Chart) {
    if (state.planChart2) state.planChart2.destroy();
    state.planChart2 = new Chart(c2, Object.assign({}, iconf, { data: { labels: labels, datasets: [{ label: "确收", data: data.map(function(x) { return x.revenue || 0; }), borderColor: "#2563eb", backgroundColor: "rgba(37,99,235,0.06)", fill: true, tension: 0.3 }, { label: "毛利", data: data.map(function(x) { return x.gross || 0; }), borderColor: "#059669", backgroundColor: "rgba(5,150,105,0.06)", fill: true, tension: 0.3 }] } }));
  }
-  var c3 = document.querySelector("#finChartCash");
+  var c3 = document.querySelector("#planChartCash");
  if (c3 && window.Chart) {
    if (state.planChart3) state.planChart3.destroy();
    state.planChart3 = new Chart(c3, Object.assign({}, iconf, { data: { labels: labels, datasets: [{ label: "回款", data: data.map(function(x) { return x.payment || 0; }), borderColor: "#d97706", backgroundColor: "rgba(217,119,6,0.06)", fill: true, tension: 0.3 }, { label: "已付", data: data.map(function(x) { return x.cost || 0; }), borderColor: "#7c3aed", backgroundColor: "rgba(124,58,237,0.06)", fill: true, tension: 0.3 }] } }));
  }
-  var c4 = document.querySelector("#finChartProfit");
+  var c4 = document.querySelector("#planChartProfit");
  if (c4 && window.Chart) {
    if (state.planChart4) state.planChart4.destroy();
    state.planChart4 = new Chart(c4, Object.assign({}, iconf, { data: { labels: labels, datasets: [{ label: "利润", data: data.map(function(x) { return x.gross || 0; }), borderColor: "#6366f1", backgroundColor: "rgba(99,102,241,0.06)", fill: true, tension: 0.3 }] } }));
  }
 };
+
+function planInlineSelect(name, pfId, field, currentVal, options) {
+  var opts = '';
+  for (var i = 0; i < options.length; i++) {
+    opts += '<option value="' + options[i] + '"' + (options[i] === currentVal ? ' selected' : '') + '>' + options[i] + '</option>';
+  }
+  return '<select onchange="planInlineUpdate(' + pfId + ', \'' + field + '\'' + ', this.value)" class="text-sm bg-transparent border-0 cursor-pointer text-center" style="appearance:auto;-webkit-appearance:auto;vertical-align:middle">' + opts + '</select>';
+}
+
+window.planInlineUpdate = async (pfId, field, value) => {
+  try {
+    await api("/api/planFinances/" + pfId, { method: "PUT", body: JSON.stringify({ data: { [field]: value } }) });
+    await load();
+    toast("已更新", "success");
+  } catch (error) {
+    toast("更新失败：" + error.message, "error");
+  }
+};
--- a/static/modules/utils.js
+++ b/static/modules/utils.js
@@ -5,13 +5,13 @@ const state = {
  data: null,
  tenant: "科普·无界",
  opFilter: "all",
-  finFilter: "已签约",
+  finFilter: "projects",
  selectedProject: null,
  taskQuery: "",
  taskView: localStorage.getItem("opc-task-view") || "detail",
  finView: "overview",
  finSort: null, // { key: 'col', asc: true }
-  planFilter: "已签约",
+  planFilter: "projects",
  planView: "overview",
  planSort: null,
  proposalTab: "standard",
@@ -136,7 +136,7 @@ function switchTab(tab) {
  document.querySelectorAll(".panel").forEach((panel) => panel.classList.toggle("active", panel.id === tab));

  // 更新顶部标题
-  const titles = { home: 'OPC 工作台', finance: '业务管理', plan: '计划管理', projects: '重点工作台账', proposals: '业务方案', products: '版本与运营', performance: '季度绩效考核' };
+  const titles = { home: 'OPC 工作台', finance: '实际管理', plan: '计划管理', projects: '重点工作台账', proposals: '业务方案', products: '版本与运营', performance: '季度绩效考核' };
  const titleEl = document.querySelector('#workspaceTitle');
  if (titleEl) titleEl.textContent = titles[tab] || state.tenant + ' OPC 工作台';

@@ -204,6 +204,8 @@ window.setFinView = (view) => {
  state.finView = view;
  renderFinance();
 };
+window.setFinQuarter = (q) => { state.finQuarter = q; state.finView = 'quarterly'; renderFinance(); };
+window.setFinMonth = (month) => { state.finMonth = month; state.finView = 'monthly'; renderFinance(); };
 window.switchFinFilter = (filter) => {
  state.finFilter = filter;
  state.finSort = null;
@@ -220,6 +222,8 @@ window.setPlanView = (view) => {
  state.planView = view;
  renderPlan();
 };
+window.setPlanQuarter = (q) => { state.planQuarter = q; state.planView = 'quarterly'; renderPlan(); };
+window.setPlanMonth = (month) => { state.planMonth = month; state.planView = 'monthly'; renderPlan(); };
 window.switchPlanFilter = (filter) => {
  state.planFilter = filter;
  state.planSort = null;
--- a/static/styles.css
+++ b/static/styles.css
@@ -96,26 +96,26 @@ body {
 }

 /* 详情弹窗固定高度，tab 切换不抖动 */
-#financeModal > div {
+#financeModal > div, #planModal > div {
  height: 650px;
  display: flex;
  flex-direction: column;
 }
-#financeModal .finance-tabs { flex-shrink: 0; }
-#financeModal form {
+#financeModal .finance-tabs, #planModal .finance-tabs { flex-shrink: 0; }
+#financeModal form, #planModal form {
  flex: 1;
  min-height: 0;
  display: flex;
  flex-direction: column;
  overflow: hidden;
 }
-#financeModal .finance-tab-body {
+#financeModal .finance-tab-body, #planModal .finance-tab-body {
  flex: 1;
  min-height: 0;
  overflow-y: auto;
  padding: 32px;
 }
-#financeModal .finance-form-actions {
+#financeModal .finance-form-actions, #planModal .finance-form-actions {
  flex-shrink: 0;
  background: #fff;
  padding: 12px 32px 8px;
--- a/templates/index.html
+++ b/templates/index.html
@@ -53,9 +53,9 @@
            <i data-lucide="calendar-range" style="width:20px;height:20px"></i>
            <span class="text-[10px] mt-1">计划</span>
          </div>
-          <div class="sidebar-tab" data-tab="finance" onclick="switchTab('finance')" title="业务">
+          <div class="sidebar-tab" data-tab="finance" onclick="switchTab('finance')" title="实际">
            <i data-lucide="folder-open-dot" style="width:20px;height:20px"></i>
-            <span class="text-[10px] mt-1">业务</span>
+            <span class="text-[10px] mt-1">实际</span>
          </div>
          <div class="sidebar-tab" data-tab="projects" onclick="switchTab('projects')" title="Focus">
            <i data-lucide="file-text" style="width:20px;height:20px"></i>
@@ -80,7 +80,7 @@
    <header class="topbar border-b border-slate-200 bg-white px-8 py-5">
      <div class="flex items-center gap-3 w-full">
        <div class="flex-1">
-          <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager <span class="ml-2 text-xs font-normal text-slate-400 tracking-normal">v1.0.0.17</span></p>
+          <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager <span class="ml-2 text-xs font-normal text-slate-400 tracking-normal">v1.0.0.28</span></p>
          <div class="flex items-center gap-4 mt-1">
            <h1 class="text-2xl font-semibold" id="workspaceTitle">科普 OPC 工作台</h1>
            <div class="hidden sm:flex items-center gap-1.5 bg-gradient-to-r from-blue-50 to-indigo-50 border border-blue-100 rounded-full px-4 py-1.5">
Author	SHA1	Message	Date
mac	8952829fe5	fix: 计划总览独立数据源+实际模块表头修复 - 计划月度/季度总览: 改用planFinances计算,不再引用实际模块数据 - 新增computePlanMonthly函数从planFinances计算月度数据 - 实际模块SIGNED_COLS/UNSIGNED_COLS补全client_name列 - theadCols计数修正(14/7) - 版本号 v1.0.0.28	2026-07-08 16:05:45 +08:00
mac	41f4ac1b1b	feat: 计划+实际模块增加月度总览和季度总览 - 计划模块: 总览改名为月度总览, 新增季度总览tab(含环比) - 实际模块: 总览改名为月度总览, 新增季度总览tab(含环比) - 月度总览: 年度累计+1-12月14列 - 季度总览: 年度累计+Q1-Q4+Q2/Q3/Q4环比 - 修复finance.js函数嵌套导致季度总览不渲染 - 版本号 v1.0.0.27	2026-07-08 15:52:45 +08:00
mac	4edd0b0473	feat: 实际模块加客户名称+计划总览改月度表格 - project_finances新增client_name列(实际模块) - 实际模块表单/表格增加客户名称列(项目名称前) - 计划总览财务概览: 改为年度累计+1-12月14列 - 表格内容去掉元后缀 - 版本号 v1.0.0.26	2026-07-08 15:11:26 +08:00
mac	a31d10f23f	feat: 计划模块新增客户/项目类型/加权字段+内联编辑 - plan_finances新增client_name/project_type/weight三列 - 表格新增客户/加权(内联下拉)/项目类型(内联下拉)三列 - 删除毛利率/付款率列 - 表头列定义修复(清理status残留空行) - planInlineUpdate支持表格内直接修改 - 版本号 v1.0.0.25	2026-07-08 14:50:14 +08:00
mac	347c8aa818	feat: 筛选栏改标签式+计划总览图表修复+tip位置调整 - 计划/实际模块筛选栏: 下拉框改为标签按钮(总视图\|按季度\|按月度) - utils.js新增setFinQuarter/setFinMonth/setPlanQuarter/setPlanMonth - 计划总览图表: 修复canvas ID和渲染函数调用 - 计划模块tab和tip位置对换(tab在上,tip在下) - 版本号 v1.0.0.24	2026-07-08 14:16:31 +08:00
mac	e21d41b218	refactor: 彻底删除实际模块status字段 - 数据库: DROP project_finances.status 列(幂等迁移) - 后端: routes.py移除status过滤(12处), helpers.py修复SQL - 后端: 删除migrate_move_pending_to_plan, seed_data移除status - 前端: finance.js/performance.js/utils.js全部清除status引用 - finFilter默认值改为projects - 版本号 v1.0.0.23	2026-07-08 13:46:10 +08:00
mac	a57cba8043	refactor: 彻底删除计划模块status字段+新增蓝色tip - 数据库: DROP plan_finances.status 列(幂等迁移) - 后端: routes.py TABLES移除status, migrate用显式列名 - 前端: plan.js移除表单/表格/过滤/汇总所有status引用 - planFilter值从待签约改为projects - 计划页面顶部新增蓝色tip提醒条 - 版本号 v1.0.0.22	2026-07-08 13:21:54 +08:00
mac	fdb16d053a	fix: 移除closePlanModal的render()调用	2026-07-08 13:04:51 +08:00
mac	61ba9c4c5d	fix: 计划模块弹窗完整修复 - 弹窗HTML从finance.js干净复制, 结构完全对齐 - 25个modal ID加plan_前缀, 与实际模块零冲突 - 16个window函数+4个全局函数加plan前缀, 避免覆盖 - closePlanModal关闭后调用render()清理DOM - CSS 5条规则加上#planModal选择器 - isUnsigned=false, 表格14列+卡片14个 - 版本号 v1.0.0.20	2026-07-08 13:00:16 +08:00
mac	eba4945fba	refactor: 业务→实际	2026-07-08 12:23:32 +08:00
mac	2445dea4dd	refactor: 业务去待签约, 计划tab调整 - 业务模块移除待签约tab, 状态只保留已签约 - 计划模块移除项目tab, 待签约→项目计划, 平台费用→平台费用计划 - 计划默认选中项目计划tab - 版本号 v1.0.0.18	2026-07-08 12:22:02 +08:00