Merge branch 'dev'

finance.js: 费用Tab/卡片/表头/流程链
home.js: 首页行标签/流程链
migrations/columns.py: 注释

backend/helpers.py

@@ -63,10 +63,11 @@ def attach_common(conn, resource, items):
 def monthly_finance(conn, tenant="科普·无界"):
     months = [f"2026-{m:02d}" for m in range(1, 13)]
     pfs = rows(conn,
-        "SELECT sign_amount, sign_month, status, budget_data FROM project_finances WHERE tenant=? AND status='已签约'",
+        "SELECT sign_amount, sign_month, status, budget_data, expense_data FROM project_finances WHERE tenant=? AND status='已签约'",
         [tenant])
 
     parsed_budgets = []
+    expense_maps = {}
     for pf in pfs:
         try:
             budget = json.loads(pf.get("budget_data") or "[]")
@@ -79,14 +80,27 @@ def monthly_finance(conn, tenant="科普·无界"):
                 "rev": float(b.get("rev") or 0),
                 "gross": float(b.get("gross") or 0),
                 "payment": float(b.get("payment") or 0),
-                "cost": float(b.get("cost") or 0),
             }
         parsed_budgets.append((pf, budget_map))
 
+        # Parse expense_data for cost/paid
+        try:
+            ed = json.loads(pf.get("expense_data") or "[]")
+        except (json.JSONDecodeError, TypeError):
+            ed = []
+        em = {}
+        for e in ed:
+            key = (e.get("month") or "").replace("-", "_")
+            em[key] = {
+                "cost": float(e.get("cost") or 0),
+                "paid": float(e.get("paid") or 0),
+            }
+        expense_maps[pf.get("id", id(pf))] = em
+
     data = []
     for month in months:
         key = month.replace("-", "_")
-        revenue = gross = payment = cost = sign = 0
+        revenue = gross = payment = cost = paid = sign = 0
         for pf, budget_map in parsed_budgets:
             if pf["status"] == "已签约" and (pf.get("sign_month") or "") == month:
                 sign += float(pf["sign_amount"] or 0)
@@ -95,11 +109,18 @@ def monthly_finance(conn, tenant="科普·无界"):
                 revenue += b["rev"]
                 gross += b["gross"]
                 payment += b["payment"]
-                cost += b["cost"]
+            em = expense_maps.get(pf.get("id", id(pf)), {})
+            e = em.get(key)
+            if e:
+                cost += e["cost"]
+                paid += e["paid"]
         data.append({
-            "month": month, "revenue": revenue,
-            "labor": 0, "expense": 0, "purchase": 0,
-            "gross": gross,
-            "sign": sign, "payment": payment, "cost": cost,
+            "month": month,
+            "revenue": round(revenue, 2),
+            "gross": round(gross, 2),
+            "payment": round(payment, 2),
+            "cost": round(cost, 2),
+            "paid": round(paid, 2),
+            "sign": round(sign, 2),
         })
     return data

backend/migrations/__init__.py

@@ -18,6 +18,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
+    from migrations.data_split import migrate_data_split
     from migrations.seed import migrate_seed_users, migrate_seed_demo_data
 
     migrate_create_tables()
@@ -26,5 +27,6 @@ def run_migrations():
     migrate_rename_tenant()
     migrate_drop_product_fields()
     migrate_fix_service_fee_standard()
+    migrate_data_split()
     migrate_seed_users()
     migrate_seed_demo_data()

backend/migrations/columns.py

@@ -67,7 +67,7 @@ def migrate_add_columns():
                 _add_column_if_missing(conn, "project_finances", col,
                     f"ALTER TABLE project_finances ADD COLUMN {col} DOUBLE NOT NULL DEFAULT 0")
 
-        # project_finances 总视图字段：已回款 / 应付 / 已付
+        # project_finances 总视图字段：已回款 / 成本 / 已付
         _add_column_if_missing(conn, "project_finances", "total_payment",
             "ALTER TABLE project_finances ADD COLUMN total_payment DOUBLE NOT NULL DEFAULT 0")
         _add_column_if_missing(conn, "project_finances", "total_cost",
@@ -92,6 +92,23 @@ def migrate_add_columns():
             "ALTER TABLE project_finances ADD COLUMN project_manager VARCHAR(100) NOT NULL DEFAULT ''")
         _add_column_if_missing(conn, "project_finances", "task_data",
             "ALTER TABLE project_finances ADD COLUMN task_data TEXT")
+        _add_column_if_missing(conn, "project_finances", "contact_name",
+            "ALTER TABLE project_finances ADD COLUMN contact_name VARCHAR(100) NOT NULL DEFAULT ''")
+        _add_column_if_missing(conn, "project_finances", "contact_phone",
+            "ALTER TABLE project_finances ADD COLUMN contact_phone VARCHAR(50) NOT NULL DEFAULT ''")
+        _add_column_if_missing(conn, "project_finances", "other_info",
+            "ALTER TABLE project_finances ADD COLUMN other_info VARCHAR(500) NOT NULL DEFAULT ''")
+        # expense_records 字段迁移（重构为费用类型+月份+金额+已发生金额+费用说明）
+        _add_column_if_missing(conn, "expense_records", "expense_type",
+            "ALTER TABLE expense_records ADD COLUMN expense_type VARCHAR(100) NOT NULL DEFAULT ''")
+        _add_column_if_missing(conn, "expense_records", "expense_month",
+            "ALTER TABLE expense_records ADD COLUMN expense_month VARCHAR(20) NOT NULL DEFAULT ''")
+        _add_column_if_missing(conn, "expense_records", "incurred_amount",
+            "ALTER TABLE expense_records ADD COLUMN incurred_amount DOUBLE NOT NULL DEFAULT 0")
+
+        # project_finances 费用明细 JSON 数据
+        _add_column_if_missing(conn, "project_finances", "expense_data",
+            "ALTER TABLE project_finances ADD COLUMN expense_data TEXT")
 
         conn.commit()
         print("[migrate] 加列迁移完成")

backend/migrations/data_split.py

@@ -0,0 +1,56 @@
+"""migrations/data_split.py — 预算数据拆分迁移：budget_data → expense_data
+
+旧结构：budget_data = [{month, rev, gross, payment, cost, paid}]
+新结构：expense_data = [{month, expense_type, cost, paid, exp_note}]
+
+部署时自动：检测未拆分的旧数据，将 cost/paid 从 budget_data 迁移到 expense_data。
+幂等：只处理 expense_data 为空的记录。
+"""
+
+
+def migrate_data_split():
+    """一次性数据拆分迁移"""
+    from db import db, _exec
+    import json
+
+    conn = db()
+    try:
+        # 查询未迁移的记录
+        cur = conn.cursor(dictionary=True)
+        cur.execute(
+            "SELECT id, budget_data, expense_data FROM project_finances "
+            "WHERE (expense_data IS NULL OR expense_data = '' OR expense_data = '[]') "
+            "AND budget_data IS NOT NULL AND budget_data != '' AND budget_data != '[]'"
+        )
+        rows = cur.fetchall()
+        cur.close()
+
+        migrated = 0
+        for row in rows:
+            try:
+                budget = json.loads(row.get("budget_data") or "[]")
+            except (json.JSONDecodeError, TypeError):
+                continue
+
+            expense_rows = []
+            for b in budget:
+                expense_rows.append({
+                    "month": b.get("month", ""),
+                    "expense_type": "",
+                    "cost": float(b.get("cost") or 0),
+                    "paid": float(b.get("paid") or 0),
+                    "exp_note": "",
+                })
+
+            if expense_rows:
+                _exec(
+                    conn,
+                    "UPDATE project_finances SET expense_data = ? WHERE id = ?",
+                    (json.dumps(expense_rows, ensure_ascii=False), row["id"]),
+                )
+                migrated += 1
+
+        conn.commit()
+        print(f"[migrate] 数据拆分迁移完成：{migrated} 条记录已从 budget_data 提取 cost/paid 到 expense_data")
+    finally:
+        conn.close()

backend/migrations/tables.py

@@ -146,6 +146,17 @@ def migrate_create_tables():
   budget_data TEXT,
   created_at VARCHAR(30) NOT NULL DEFAULT '',
   updated_at VARCHAR(30) NOT NULL DEFAULT ''
+)""",
+            """CREATE TABLE IF NOT EXISTS expense_records (
+  id INT AUTO_INCREMENT PRIMARY KEY,
+  tenant VARCHAR(100) NOT NULL DEFAULT '科普·无界',
+  expense_type VARCHAR(100) NOT NULL DEFAULT '',
+  expense_month VARCHAR(20) NOT NULL DEFAULT '',
+  amount DOUBLE NOT NULL DEFAULT 0,
+  incurred_amount DOUBLE NOT NULL DEFAULT 0,
+  notes VARCHAR(1000) NOT NULL DEFAULT '',
+  created_at VARCHAR(30) NOT NULL DEFAULT '',
+  updated_at VARCHAR(30) NOT NULL DEFAULT ''
 )""",
         ]
 

backend/routes.py

@@ -23,7 +23,8 @@ 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", "start_date", "end_date", "task_type", "task_count", "service_fee_standard", "project_manager", "task_data", "project_code"]),
+    "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"]),
+    "expense": ("expense_records", ["expense_type", "expense_month", "amount", "incurred_amount", "notes", "tenant"]),
 }
 
 # ---------- 鉴权装饰器 ----------
@@ -246,6 +247,7 @@ def bootstrap():
                 t_ops = attach_common(conn, "operations", rows(conn, "SELECT * FROM operation_projects WHERE tenant=? ORDER BY id ASC", [t]))
                 t_sales = attach_common(conn, "sales", rows(conn, "SELECT * FROM sales_leads WHERE tenant=? ORDER BY id DESC", [t]))
                 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"] == "已签约"]
                 def t_parse_budget(pf):
@@ -264,10 +266,34 @@ def bootstrap():
                             if b:
                                 total += float(b.get(field) or 0)
                     return total
+
+                def t_parse_expense(pf):
+                    try:
+                        ed = json.loads(pf.get("expense_data") or "[]")
+                    except (json.JSONDecodeError, TypeError):
+                        ed = []
+                    return {(e.get("month") or "").replace("-", "_"): e for e in ed}
+
+                t_em = {pf["id"]: t_parse_expense(pf) for pf in t_pfs}
+
+                def t_sum_expense(field, months_range):
+                    total = 0
+                    for pf in t_pfs:
+                        em = t_em.get(pf["id"], {})
+                        for m in months_range:
+                            e = em.get(f"2026_{m:02d}")
+                            if e:
+                                total += float(e.get(field) or 0)
+                    return total
+
                 _now_month = date.today().month
                 _q_start = ((_now_month - 1) // 3) * 3 + 1
                 _q_range = range(_q_start, _q_start + 3)
                 _q_months = [f"2026-{m:02d}" for m in _q_range]
+                _prev_q_start = ((_now_month - 4) // 3) * 3 + 1
+                _prev_q_range = range(max(_prev_q_start, 1), _prev_q_start + 3)
+                _prev_q_months = [f"2026-{m:02d}" for m in _prev_q_range]
+                _prev_month = _now_month - 1 if _now_month > 1 else None
                 all_metrics.append({
                     "total_projects": len(t_signed_pfs),
                     "total_proposals": len(t_ops),
@@ -277,28 +303,74 @@ def bootstrap():
                     "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"2026-{_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"2026-{_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]),
+                    "revenue_prev_q": t_sum_budget("rev", _prev_q_range),
+                    "revenue_prev_month": t_sum_budget("rev", [_prev_month]) if _prev_month else 0,
                     "gross_annual": t_sum_budget("gross", range(1, 13)),
                     "gross_q2": t_sum_budget("gross", _q_range),
                     "monthly_net_profit": t_sum_budget("gross", [_now_month]),
+                    "gross_prev_q": t_sum_budget("gross", _prev_q_range),
+                    "gross_prev_month": t_sum_budget("gross", [_prev_month]) if _prev_month else 0,
                     "payment_annual": t_sum_budget("payment", range(1, 13)),
                     "payment_q2": t_sum_budget("payment", _q_range),
                     "payment_month": t_sum_budget("payment", [_now_month]),
-                    "cost_annual": t_sum_budget("cost", range(1, 13)),
-                    "cost_q2": t_sum_budget("cost", _q_range),
-                    "cost_month": t_sum_budget("cost", [_now_month]),
+                    "payment_prev_q": t_sum_budget("payment", _prev_q_range),
+                    "payment_prev_month": t_sum_budget("payment", [_prev_month]) if _prev_month else 0,
+                    "cost_annual": t_sum_expense("cost", range(1, 13)),
+                    "cost_q2": t_sum_expense("cost", _q_range),
+                    "cost_month": t_sum_expense("cost", [_now_month]),
+                    "cost_prev_q": t_sum_expense("cost", _prev_q_range),
+                    "cost_prev_month": t_sum_expense("cost", [_prev_month]) if _prev_month else 0,
                 })
+                # 费用汇总（从 expense_records 表计算）
+                def t_expense_sum(m_range):
+                    total = 0
+                    for r in t_expense:
+                        m = (r.get("expense_month") or "").strip()
+                        if not m or "-" not in m: continue
+                        try:
+                            if int(m.split("-")[1]) in m_range:
+                                total += float(r.get("amount") or 0)
+                        except: pass
+                    return total
+                all_metrics[-1]["expense_annual"] = t_expense_sum(range(1, 13))
+                all_metrics[-1]["expense_q2"] = t_expense_sum(_q_range)
+                all_metrics[-1]["expense_month"] = t_expense_sum([_now_month])
+                all_metrics[-1]["expense_prev_q"] = t_expense_sum(_prev_q_range)
+                all_metrics[-1]["expense_prev_month"] = t_expense_sum([_prev_month]) if _prev_month else 0
+                all_metrics[-1]["paid_annual"] = t_sum_expense("paid", range(1, 13))
+                all_metrics[-1]["paid_q2"] = t_sum_expense("paid", _q_range)
+                all_metrics[-1]["paid_month"] = t_sum_expense("paid", [_now_month])
+                all_metrics[-1]["paid_prev_q"] = t_sum_expense("paid", _prev_q_range)
+                all_metrics[-1]["paid_prev_month"] = t_sum_expense("paid", [_prev_month]) if _prev_month else 0
+                all_metrics[-1]["proj_expense_annual"] = t_sum_budget("expense", range(1, 13))
+                all_metrics[-1]["proj_expense_q2"] = t_sum_budget("expense", _q_range)
+                all_metrics[-1]["proj_expense_month"] = t_sum_budget("expense", [_now_month])
+                all_metrics[-1]["proj_expense_prev_q"] = t_sum_budget("expense", _prev_q_range)
+                all_metrics[-1]["proj_expense_prev_month"] = t_sum_budget("expense", [_prev_month]) if _prev_month else 0
+                all_metrics[-1]["cashflow_annual"] = all_metrics[-1]["payment_annual"] - all_metrics[-1]["paid_annual"]
+                all_metrics[-1]["cashflow_q2"] = all_metrics[-1]["payment_q2"] - all_metrics[-1]["paid_q2"]
+                all_metrics[-1]["cashflow_month"] = all_metrics[-1]["payment_month"] - all_metrics[-1]["paid_month"]
+                all_metrics[-1]["cashflow_prev_q"] = all_metrics[-1]["payment_prev_q"] - all_metrics[-1]["paid_prev_q"]
+                all_metrics[-1]["cashflow_prev_month"] = all_metrics[-1]["payment_prev_month"] - all_metrics[-1]["paid_prev_month"]
+                all_metrics[-1]["profit_annual"] = all_metrics[-1]["gross_annual"] - all_metrics[-1]["proj_expense_annual"]
+                all_metrics[-1]["profit_q2"] = all_metrics[-1]["gross_q2"] - all_metrics[-1]["proj_expense_q2"]
+                all_metrics[-1]["profit_month"] = all_metrics[-1]["monthly_net_profit"] - all_metrics[-1]["proj_expense_month"]
+                all_metrics[-1]["profit_prev_q"] = all_metrics[-1]["gross_prev_q"] - all_metrics[-1]["proj_expense_prev_q"]
+                all_metrics[-1]["profit_prev_month"] = all_metrics[-1]["gross_prev_month"] - all_metrics[-1]["proj_expense_prev_month"]
                 all_monthly.append(monthly_finance(conn, t))
                 all_recent.extend(rows(conn, "SELECT * FROM follow_up_records WHERE tenant=? ORDER BY id DESC LIMIT 4", [t]))
             agg = {}
-            for key in ["total_projects","total_proposals","total_products","upcoming_products","signed_amount","signed_annual","signed_q2","signed_month","revenue_annual","revenue_q2","monthly_revenue","gross_annual","gross_q2","monthly_net_profit","payment_annual","payment_q2","payment_month","cost_annual","cost_q2","cost_month"]:
+            for key in ["total_projects","total_proposals","total_products","upcoming_products","signed_amount","signed_annual","signed_q2","signed_month","signed_prev_q","signed_prev_month","revenue_annual","revenue_q2","monthly_revenue","revenue_prev_q","revenue_prev_month","gross_annual","gross_q2","monthly_net_profit","gross_prev_q","gross_prev_month","payment_annual","payment_q2","payment_month","payment_prev_q","payment_prev_month","cost_annual","cost_q2","cost_month","cost_prev_q","cost_prev_month","expense_annual","expense_q2","expense_month","expense_prev_q","expense_prev_month","paid_annual","paid_q2","paid_month","paid_prev_q","paid_prev_month","cashflow_annual","cashflow_q2","cashflow_month","cashflow_prev_q","cashflow_prev_month","profit_annual","profit_q2","profit_month","profit_prev_q","profit_prev_month","proj_expense_annual","proj_expense_q2","proj_expense_month","proj_expense_prev_q","proj_expense_prev_month"]:
                 agg[key] = sum(m.get(key, 0) for m in all_metrics)
             merged_monthly = []
             for i in range(12):
                 m = {"month": all_monthly[0][i]["month"] if all_monthly and len(all_monthly[0]) > i else f"2026-{i+1:02d}"}
-                for field in ["revenue","gross","payment","cost","sign"]:
+                for field in ["revenue","gross","payment","cost","paid","sign"]:
                     m[field] = sum(tl[i][field] if i < len(tl) else 0 for tl in all_monthly)
                 merged_monthly.append(m)
             summary = {
@@ -307,7 +379,7 @@ def bootstrap():
                 "recent": sorted(all_recent, key=lambda x: x.get("id", 0), reverse=True)[:8],
                 "risks": [],
             }
-            return jsonify({"summary": summary, "sales": [], "proposals": [], "operations": [], "products": [], "finance": [], "projectFinances": [], "financeMonthly": merged_monthly, "tasks": [], "tenant": tenant, "tenants": allowed})
+            return jsonify({"summary": summary, "sales": [], "proposals": [], "operations": [], "products": [], "finance": [], "projectFinances": [], "financeMonthly": merged_monthly, "tasks": [], "expense": [], "tenant": tenant, "tenants": allowed})
 
         def q(sql, *args):
             return rows(conn, sql, args)
@@ -318,6 +390,7 @@ def bootstrap():
         finance = q("SELECT * FROM finance_records WHERE tenant=? ORDER BY month DESC, id DESC", tenant)
         tasks = q("SELECT * FROM project_tasks WHERE tenant=? ORDER BY phase, sort_order, id", tenant)
         pfs = q("SELECT * FROM project_finances WHERE tenant=? ORDER BY id DESC", tenant)
+        expense = q("SELECT * FROM expense_records WHERE tenant=? ORDER BY id DESC", tenant)
         signed_pfs = [x for x in pfs if x["status"] == "已签约"]
 
         def parse_budget(pf):
@@ -329,6 +402,15 @@ def bootstrap():
 
         budget_maps = [(pf, parse_budget(pf)) for pf in signed_pfs]
 
+        def parse_expense(pf):
+            try:
+                ed = json.loads(pf.get("expense_data") or "[]")
+            except (json.JSONDecodeError, TypeError):
+                ed = []
+            return {(e.get("month") or "").replace("-", "_"): e for e in ed}
+
+        expense_maps = [(pf, parse_expense(pf)) for pf in signed_pfs]
+
         def sum_budget(field, months_range):
             total = 0
             for pf, bm in budget_maps:
@@ -338,21 +420,76 @@ def bootstrap():
                         total += float(b.get(field) or 0)
             return total
 
+        def sum_expense(field, months_range):
+            total = 0
+            for pf, em in expense_maps:
+                for m in months_range:
+                    e = em.get(f"2026_{m:02d}")
+                    if e:
+                        total += float(e.get(field) or 0)
+            return total
+
         _now_month = date.today().month
         _q_start = ((_now_month - 1) // 3) * 3 + 1
         _q_range = range(_q_start, _q_start + 3)
+        _prev_q_start = ((_now_month - 4) // 3) * 3 + 1
+        _prev_q_range = range(max(_prev_q_start, 1), _prev_q_start + 3)
+        _prev_month = _now_month - 1 if _now_month > 1 else None
         rev_annual = sum_budget("rev", range(1, 13))
         gross_annual = sum_budget("gross", range(1, 13))
         rev_q2 = sum_budget("rev", _q_range)
         gross_q2 = sum_budget("gross", _q_range)
         rev_month = sum_budget("rev", [_now_month])
         gross_month = sum_budget("gross", [_now_month])
+        rev_prev_q = sum_budget("rev", _prev_q_range)
+        gross_prev_q = sum_budget("gross", _prev_q_range)
+        rev_prev_month = sum_budget("rev", [_prev_month]) if _prev_month else 0
+        gross_prev_month = sum_budget("gross", [_prev_month]) if _prev_month else 0
         payment_annual = sum_budget("payment", range(1, 13))
-        cost_annual = sum_budget("cost", range(1, 13))
+        cost_annual = sum_expense("cost", range(1, 13))
         payment_q2 = sum_budget("payment", _q_range)
-        cost_q2 = sum_budget("cost", _q_range)
+        cost_q2 = sum_expense("cost", _q_range)
         payment_month = sum_budget("payment", [_now_month])
-        cost_month = sum_budget("cost", [_now_month])
+        cost_month = sum_expense("cost", [_now_month])
+        payment_prev_q = sum_budget("payment", _prev_q_range)
+        cost_prev_q = sum_expense("cost", _prev_q_range)
+        payment_prev_month = sum_budget("payment", [_prev_month]) if _prev_month else 0
+        cost_prev_month = sum_expense("cost", [_prev_month]) if _prev_month else 0
+        def expense_sum(month_range):
+            total = 0
+            for r in expense:
+                m = (r.get("expense_month") or "").strip()
+                if not m or "-" not in m: continue
+                try:
+                    if int(m.split("-")[1]) in month_range:
+                        total += float(r.get("amount") or 0)
+                except: pass
+            return total
+        expense_annual = expense_sum(range(1, 13))
+        expense_q2 = expense_sum(_q_range)
+        expense_month_val = expense_sum([_now_month])
+        expense_prev_q = expense_sum(_prev_q_range)
+        expense_prev_month = expense_sum([_prev_month]) if _prev_month else 0
+        paid_annual = sum_expense("paid", range(1, 13))
+        paid_q2 = sum_expense("paid", _q_range)
+        paid_month = sum_expense("paid", [_now_month])
+        paid_prev_q = sum_expense("paid", _prev_q_range)
+        paid_prev_month = sum_expense("paid", [_prev_month]) if _prev_month else 0
+        proj_expense_annual = sum_budget("expense", range(1, 13))
+        proj_expense_q2 = sum_budget("expense", _q_range)
+        proj_expense_month = sum_budget("expense", [_now_month])
+        proj_expense_prev_q = sum_budget("expense", _prev_q_range)
+        proj_expense_prev_month = sum_budget("expense", [_prev_month]) if _prev_month else 0
+        cashflow_annual = payment_annual - paid_annual
+        cashflow_q2 = payment_q2 - paid_q2
+        cashflow_month = payment_month - paid_month
+        cashflow_prev_q = payment_prev_q - paid_prev_q
+        cashflow_prev_month = payment_prev_month - paid_prev_month
+        profit_annual = gross_annual - proj_expense_annual
+        profit_q2 = gross_q2 - proj_expense_q2
+        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("已签约")
@@ -360,6 +497,9 @@ def bootstrap():
         _q_months = [f"2026-{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"2026-{_now_month:02d}")
+        _prev_q_months = [f"2026-{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"2026-{_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 = {
@@ -380,23 +520,58 @@ def bootstrap():
                 "signed_annual": signed_annual,
                 "signed_q2": signed_q2,
                 "signed_month": signed_month,
+                "signed_prev_q": signed_prev_q,
+                "signed_prev_month": signed_prev_month,
                 "pipeline_amount": pipeline_amount,
                 "revenue_annual": rev_annual,
                 "revenue_q2": rev_q2,
+                "revenue_prev_q": rev_prev_q,
+                "revenue_prev_month": rev_prev_month,
                 "gross_annual": gross_annual,
                 "gross_q2": gross_q2,
+                "gross_prev_q": gross_prev_q,
+                "gross_prev_month": gross_prev_month,
                 "payment_annual": payment_annual,
                 "payment_q2": payment_q2,
                 "payment_month": payment_month,
+                "payment_prev_q": payment_prev_q,
+                "payment_prev_month": payment_prev_month,
                 "cost_annual": cost_annual,
                 "cost_q2": cost_q2,
                 "cost_month": cost_month,
+                "cost_prev_q": cost_prev_q,
+                "cost_prev_month": cost_prev_month,
+                "expense_annual": expense_annual,
+                "expense_q2": expense_q2,
+                "expense_month": expense_month_val,
+                "expense_prev_q": expense_prev_q,
+                "expense_prev_month": expense_prev_month,
+                "paid_annual": paid_annual,
+                "paid_q2": paid_q2,
+                "paid_month": paid_month,
+                "paid_prev_q": paid_prev_q,
+                "paid_prev_month": paid_prev_month,
+                "cashflow_annual": cashflow_annual,
+                "cashflow_q2": cashflow_q2,
+                "cashflow_month": cashflow_month,
+                "cashflow_prev_q": cashflow_prev_q,
+                "cashflow_prev_month": cashflow_prev_month,
+                "profit_annual": profit_annual,
+                "profit_q2": profit_q2,
+                "profit_month": profit_month,
+                "profit_prev_q": profit_prev_q,
+                "profit_prev_month": profit_prev_month,
+                "proj_expense_annual": proj_expense_annual,
+                "proj_expense_q2": proj_expense_q2,
+                "proj_expense_month": proj_expense_month,
+                "proj_expense_prev_q": proj_expense_prev_q,
+                "proj_expense_prev_month": proj_expense_prev_month,
                 "signed_not_executed": signed_not_executed,
             },
             "recent": q("SELECT * FROM follow_up_records WHERE tenant=? ORDER BY id DESC LIMIT 8", tenant),
             "risks": [{"title": "执行提醒", "content": x["next_action"]} for x in operations if x["next_action"]][:5],
         }
-        return jsonify({"summary": summary, "sales": sales, "proposals": proposals, "operations": operations, "products": products, "finance": finance, "projectFinances": pfs, "financeMonthly": monthly_finance(conn, tenant), "tasks": tasks, "tenant": tenant, "tenants": allowed})
+        return jsonify({"summary": summary, "sales": sales, "proposals": proposals, "operations": operations, "products": products, "finance": finance, "projectFinances": pfs, "financeMonthly": monthly_finance(conn, tenant), "tasks": tasks, "expense": expense, "tenant": tenant, "tenants": allowed})
     finally:
         conn.close()
 
@@ -477,6 +652,17 @@ def update_resource(resource, item_id):
 
 # ---------- followups ----------
 
+@bp.route("/api/followups/<target_type>/<int:target_id>")
+def list_followups(target_type, target_id):
+    conn = db()
+    try:
+        fups = rows(conn,
+            "SELECT * FROM follow_up_records WHERE target_type=? AND target_id=? ORDER BY followed_at DESC, id DESC",
+            (target_type, target_id))
+        return jsonify(fups)
+    finally:
+        conn.close()
+
 @bp.route("/api/followups/<target_type>/<int:target_id>", methods=["POST"])
 @login_required
 def add_followup(target_type, target_id):

static/modules/expense.js

@@ -0,0 +1,175 @@
+// expense.js — 费用管理模块
+
+function renderExpense() {
+  var records = state.data.expense || [];
+  var money = function(v) { return '¥ ' + (Number(v || 0)).toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 2 }); };
+  var esc = function(s) { return (s || '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;'); };
+  var EXPENSE_TYPES = ['通用费用','平台采购','人力成本','研发费用','奖金','其他'];
+
+  // 筛选状态
+  var view = state.expenseView || 'total';
+  var typeFilter = state.expenseFilter || '全部';
+  var filtered = typeFilter === '全部' ? records : records.filter(function(r) { return r.expense_type === typeFilter; });
+
+  // 视图数据预处理
+  var now = new Date();
+  var thisYear = now.getFullYear();
+  var defaultMonth = thisYear + '-' + String(now.getMonth() + 1).padStart(2, '0');
+
+  if (!state.expenseMonth) state.expenseMonth = defaultMonth;
+  if (state.expenseQuarter === '') state.expenseQuarter = String(Math.floor(now.getMonth() / 3));
+
+  // 月度筛选
+  if (view === 'monthly') {
+    filtered = filtered.filter(function(r) { return r.expense_month === state.expenseMonth; });
+  }
+
+  // 季度筛选
+  if (view === 'quarterly') {
+    var q = parseInt(state.expenseQuarter) || 0;
+    var qRanges = [[1,2,3],[4,5,6],[7,8,9],[10,11,12]];
+    var qRange = qRanges[q];
+    filtered = filtered.filter(function(r) {
+      var m = parseInt((r.expense_month || '0').substring(5)) || 0;
+      return qRange.indexOf(m) >= 0;
+    });
+  }
+
+  var totalAmount = filtered.reduce(function(s, r) { return s + (r.amount || 0); }, 0);
+  var totalIncurred = filtered.reduce(function(s, r) { return s + (r.incurred_amount || 0); }, 0);
+
+  // 月份下拉选项（去年/今年/明年）
+  var monthOpts = '<option value="">请选择</option>';
+  for (var yr = thisYear - 1; yr <= thisYear + 1; yr++)
+    for (var m = 1; m <= 12; m++) {
+      var mv = yr + '-' + String(m).padStart(2, '0');
+      monthOpts += '<option value="' + mv + '"' + (mv === state.expenseMonth ? ' selected' : '') + '>' + mv + '</option>';
+    }
+
+  // 季度下拉
+  var qLabels = ['Q1 (1-3月)','Q2 (4-6月)','Q3 (7-9月)','Q4 (10-12月)'];
+  var quarterOpts = '';
+  for (var qi = 0; qi < 4; qi++) {
+    quarterOpts += '<option value="' + qi + '"' + (String(qi) === state.expenseQuarter ? ' selected' : '') + '>' + qLabels[qi] + '</option>';
+  }
+
+  // 月份/季度日期选择器
+  var dateSelect = '';
+  if (view === 'monthly') {
+    dateSelect = '<span class="text-xs text-slate-500 ml-2">月份：</span><select onchange="setExpenseMonth(this.value)" class="text-xs 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">' + monthOpts + '</select>';
+  } else if (view === 'quarterly') {
+    dateSelect = '<span class="text-xs text-slate-500 ml-2">季度：</span><select onchange="setExpenseQuarter(this.value)" class="text-xs 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">' + quarterOpts + '</select>';
+  }
+
+  // Toolbar
+  var toolbar = '<span class="text-xs text-slate-500">视图：</span><select onchange="setExpenseView(this.value)" class="text-xs 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="total"' + (view==='total'?' selected':'') + '>总视图</option><option value="quarterly"' + (view==='quarterly'?' selected':'') + '>季度视图</option><option value="monthly"' + (view==='monthly'?' selected':'') + '>月度视图</option></select><span class="text-xs text-slate-500 ml-3">类型：</span><select onchange="setExpenseFilter(this.value)" class="text-xs 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="全部"' + (typeFilter==='全部'?' selected':'') + '>全部 (' + records.length + ')</option>';
+  EXPENSE_TYPES.forEach(function(t) {
+    toolbar += '<option value="' + t + '"' + (typeFilter===t?' selected':'') + '>' + t + ' (' + records.filter(function(r){return r.expense_type===t}).length + ')</option>';
+  });
+  toolbar += '</select>' + dateSelect;
+
+  // 表格行
+  var tableRows = '';
+  if (filtered.length) {
+    filtered.forEach(function(r) {
+      tableRows += '<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openExpenseEdit(' + r.id + ')"><td class="p-2 font-medium text-center align-middle" style="width:200px">' + esc(r.expense_type) + '</td><td class="p-2 text-center align-middle" style="width:200px">' + (r.expense_month || '—') + '</td><td class="p-2 text-center align-middle font-medium" style="width:200px">' + money(r.amount) + '</td><td class="p-2 text-center align-middle font-medium" style="width:200px">' + money(r.incurred_amount) + '</td><td class="p-2 text-center align-middle text-slate-500" style="width:200px">' + (esc(r.notes) || '—') + '</td></tr>';
+    });
+  } else {
+    var emptyMsg = view === 'monthly' ? '该月份暂无费用记录' : view === 'quarterly' ? '该季度暂无费用记录' : '暂无费用记录';
+    tableRows = '<tr><td colspan="5" class="p-6 text-center text-slate-400">' + emptyMsg + '</td></tr>';
+  }
+
+  // 模态框
+  var modal = '<div id="expenseModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closeExpenseModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-lg mx-4" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-6 py-4 flex items-center justify-between"><h3 class="text-lg font-bold text-slate-800" id="expenseModalTitle">新增费用</h3><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="expenseDeleteBtn" onclick="deleteExpenseItem()">删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closeExpenseModal()"><i data-lucide="x"></i></button></div></div><form onsubmit="saveExpense(event)" class="p-6 grid gap-4" novalidate><input type="hidden" name="expense_id" value=""><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-xs text-slate-500 mb-1 block">费用类型 <span class="text-red-500">*</span></span><select name="expense_type" required class="form-ctrl bg-white"><option value="">请选择</option>';
+  EXPENSE_TYPES.forEach(function(t) { modal += '<option>' + t + '</option>'; });
+  modal += '</select></label><label class="block"><span class="text-xs text-slate-500 mb-1 block">月份 <span class="text-red-500">*</span></span><select name="expense_month" required class="form-ctrl bg-white">' + monthOpts + '</select></label></div><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-xs text-slate-500 mb-1 block">金额（元）</span><input name="amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label><label class="block"><span class="text-xs text-slate-500 mb-1 block">已发生金额（元）</span><input name="incurred_amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label></div><label class="block"><span class="text-xs text-slate-500 mb-1 block">费用说明</span><textarea name="notes" class="form-ctrl" rows="3" placeholder="备注信息"></textarea></label><div class="flex justify-end gap-3 pt-2"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closeExpenseModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>';
+
+  document.querySelector("#expense").innerHTML = '<div class="grid gap-4">' +
+    '<div class="card p-3"><div class="flex justify-between items-center"><div class="flex items-center gap-2">' + toolbar + '</div><button class="btn btn-primary btn-sm" onclick="openExpenseModal()">新增费用</button></div></div>' +
+    '<div class="grid grid-cols-3 gap-3">' +
+      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-xs text-slate-500">费用记录</span><strong class="mt-2 block text-xl">' + filtered.length + '</strong></div>' +
+      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-xs text-slate-500">总费用</span><strong class="mt-2 block text-xl">' + money(totalAmount) + '</strong></div>' +
+      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-xs text-slate-500">已发生金额</span><strong class="mt-2 block text-xl">' + money(totalIncurred) + '</strong></div>' +
+    '</div>' +
+    modal +
+    '<div class="card p-4"><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-center font-semibold" style="width:200px">费用类型</th><th class="p-2 text-center font-semibold" style="width:200px">月份</th><th class="p-2 text-center font-semibold" style="width:200px">金额</th><th class="p-2 text-center font-semibold" style="width:200px">已发生金额</th><th class="p-2 text-center font-semibold" style="width:200px">费用说明</th></tr></thead><tbody>' + tableRows + '</tbody></table></div></div>' +
+  '</div>';
+
+  if (window.lucide) window.lucide.createIcons();
+}
+
+window.setExpenseView = function(v) { state.expenseView = v; renderExpense(); };
+window.setExpenseFilter = function(v) { state.expenseFilter = v; renderExpense(); };
+window.setExpenseMonth = function(v) { state.expenseMonth = v; renderExpense(); };
+window.setExpenseQuarter = function(v) { state.expenseQuarter = v; renderExpense(); };
+
+window.openExpenseModal = function() {
+  var form = document.querySelector("#expenseModal form");
+  form.reset();
+  form.querySelector('[name="expense_id"]').value = "";
+  document.querySelector("#expenseModalTitle").textContent = "新增费用";
+  document.querySelector("#expenseDeleteBtn").classList.add("hidden");
+  document.querySelector("#expenseModal").classList.remove("hidden");
+};
+
+window.closeExpenseModal = function() {
+  document.querySelector("#expenseModal").classList.add("hidden");
+};
+
+window.openExpenseEdit = function(id) {
+  var r = (state.data.expense || []).find(function(x) { return x.id === id; });
+  if (!r) return;
+  var form = document.querySelector("#expenseModal form");
+  form.reset();
+  var setVal = function(name, val) { var el = form.querySelector('[name="' + name + '"]'); if (el) el.value = val || ""; };
+  setVal("expense_id", r.id);
+  setVal("expense_type", r.expense_type);
+  setVal("expense_month", r.expense_month);
+  setVal("amount", r.amount);
+  setVal("incurred_amount", r.incurred_amount);
+  setVal("notes", r.notes);
+  document.querySelector("#expenseModalTitle").textContent = "编辑费用";
+  document.querySelector("#expenseDeleteBtn").classList.remove("hidden");
+  document.querySelector("#expenseModal").classList.remove("hidden");
+};
+
+window.saveExpense = async function(event) {
+  event.preventDefault();
+  var form = event.target;
+  var data = Object.fromEntries(new FormData(form).entries());
+  // 数字字段空值转 0，避免线上 MySQL 严格模式报错
+  if (data.amount === '' || data.amount === undefined) data.amount = 0;
+  if (data.incurred_amount === '' || data.incurred_amount === undefined) data.incurred_amount = 0;
+  var isEdit = !!data.expense_id;
+  delete data.expense_id;
+
+  var id = form.querySelector('[name="expense_id"]').value;
+  var url = isEdit ? "/api/expense/" + id : "/api/expense";
+  var method = isEdit ? "PUT" : "POST";
+
+  var resp = await fetch(url, { method: method, headers: { "Content-Type": "application/json" }, body: JSON.stringify({ data: Object.assign({}, data, { tenant: state.tenant }) }) });
+  if (!resp.ok) { var err = await resp.text(); alert("保存失败：" + err); return; }
+
+  var bResp = await fetch("/api/bootstrap?tenant=" + encodeURIComponent(state.tenant));
+  if (bResp.ok) {
+    var bd = await bResp.json();
+    state.data = bd;
+    applyUserTenants();
+    renderExpense();
+  }
+  closeExpenseModal();
+};
+
+window.deleteExpenseItem = async function() {
+  var id = document.querySelector("#expenseModal form [name='expense_id']").value;
+  if (!id || !confirm("确定删除？")) return;
+  var resp = await fetch("/api/expense/" + id, { method: "DELETE" });
+  if (!resp.ok) { alert("删除失败"); return; }
+  var bResp = await fetch("/api/bootstrap?tenant=" + encodeURIComponent(state.tenant));
+  if (bResp.ok) {
+    var bd = await bResp.json();
+    state.data = bd;
+    applyUserTenants();
+    renderExpense();
+  }
+};

static/modules/finance.js

@@ -1,6 +1,7 @@
 // finance.js — 经营管理（财务）模块
 
 const moneyInt = (v) => `${Math.round(Number(v || 0)).toLocaleString("zh-CN")} 元`;
+const moneyWan = (v) => `${(Number(v || 0) / 10000).toFixed(1)} 万`;
 
 function renderFinance() {
   const pfs = state.data.projectFinances || [];
@@ -24,11 +25,9 @@ function renderFinance() {
   const monthLabels = displayMonths.map(d => d.label);
 
   const signed = pfs.filter(x => x.status === "已签约");
-  const inContract = pfs.filter(x => x.status === "流程中");
     const pending = pfs.filter(x => x.status === "待签约");
   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));
-  const sumContract = Math.round(inContract.reduce((s,x) => s + (x.sign_amount||0), 0));
   
   const monthRev = months.map(m => {
     return signed.reduce((s, pf) => {
@@ -73,7 +72,7 @@ function renderFinance() {
       const budget = JSON.parse(pf.budget_data || "[]");
       budget.forEach(b => { budgetMap[(b.month || "").replace("-", "_")] = b; });
     } catch (e) {}
-    const isRevView = state.finView !== "cashflow" && state.finView !== "overview" && state.finView !== "monthly";
+    const isRevView = state.finView !== "cashflow" && state.finView !== "overview" && state.finView !== "monthly" && state.finView !== "quarterly";
     const mCols = months.map(m => {
       const b = budgetMap[m] || {};
       if (isRevView) {
@@ -98,54 +97,64 @@ function renderFinance() {
       }
     })();
     const sm = pf.sign_month || "";
-    const signMonthCell = `<td class="p-2 text-center 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">${esc(pf.customer_name)}</td><td class="p-2 text-sm text-center">${esc(pf.business_type)}</td><td class="p-2 text-sm text-center">${pf.status === "已签约" ? badge("已签约") : pf.status === "流程中" ? badge("流程中","blue") : badge("待签约","amber")}</td>${signMonthCell}<td class="p-2 text-center 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(); 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 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-xs text-slate-500 ml-2">月份：</span><select onchange="state.finMonth=this.value;renderFinance()" class="text-xs 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-xs text-slate-500 ml-2">季度：</span><select onchange="state.finQuarter=parseInt(this.value);localStorage.setItem(\'opc-fin-quarter\',this.value);renderFinance()" class="text-xs 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-xs text-slate-500">视图：</span><select onchange="setFinView(this.value)" class="text-xs 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><span class="text-xs text-slate-500 ml-3">状态：</span><select onchange="state.finFilter=this.value;renderFinance()" class="text-xs 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="已签约" ${state.finFilter==='已签约'?'selected':''}>已签约 (${pfs.filter(x=>x.status==='已签约').length})</option><option value="待签约" ${state.finFilter==='待签约'?'selected':''}>待签约 (${pfs.filter(x=>x.status==='待签约').length})</option></select>${toolDateSelect}`;
+  const finAddBtn = `<button class="btn btn-primary btn-sm" onclick="openFinanceModal()">新增财务项目</button>`;
+
   document.querySelector("#finance").innerHTML = `<div class="grid gap-4">
-    <div class="grid grid-cols-4 gap-3">
-      ${[["已签项目","" + signed.length,"file-check-2"],["签约金额",moneyInt(sumSign),"coins"],["待签项目","" + pending.length,"file-question"],["待签金额",moneyInt(sumPending),"hourglass"]].map(([l,v,icon]) => `<div class="metric-card"><span class="flex items-center gap-2 text-xs text-slate-500"><i data-lucide="${icon}" style="width:14px;height:14px"></i>${l}</span><strong class="mt-2 block text-2xl">${v}</strong></div>`).join("")}
-    </div>
-    <div class="grid grid-cols-5 gap-3">
-      ${[["本月确收",moneyInt(thisMonthRev),"trending-up"],["本月毛利",moneyInt(thisMonthGross),"percent"],["本月回款",moneyInt(monthPayment),"wallet"],["本月应付",moneyInt(monthCost),"receipt"],["本月现金流",moneyInt(monthCashflow),"repeat"]].map(([l,v,icon]) => `<div class="metric-card"><span class="flex items-center gap-2 text-xs text-slate-500"><i data-lucide="${icon}" style="width:14px;height:14px"></i>${l}</span><strong class="mt-2 block text-2xl">${v}</strong></div>`).join("")}
-    </div>
-    <div class="flex justify-between items-center"><div class="flex items-center gap-1" id="finViewToggle"><button class="btn btn-sm ${state.finView === 'overview' ? 'btn-primary' : 'btn-ghost'} px-2 py-1.5" data-view="overview" onclick="setFinView('overview')" title="总视图"><i data-lucide="layout-dashboard" style="width:16px;height:16px"></i><span class="text-xs ml-1">总视图</span></button><button class="btn btn-sm ${state.finView === 'monthly' ? 'btn-primary' : 'btn-ghost'} px-2 py-1.5" data-view="monthly" onclick="setFinView('monthly')" title="月度视图"><i data-lucide="calendar-days" style="width:16px;height:16px"></i><span class="text-xs ml-1">月度视图</span></button></div><button class="btn btn-primary btn-sm" onclick="openFinanceModal()"><i data-lucide="plus"></i>新增财务项目</button></div>
+    ${card(`<div class="flex justify-between items-center"><div class="flex items-center gap-2">${finHeaderBase}</div>${finAddBtn}</div>`, "p-3")}
     <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>
-    <button class="finance-tab" data-tab="budget" onclick="switchFinanceTab('budget')"><i data-lucide="calendar" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>月度流水</button>
+    <button class="finance-tab" data-tab="revpay" onclick="switchFinanceTab('revpay')"><i data-lucide="dollar-sign" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>确收与回款</button>
+    <button class="finance-tab" data-tab="cost" onclick="switchFinanceTab('cost')"><i data-lucide="receipt" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>费用明细</button>
+    <button class="finance-tab" data-tab="exec" onclick="switchFinanceTab('exec')"><i data-lucide="play-circle" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>执行信息</button>
     <button class="finance-tab" data-tab="tasks" onclick="switchFinanceTab('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="switchFinanceTab('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="createFinance(event)" class="p-8 grid gap-6" novalidate><input type="hidden" name="pf_id" id="pf-id-input" value="">
+<form onsubmit="createFinance(event)" class="finance-form" novalidate><input type="hidden" name="pf_id" id="pf-id-input" value="">
+<div class="finance-tab-body">
 <div id="financeTabInfo">
-  <div class="grid grid-cols-2 gap-5">
-    <div class="fin-field-group">
-      <p class="fin-section-label">项目信息</p>
   <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>
-        <div class="grid grid-cols-2 gap-3">
       <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><select name="business_type" class="form-ctrl bg-white">${fmTypes.map(t => `<option>${t}</option>`).join("")}</select></label>
-        </div>
       <label class="block"><span class="fin-label">项目名称 <span class="text-red-500">*</span></span><input name="customer_name" required class="form-ctrl" placeholder="请输入项目名称"></label>
     </div>
-    </div>
-    <div class="fin-field-group">
-      <p class="fin-section-label">合同信息</p>
-      <div class="grid gap-4">
+    <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>
-        <div class="grid grid-cols-2 gap-3">
       <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><option>待签约</option></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-2 gap-3">
+    <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>
       <label class="block"><span class="fin-label">经营负责人 <span class="text-red-500">*</span></span><input name="owner" required class="form-ctrl" placeholder="请输入经营负责人"></label>
+      <label class="block"><span class="fin-label">业务联系人</span><input name="contact_name" class="form-ctrl" placeholder="请输入业务联系人"></label>
     </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>
     </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>
-  </div>
-  <div class="fin-field-group mt-5">
+</div>
+<div id="financeTabExec" class="hidden">
+  <div class="fin-field-group">
     <p class="fin-section-label">执行信息</p>
     <div class="grid grid-cols-3 gap-4">
       <label class="block"><span class="fin-label">开始时间</span><input name="start_date" type="date" class="form-ctrl"></label>
@@ -155,34 +164,43 @@ function renderFinance() {
     </div>
   </div>
 </div>
-<div id="financeTabBudget" class="hidden">
-  <div class="grid grid-cols-5 gap-3 mb-4" id="budgetSummary">
+<div id="financeTabRevpay" class="hidden">
+  <div class="grid grid-cols-3 gap-3 mb-4" id="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="budgetTotalRev">¥0</p>
+      <p class="text-lg font-bold text-blue-700" id="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="budgetTotalGross">¥0</p>
+      <p class="text-lg font-bold text-green-700" id="revpayTotalGross">¥0</p>
     </div>
-    <div class="bg-amber-50 rounded-lg p-3 text-center border border-amber-100" id="budgetTotalPaymentCard">
+    <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="budgetTotalPayment">¥0</p>
+      <p class="text-lg font-bold text-amber-700" id="revpayTotalPayment">¥0</p>
     </div>
-    <div class="bg-rose-50 rounded-lg p-3 text-center border border-rose-100" id="budgetTotalCostCard">
-      <p class="text-xs text-rose-600 font-medium">总应付</p>
-      <p class="text-lg font-bold text-rose-700" id="budgetTotalCost">¥0</p>
+  </div>
+  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="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>
+  </table>
+  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addRevpayRow()"><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 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>
     </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="budgetTotalPaid">¥0</p>
+      <p class="text-lg font-bold text-purple-700" id="costTotalPaid">¥0</p>
     </div>
   </div>
-  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="budgetTable">
-    <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-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="budgetTbody"></tbody>
+  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="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>
   </table>
-  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addBudgetRow()"><i data-lucide="plus"></i>添加月份</button>
+  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addCostRow()"><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">
@@ -191,51 +209,174 @@ function renderFinance() {
   </table>
   <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addTaskRow()"><i data-lucide="plus"></i>添加任务</button>
 </div>
-<div class="flex justify-end gap-3 pt-2"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closeFinanceModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>
-    ${state.finView === 'monthly' ? (() => {
+<div id="financeTabActivity" class="hidden">
+  <div class="grid gap-2" id="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>
+      <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('italic')" title="斜体"><i data-lucide="italic"></i></button>
+      <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('underline')" title="下划线"><i data-lucide="underline"></i></button>
+      <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('strikethrough')" title="删除线"><i data-lucide="strikethrough"></i></button>
+      <span class="squire-sep"></span>
+      <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('makeUnorderedList')" title="无序列表"><i data-lucide="list"></i></button>
+      <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('makeOrderedList')" title="有序列表"><i data-lucide="list-ordered"></i></button>
+      <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('blockquote')" title="引用"><i data-lucide="quote"></i></button>
+      <span class="squire-sep"></span>
+      <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="comment-toolbar">
+      <span class="comment-hint">支持富文本编辑</span>
+      <button class="btn btn-primary btn-sm comment-submit" type="button" onclick="submitFinComment()">评论</button>
+    </div>
+  </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="closeFinanceModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>
+    ${(() => {
+      const METRIC_CARDS = [
+        { label: '签约金额', value: ctx => moneyWan(ctx.signTotal), color: 'text-slate-700' },
+        { label: '已确收', value: ctx => moneyWan(ctx.sumRev), color: 'text-blue-700' },
+        { label: '毛利', value: ctx => money(ctx.sumGross), color: 'text-green-700' },
+        { label: '成本', value: ctx => moneyWan(ctx.sumCost), color: 'text-rose-700' },
+        { label: '项目利润', value: ctx => { const v = ctx.sumGross; return { val: moneyWan(v), cls: v >= 0 ? 'text-green-600' : 'text-red-600' }; }, color: null },
+        { label: '已回款', value: ctx => moneyWan(ctx.sumPay), color: 'text-amber-700' },
+        { label: '已付', value: ctx => moneyWan(ctx.sumPaid), color: 'text-purple-700' },
+        { label: '现金流', value: ctx => { const v = ctx.sumPay - ctx.sumPaid; return { val: money(v), cls: v >= 0 ? 'text-green-600' : 'text-red-600' }; }, color: null },
+        { label: '执行率', value: ctx => ctx.sumRev && ctx.signTotal ? Math.round(ctx.sumRev / ctx.signTotal * 100) + '%' : '—', color: 'text-slate-500' },
+        { label: '毛利率', value: ctx => ctx.sumRev && ctx.sumGross ? Math.round(ctx.sumGross / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
+        { label: '回款率', value: ctx => ctx.sumRev && ctx.sumPay ? Math.round(ctx.sumPay / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
+        { label: '付款率', value: ctx => ctx.sumCost && ctx.sumPaid ? Math.round(ctx.sumPaid / ctx.sumCost * 100) + '%' : '—', color: 'text-slate-500' },
+      ];
+
+      const renderView = (rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, emptyText) => {
+        const ctx = { sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt };
+        const cards = METRIC_CARDS.map(c => {
+          const v = c.value(ctx);
+          return typeof v === 'object' ? [c.label, v.val, v.cls] : [c.label, v, c.color];
+        });
+        const thead = '<thead><tr class="bg-slate-50 border-b border-slate-200">' +
+          '<th class="p-2 text-center font-semibold align-middle">项目名称</th>' +
+          '<th class="p-2 text-center font-semibold align-middle">状态</th>' +
+          '<th class="p-2 text-center font-semibold align-middle">签约金额</th>' +
+          '<th class="p-2 text-center font-semibold align-middle text-blue-600">已确收</th>' +
+          '<th class="p-2 text-center font-semibold align-middle">毛利</th>' +
+          '<th class="p-2 text-center font-semibold align-middle text-rose-600">成本</th>' +
+          '<th class="p-2 text-center font-semibold align-middle">项目利润</th>' +
+          '<th class="p-2 text-center font-semibold align-middle text-amber-600">已回款</th>' +
+          '<th class="p-2 text-center font-semibold align-middle text-purple-600">已付</th>' +
+          '<th class="p-2 text-center font-semibold align-middle text-slate-700">现金流</th>' +
+          '<th class="p-2 text-center font-semibold align-middle">执行率</th>' +
+          '<th class="p-2 text-center font-semibold align-middle">毛利率</th>' +
+          '<th class="p-2 text-center font-semibold align-middle">回款率</th>' +
+          '<th class="p-2 text-center font-semibold align-middle">付款率</th>' +
+          '</tr></thead>';
+        const tbody = rows.length ? `<tbody>${rows.join("")}</tbody>` : `<tr><td colspan="15" class="p-6 text-center text-slate-400">${emptyText}</td></tr>`;
+
+        return card(`<div class="grid grid-cols-6 gap-3 mb-3">${cards.map(([l, v, c]) => '<div class="metric-card p-3"><span class="flex items-center gap-2 text-xs 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">合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流 → 执行率 → 毛利率 → 回款率 → 付款率</p><div class="overflow-x-auto"><table class="w-full text-sm">${thead}${tbody}</table></div>`, "p-4");
+      };
+
+      const fmtNoUnit = (v) => v ? `<span class="font-medium">${Number(v||0).toLocaleString('zh-CN')}</span>` : '<span class="text-slate-300">—</span>';
+      const tdRow = (pf, rev, payment, cost, paid, gross) => {
+        const cashflow = payment - paid;
+        const exe = rev && pf.sign_amount ? Math.round(rev / pf.sign_amount * 100) + '%' : '<span class="text-slate-300">—</span>';
+        const payR = rev && payment ? Math.round(payment / rev * 100) + '%' : '<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 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>`;
+      };
+
+      if (state.finView === 'monthly') {
         const allPfs = pfs.filter(x => x.status === state.finFilter);
         const now = new Date();
-      const defaultMonth = now.getFullYear() + "-" + String(now.getMonth()+1).padStart(2,"0");
+        const defaultMonth = now.getFullYear() + "-" + String(now.getMonth() + 1).padStart(2, "0");
         if (!state.finMonth) state.finMonth = defaultMonth;
         const selMonth = state.finMonth;
-      // 收集所有有数据的月份 + 当前月
-      const monthSet = new Set([defaultMonth]);
-      allPfs.forEach(pf => { let bd = []; try { bd = JSON.parse(pf.budget_data || "[]"); } catch(e) {} bd.forEach(b => { if (b.month) monthSet.add(b.month); }); });
-      const sortedMonths = [...monthSet].sort().reverse();
-      const monthOpts = sortedMonths.map(m => `<option value="${m}" ${m === selMonth ? 'selected' : ''}>${m}</option>`).join("");
-      const fmt = (v) => v ? `<span class="font-medium">${money(v)}</span>` : '<span class="text-slate-300">—</span>';
-      const fmtDiff = (v) => { if (!v) return '<span class="text-slate-300">—</span>'; return `<span class="${v > 0 ? 'text-amber-600 font-medium' : 'text-green-600 font-medium'}">${money(Math.abs(v))}</span>`; };
         const rows = [];
-      let sumRev=0, sumPay=0, sumCost=0, sumPaid=0;
+        let sumRev = 0, sumPay = 0, sumCost = 0, sumPaid = 0, sumGross = 0;
         allPfs.forEach(pf => {
-        let bd = []; try { bd = JSON.parse(pf.budget_data || "[]"); } catch(e) {}
-        const b = bd.find(x => (x.month||"") === selMonth) || {};
-        const rev = Math.round(parseFloat(b.rev||0)||0);
-        const payment = Math.round(parseFloat(b.payment||0)||0);
-        const cost = Math.round(parseFloat(b.cost||0)||0);
-        const paid = Math.round(parseFloat(b.paid||0)||0);
-        if (!rev && !payment && !cost && !paid) return;
-        const payDiff = rev - payment;
-        const costDiff = cost - paid;
-        const cashflow = payment - paid;
-        sumRev+=rev; sumPay+=payment; sumCost+=cost; sumPaid+=paid;
-        rows.push(`<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">${esc(pf.customer_name)}</td><td class="p-2 text-sm text-center text-slate-500">${esc(pf.business_type)}</td><td class="p-2 text-sm text-center">${pf.status === '已签约' ? badge('已签约') : pf.status === '流程中' ? badge('流程中','blue') : badge('待签约','amber')}</td><td class="p-2 text-center text-blue-700 align-middle">${fmt(rev)}</td><td class="p-2 text-center text-amber-700 align-middle">${fmt(payment)}</td><td class="p-2 text-center align-middle">${fmtDiff(payDiff)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmt(cost)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmt(paid)}</td><td class="p-2 text-center align-middle">${fmtDiff(costDiff)}</td><td class="p-2 text-center font-semibold align-middle ${cashflow >= 0 ? 'text-green-600' : 'text-red-600'}">${cashflow ? money(cashflow) : '<span class="text-slate-300">—</span>'}</td></tr>`);
+          let bd = []; try { bd = JSON.parse(pf.budget_data || "[]"); } catch (e) {}
+          let ed = []; try { ed = JSON.parse(pf.expense_data || "[]"); } catch (e) {}
+          const b = bd.find(x => (x.month || "") === selMonth) || {};
+          const e = ed.find(x => (x.month || "") === selMonth) || {};
+          const rev = Math.round(parseFloat(b.rev || 0) || 0);
+          const payment = Math.round(parseFloat(b.payment || 0) || 0);
+          const gross = Math.round(parseFloat(b.gross || 0) || 0);
+          const cost = Math.round(parseFloat(e.cost || 0) || 0);
+          const paid = Math.round(parseFloat(e.paid || 0) || 0);
+          if (!rev && !payment && !cost && !paid && !gross) return;
+          sumRev += rev; sumPay += payment; sumCost += cost; sumPaid += paid; sumGross += gross;
+          rows.push(tdRow(pf, rev, payment, cost, paid, gross));
         });
-      return card(`<div class="flex items-center justify-between mb-3"><h3 class="font-bold text-slate-700">月度视图 <span class="text-slate-400 font-normal">(${allPfs.length} 项目)</span></h3></div><div class="flex items-center justify-between mb-3"><div class="flex gap-2">${[["已签约","已签约"],["流程中","流程中"],["待签约","待签约"]].map(([k,v]) => `<button class="btn btn-sm ${state.finFilter === k ? 'btn-primary' : 'btn-ghost'}" onclick="state.finFilter='${k}';renderFinance()">${v} (${pfs.filter(x=>x.status===k).length})</button>`).join("")}</div><label class="inline-flex items-center gap-1 text-sm text-slate-500 cursor-pointer relative"><i data-lucide="calendar" style="width:14px;height:14px"></i><select onchange="state.finMonth=this.value;renderFinance()" class="bg-transparent border-0 text-sm text-slate-600 font-medium cursor-pointer" style="appearance:none;-webkit-appearance:none;-moz-appearance:none;outline:none;background-image:none;padding-right:4px">${monthOpts}</select></label></div><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-center font-semibold align-middle">项目名称</th><th class="p-2 text-center font-semibold align-middle">类型</th><th class="p-2 text-center font-semibold align-middle">状态</th><th class="p-2 text-center font-semibold align-middle text-blue-600">已确收</th><th class="p-2 text-center font-semibold align-middle text-amber-600">已回款</th><th class="p-2 text-center font-semibold align-middle">回款差额</th><th class="p-2 text-center font-semibold align-middle text-rose-600">应付</th><th class="p-2 text-center font-semibold align-middle text-purple-600">已付</th><th class="p-2 text-center font-semibold align-middle">应付差额</th><th class="p-2 text-center font-semibold align-middle text-slate-700">现金流</th></tr></thead><tbody>${rows.length ? rows.join("") : '<tr><td colspan="10" class="p-6 text-center text-slate-400">该月份暂无数据</td></tr>'}<tr class="border-t-2 border-slate-200 bg-slate-50 font-bold"><td class="p-2 text-center" colspan="3">合计</td><td class="p-2 text-center text-blue-700 align-middle">${money(sumRev)}</td><td class="p-2 text-center text-amber-700 align-middle">${money(sumPay)}</td><td class="p-2 text-center align-middle">${fmtDiff(sumRev - sumPay)}</td><td class="p-2 text-center text-rose-700 align-middle">${money(sumCost)}</td><td class="p-2 text-center text-purple-700 align-middle">${money(sumPaid)}</td><td class="p-2 text-center align-middle">${fmtDiff(sumCost - sumPaid)}</td><td class="p-2 text-center font-semibold align-middle ${sumPay - sumPaid >= 0 ? 'text-green-600' : 'text-red-600'}">${money(sumPay - sumPaid)}</td></tr></tbody></table></div>`, "p-4");
-    })() : (() => {
+        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;
+        return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '该月份暂无数据');
+      }
+
+      if (state.finView === 'quarterly') {
+        const allPfs = pfs.filter(x => x.status === state.finFilter);
+        const qRanges = [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10, 11, 12]];
+        const now = new Date();
+        if (state.finQuarter === undefined) {
+          const saved = localStorage.getItem("opc-fin-quarter");
+          state.finQuarter = saved !== null ? parseInt(saved) : Math.floor(now.getMonth() / 3);
+        }
+        const selQ = state.finQuarter;
+        const qRange = qRanges[selQ];
+        const sumBudget = (pf, field) => {
+          let total = 0;
+          try { JSON.parse(pf.budget_data || "[]").forEach(b => { const m = parseInt((b.month || "").substring(5)) || 0; if (qRange.includes(m)) total += parseFloat(b[field] || 0); }); } catch (e) {}
+          return total;
+        };
+        const sumExpense = (pf, field) => {
+          let total = 0;
+          try { JSON.parse(pf.expense_data || "[]").forEach(e => { const m = parseInt((e.month || "").substring(5)) || 0; if (qRange.includes(m)) total += parseFloat(e[field] || 0); }); } catch (e) {}
+          return total;
+        };
+        let sumRev = 0, sumPay = 0, sumCost = 0, sumPaid = 0, sumGross = 0;
+        const rows = [];
+        allPfs.forEach(pf => {
+          const rev = sumBudget(pf, "rev");
+          const payment = sumBudget(pf, "payment");
+          const gross = sumBudget(pf, "gross");
+          const cost = sumExpense(pf, "cost");
+          const paid = sumExpense(pf, "paid");
+          sumRev += rev; sumPay += payment; sumCost += cost; sumPaid += paid; sumGross += gross;
+          rows.push(tdRow(pf, rev, payment, cost, paid, 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;
+        return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '该季度暂无数据');
+      }
+
+      // 总视图
       const calcTotals = (pf) => {
         let budget = []; try { budget = JSON.parse(pf.budget_data || "[]"); } catch (e) {}
-        let rev = 0, payment = 0, cost = 0;
-        budget.forEach(b => { rev += parseFloat(b.rev||0)||0; payment += parseFloat(b.payment||0)||0; cost += parseFloat(b.cost||0)||0; });
-        const paid = parseFloat(pf.total_paid) || 0;
-        return { rev: Math.round(rev), payment: Math.round(payment), cost: Math.round(cost), paid: Math.round(paid) };
+        let expense = []; try { expense = JSON.parse(pf.expense_data || "[]"); } catch (e) {}
+        let rev = 0, payment = 0, gross = 0;
+        budget.forEach(b => { rev += parseFloat(b.rev || 0) || 0; gross += parseFloat(b.gross || 0) || 0; payment += parseFloat(b.payment || 0) || 0; });
+        let cost = 0, paid = 0;
+        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);
-      let sumRev=0, sumPay=0, sumCost=0, sumPaid=0;
-      allPfs.forEach(pf => { const t = calcTotals(pf); sumRev+=t.rev; sumPay+=t.payment; sumCost+=t.cost; sumPaid+=t.paid; });
-      const fmt = (v) => v ? `<span class="font-medium">${money(v)}</span>` : '<span class="text-slate-300">—</span>';
-      const fmtDiff = (v) => { if (!v) return '<span class="text-slate-300">—</span>'; return `<span class="${v > 0 ? 'text-amber-600 font-medium' : 'text-green-600 font-medium'}">${money(Math.abs(v))}</span>`; };
-      return card(`<div class="flex items-center justify-between mb-3"><h3 class="font-bold text-slate-700">总视图 <span class="text-slate-400 font-normal">(${allPfs.length})</span></h3></div><div class="flex gap-2 mb-3">${[["已签约","已签约"],["流程中","流程中"],["待签约","待签约"]].map(([k,v]) => `<button class="btn btn-sm ${state.finFilter === k ? 'btn-primary' : 'btn-ghost'}" onclick="state.finFilter='${k}';renderFinance()">${v} (${pfs.filter(x=>x.status===k).length})</button>`).join("")}</div><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-center font-semibold align-middle">项目名称</th><th class="p-2 text-center font-semibold align-middle">类型</th><th class="p-2 text-center font-semibold align-middle">状态</th><th class="p-2 text-center font-semibold align-middle text-blue-600">已确收</th><th class="p-2 text-center font-semibold align-middle text-amber-600">已回款</th><th class="p-2 text-center font-semibold align-middle">回款差额</th><th class="p-2 text-center font-semibold align-middle text-rose-600">应付</th><th class="p-2 text-center font-semibold align-middle text-purple-600">已付</th><th class="p-2 text-center font-semibold align-middle">应付差额</th><th class="p-2 text-center font-semibold align-middle text-slate-700">现金流</th></tr></thead><tbody>${allPfs.map(pf => { const t = calcTotals(pf); const payDiff = t.rev - t.payment; const costDiff = t.cost - t.paid; const cashflow = t.payment - t.paid; 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">${esc(pf.customer_name)}</td><td class="p-2 text-sm text-center text-slate-500">${esc(pf.business_type)}</td><td class="p-2 text-sm text-center">${pf.status === '已签约' ? badge('已签约') : pf.status === '流程中' ? badge('流程中','blue') : badge('待签约','amber')}</td><td class="p-2 text-center text-blue-700 align-middle">${fmt(t.rev)}</td><td class="p-2 text-center text-amber-700 align-middle">${fmt(t.payment)}</td><td class="p-2 text-center align-middle">${fmtDiff(payDiff)}</td><td class="p-2 text-center text-rose-700 align-middle">${fmt(t.cost)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmt(t.paid)}</td><td class="p-2 text-center align-middle">${fmtDiff(costDiff)}</td><td class="p-2 text-center font-semibold align-middle ${cashflow >= 0 ? 'text-green-600' : 'text-red-600'}">${cashflow ? money(cashflow) : '<span class="text-slate-300">—</span>'}</td></tr>`; }).join("")}<tr class="border-t-2 border-slate-200 bg-slate-50 font-bold"><td class="p-2 text-center" colspan="3">合计</td><td class="p-2 text-center text-blue-700 align-middle">${money(sumRev)}</td><td class="p-2 text-center text-amber-700 align-middle">${money(sumPay)}</td><td class="p-2 text-center align-middle">${fmtDiff(sumRev - sumPay)}</td><td class="p-2 text-center text-rose-700 align-middle">${money(sumCost)}</td><td class="p-2 text-center text-purple-700 align-middle">${money(sumPaid)}</td><td class="p-2 text-center align-middle">${fmtDiff(sumCost - sumPaid)}</td><td class="p-2 text-center font-semibold align-middle ${sumPay - sumPaid >= 0 ? 'text-green-600' : 'text-red-600'}">${money(sumPay - sumPaid)}</td></tr></tbody></table></div>`, "p-4");
+      let sumRev = 0, sumPay = 0, sumCost = 0, sumPaid = 0, sumGross = 0;
+      const rows = [];
+      allPfs.forEach(pf => {
+        const t = calcTotals(pf);
+        sumRev += t.rev; sumPay += t.payment; sumCost += t.cost; sumPaid += t.paid; sumGross += t.gross;
+        rows.push(tdRow(pf, t.rev, t.payment, t.cost, t.paid, t.gross));
+      });
+      const signTotal = Math.round(allPfs.reduce((a, p) => a + (p.sign_amount || 0), 0));
+      const signCnt = allPfs.filter(x => x.status === "已签约").length;
+      return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '暂无数据');
     })()}
   </div>`;
   if (window.lucide) window.lucide.createIcons();
@@ -249,64 +390,92 @@ window.openFinanceModal = () => {
   if (dept) dept.value = state.tenant;
   const pfIdInput = form.querySelector('[name="pf_id"]');
   if (!pfIdInput || !pfIdInput.value) {
-    initBudgetTable(null);
+    initRevpayTable(null);
+    initCostTable(null);
     initTaskTable(null);
     document.querySelector("#financeDeleteBtn").classList.add("hidden");
   }
   modal.classList.remove("hidden");
 };
 
-window.addBudgetRow = (month = '', rev = '', gross = '', payment = '', cost = '', paid = '') => {
-  const tbody = document.querySelector("#budgetTbody");
+window.addRevpayRow = (month = '', rev = '', gross = '', payment = '', rev_note = '') => {
+  const tbody = document.querySelector("#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="updateBudgetSummary()">${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="updateBudgetSummary()"></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="updateBudgetSummary()"></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="updateBudgetSummary()"></td>
-    <td><input name="budget_cost[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${cost}" oninput="updateBudgetSummary()"></td>
-    <td><input name="budget_paid[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${paid}" oninput="updateBudgetSummary()"></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();updateBudgetSummary()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
+  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>
+    <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>`;
   tbody.appendChild(row);
   if (window.lucide) window.lucide.createIcons();
 };
 
-window.updateBudgetSummary = () => {
-  const revEl = document.querySelector("#budgetTotalRev");
-  const grossEl = document.querySelector("#budgetTotalGross");
-  const paymentEl = document.querySelector("#budgetTotalPayment");
-  const costEl = document.querySelector("#budgetTotalCost");
-  const paidEl = document.querySelector("#budgetTotalPaid");
-  if (!revEl || !grossEl) return;
+window.addCostRow = (month = '', expense_type = '', cost = '', paid = '', exp_note = '') => {
+  const tbody = document.querySelector("#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>
+    <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_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>`;
+  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");
+  if (!revEl || !paymentEl) return;
   const revInputs = document.querySelectorAll('[name="budget_rev[]"]');
   const grossInputs = document.querySelectorAll('[name="budget_gross[]"]');
   const paymentInputs = document.querySelectorAll('[name="budget_payment[]"]');
-  const costInputs = document.querySelectorAll('[name="budget_cost[]"]');
-  const paidInputs = document.querySelectorAll('[name="budget_paid[]"]');
-  let totalRev = 0, totalGross = 0, totalPayment = 0, totalCost = 0, totalPaid = 0;
+  let totalRev = 0, totalGross = 0, totalPayment = 0;
   revInputs.forEach(el => { totalRev += parseFloat(el.value) || 0; });
   grossInputs.forEach(el => { totalGross += parseFloat(el.value) || 0; });
   paymentInputs.forEach(el => { totalPayment += parseFloat(el.value) || 0; });
-  costInputs.forEach(el => { totalCost += parseFloat(el.value) || 0; });
-  paidInputs.forEach(el => { totalPaid += parseFloat(el.value) || 0; });
   revEl.textContent = money(totalRev);
-  grossEl.textContent = money(totalGross);
-  if (paymentEl) paymentEl.textContent = money(totalPayment);
-  if (costEl) costEl.textContent = money(totalCost);
-  if (paidEl) paidEl.textContent = money(totalPaid);
+  if (grossEl) grossEl.textContent = money(totalGross);
+  paymentEl.textContent = money(totalPayment);
 };
 
-window.initBudgetTable = (budgetData) => {
-  const tbody = document.querySelector("#budgetTbody");
+window.updateCostSummary = () => {
+  const costEl = document.querySelector("#costTotalCost");
+  const paidEl = document.querySelector("#costTotalPaid");
+  if (!costEl || !paidEl) return;
+  const costInputs = document.querySelectorAll('[name="expense_cost[]"]');
+  const paidInputs = document.querySelectorAll('[name="expense_paid[]"]');
+  let totalCost = 0, totalPaid = 0;
+  costInputs.forEach(el => { totalCost += parseFloat(el.value) || 0; });
+  paidInputs.forEach(el => { totalPaid += parseFloat(el.value) || 0; });
+  costEl.textContent = money(totalCost);
+  paidEl.textContent = money(totalPaid);
+};
+
+window.initRevpayTable = (budgetData) => {
+  const tbody = document.querySelector("#revpayTbody");
   if (!tbody) return;
   tbody.innerHTML = "";
   const rows = budgetData || [];
-  rows.forEach(r => addBudgetRow(r.month || '', r.rev || '', r.gross || '', r.payment || '', r.cost || '', r.paid || ''));
-  setTimeout(() => updateBudgetSummary(), 50);
+  rows.forEach(r => addRevpayRow(r.month || '', r.rev || '', r.gross || '', r.payment || '', r.rev_note || ''));
+  setTimeout(() => updateRevpaySummary(), 50);
+};
+
+window.initCostTable = (expenseData) => {
+  const tbody = document.querySelector("#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);
 };
 
 // ---------- 任务管理 tab ----------
-const TASK_TYPES = ["科普视频", "科普专访", "科普文章"];
+const TASK_TYPES = ["科普视频", "科普专访", "科普文章", "问卷调研", "病例征集"];
 
 function taskMonthOptions(selected) {
   const now = new Date();
@@ -324,8 +493,12 @@ window.addTaskRow = (taskMonth = '', taskType = '', taskCount = '', executedCoun
   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>
-    <td><select name="task_type[]" class="form-ctrl form-ctrl-sm w-full" onchange="updateTaskDiff(this)"><option value="">选择</option>${TASK_TYPES.map(t => `<option ${t === taskType ? 'selected' : ''}>${t}</option>`).join("")}</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_diff[]" type="number" class="form-ctrl form-ctrl-sm text-right" style="width:80px" placeholder="—" disabled></td>
@@ -365,6 +538,14 @@ function updateRowCalc(row) {
   unexecAmtInput.value = unexecAmt ? unexecAmt.toFixed(2) : '';
 }
 
+window.toggleBtChip = (chip) => {
+  const cb = chip.querySelector('input');
+  cb.checked = !cb.checked;
+  chip.classList.toggle('bg-blue-50', cb.checked);
+  chip.classList.toggle('border-blue-400', cb.checked);
+  chip.classList.toggle('text-blue-600', cb.checked);
+};
+
 window.initTaskTable = (taskData) => {
   const tbody = document.querySelector("#taskTbody");
   if (!tbody) return;
@@ -373,6 +554,21 @@ window.initTaskTable = (taskData) => {
   rows.forEach(r => addTaskRow(r.task_month || '', r.task_type || '', r.task_count || '', r.task_executed || '', r.unit_price || ''));
 };
 
+window.onTaskTypeChange = (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>`;
+  if (window.lucide) window.lucide.createIcons();
+  td.querySelector('input').focus();
+};
+
+window.revertTaskType = (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>`;
+  if (window.lucide) window.lucide.createIcons();
+};
+
 window.closeFinanceModal = () => {
   const modal = document.querySelector("#financeModal");
   modal.classList.add("hidden");
@@ -408,8 +604,65 @@ window.editPfSignMonth = (event, pfId) => {
 window.switchFinanceTab = (tab) => {
   document.querySelectorAll(".finance-tab").forEach(b => b.classList.toggle("active", b.dataset.tab === tab));
   document.querySelector("#financeTabInfo").classList.toggle("hidden", tab !== "info");
-  document.querySelector("#financeTabBudget").classList.toggle("hidden", tab !== "budget");
+  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(".finance-form-actions").classList.toggle("hidden", tab === "activity");
+  if (tab === "activity") initFinSquire();
+};
+
+// ---------- 活动与跟进 ----------
+
+async function loadFinFollowups(pfId) {
+  const list = document.querySelector("#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("")
+      : '<p class="text-sm text-slate-400 py-4 text-center">暂无跟进记录</p>';
+    if (window.lucide) window.lucide.createIcons();
+    list.querySelectorAll(".rich-content").forEach(el => {
+      const html = el.dataset.html;
+      if (html) el.innerHTML = decodeURIComponent(html);
+    });
+  } catch (e) { /* ignore */ }
+}
+
+function initFinSquire() {
+  const ed = document.querySelector("#squire_finance");
+  if (!ed || !window.Squire) return;
+  if (window.squireInstances["squire_finance"]) { window.squireInstances["squire_finance"].destroy(); }
+  const sq = new Squire(ed, { blockTag: "P" });
+  window.squireInstances["squire_finance"] = sq;
+  ed.addEventListener("focus", () => ed.classList.add("focused"));
+  ed.addEventListener("blur", () => { if (!ed.textContent.trim()) ed.classList.remove("focused"); });
+}
+
+window.submitFinComment = async () => {
+  const pfId = document.querySelector("#pf-id-input").value;
+  if (!pfId) return;
+  const sq = window.squireInstances["squire_finance"];
+  const content = sq ? sq.getHTML().trim() : "";
+  if (!content || content === "<div><br></div>" || content === "<p><br></p>") return;
+  const btn = document.querySelector("#financeTabActivity .comment-submit");
+  btn.disabled = true;
+  btn.textContent = "发送中…";
+  await api(`/api/followups/project_finance/${pfId}`, { method: "POST", body: JSON.stringify({ data: { content } }) });
+  sq.setHTML("");
+  btn.disabled = false;
+  btn.textContent = "评论";
+  await loadFinFollowups(pfId);
+};
+
+window.deleteFinFollowup = 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);
 };
 
 window.openPfEditModal = (pfId) => {
@@ -422,7 +675,17 @@ window.openPfEditModal = (pfId) => {
   form.querySelector('[name="project_id"]').value = pf.project_id || "";
   const deptDisplay = form.querySelector('.bg-slate-50 [disabled]');
   if (deptDisplay) deptDisplay.value = pf.project_id || "";
-  form.querySelector('[name="business_type"]').value = pf.business_type || "";
+  // 回填业务类型多选
+  const btValues = (pf.business_type || "").split(/[,，]/).map(s => s.trim()).filter(Boolean);
+  form.querySelectorAll('[name="business_type[]"]').forEach(cb => {
+    cb.checked = btValues.includes(cb.value);
+    const chip = cb.closest('.bt-chip');
+    if (chip) {
+      chip.classList.toggle('bg-blue-50', cb.checked);
+      chip.classList.toggle('border-blue-400', cb.checked);
+      chip.classList.toggle('text-blue-600', cb.checked);
+    }
+  });
   form.querySelector('[name="customer_name"]').value = pf.customer_name || "";
   const setVal = (name, val) => { const el = form.querySelector(`[name="${name}"]`); if (el) el.value = val || ""; };
   setVal("project_code", pf.project_code);
@@ -442,13 +705,20 @@ window.openPfEditModal = (pfId) => {
   setVal("task_count", pf.task_count);
   setVal("service_fee_standard", pf.service_fee_standard || 5);
   setVal("project_manager", pf.project_manager);
+  setVal("contact_name", pf.contact_name);
+  setVal("contact_phone", pf.contact_phone);
+  setVal("other_info", pf.other_info);
   let budgetData = [];
   try { budgetData = JSON.parse(pf.budget_data || "[]"); } catch (e) { budgetData = []; }
-  initBudgetTable(budgetData.length ? budgetData : null);
+  initRevpayTable(budgetData.length ? budgetData : null);
+  let expenseData = [];
+  try { expenseData = JSON.parse(pf.expense_data || "[]"); } catch (e) { expenseData = []; }
+  initCostTable(expenseData.length ? expenseData : null);
   let taskData = [];
   try { taskData = JSON.parse(pf.task_data || "[]"); } catch (e) { taskData = []; }
   initTaskTable(taskData.length ? taskData : null);
   setTimeout(() => updateBudgetSummary(), 100);
+  loadFinFollowups(pf.id);
   openFinanceModal();
 };
 
@@ -456,6 +726,9 @@ window.createFinance = async (event) => {
   event.preventDefault();
   const form = event.currentTarget;
   const data = Object.fromEntries(new FormData(form).entries());
+  // 业务类型多选：合并为逗号分隔
+  const btChecked = form.querySelectorAll('[name="business_type[]"]:checked');
+  data.business_type = Array.from(btChecked).map(cb => cb.value).join(",");
   data.tenant = state.tenant;
   // 必填校验
   if (!data.customer_name || !data.customer_name.trim()) { toast("项目名称必填", "error"); return; }
@@ -468,31 +741,50 @@ window.createFinance = async (event) => {
   const revs = form.querySelectorAll('[name="budget_rev[]"]');
   const grosses = form.querySelectorAll('[name="budget_gross[]"]');
   const payments = form.querySelectorAll('[name="budget_payment[]"]');
-  const costs = form.querySelectorAll('[name="budget_cost[]"]');
-  const paids = form.querySelectorAll('[name="budget_paid[]"]');
+  const revNotes = form.querySelectorAll('[name="budget_rev_note[]"]');
   const budgetRows = [];
-  let totalRev = 0, totalGross = 0, totalPaidFromBudget = 0;
+  let totalRev = 0, totalGross = 0, totalPayment = 0;
   for (let i = 0; i < months.length; i++) {
     const m = months[i].value.trim();
     if (!m) continue;
     const rev = parseFloat(revs[i].value) || 0;
     const gross = parseFloat(grosses[i].value) || 0;
     const payment = parseFloat(payments[i].value) || 0;
-    const cost = parseFloat(costs[i].value) || 0;
-    const paid = parseFloat(paids[i].value) || 0;
-    budgetRows.push({ month: m, rev, gross, payment, cost, paid });
+    const rev_note = (revNotes[i] ? revNotes[i].value : '') || '';
+    budgetRows.push({ month: m, rev, gross, payment, rev_note });
     totalRev += rev;
     totalGross += gross;
-    totalPaidFromBudget += paid;
+    totalPayment += payment;
   }
   data.budget_data = JSON.stringify(budgetRows);
   data.total_rev = totalRev;
   data.total_gross = totalGross;
-  data.total_paid = totalPaidFromBudget;
-  let totalPayment = 0, totalCost = 0;
-  for (const r of budgetRows) { totalPayment += r.payment; totalCost += r.cost; }
   data.total_payment = totalPayment;
+
+  // 费用明细数据
+  const expMonths = form.querySelectorAll('[name="expense_month[]"]');
+  const expTypes = form.querySelectorAll('[name="expense_type[]"]');
+  const expCosts = form.querySelectorAll('[name="expense_cost[]"]');
+  const expPaids = form.querySelectorAll('[name="expense_paid[]"]');
+  const expNotes = form.querySelectorAll('[name="expense_note[]"]');
+  const expenseRows = [];
+  let totalCost = 0, totalPaid = 0;
+  for (let i = 0; i < expMonths.length; i++) {
+    const m = expMonths[i].value.trim();
+    if (!m) continue;
+    const expense_type = (expTypes[i] ? expTypes[i].value : '') || '';
+    const cost = parseFloat(expCosts[i].value) || 0;
+    const paid = parseFloat(expPaids[i].value) || 0;
+    const exp_note = (expNotes[i] ? expNotes[i].value : '') || '';
+    expenseRows.push({ month: m, expense_type, cost, paid, exp_note });
+    totalCost += cost;
+    totalPaid += paid;
+  }
+  data.expense_data = JSON.stringify(expenseRows);
+  data.total_paid = totalPaid;
   data.total_cost = totalCost;
+  for (const r of budgetRows) { totalPayment += r.payment; }
+  data.total_payment = totalPayment;
   // 收集任务管理数据
   const taskTypeInputs = form.querySelectorAll('[name="task_type[]"]');
   const taskCountInputs = form.querySelectorAll('[name="task_count[]"]');

static/modules/home.js

@@ -6,45 +6,151 @@ function renderHome() {
   const moneyInt = (v) => `${Math.round(Number(v || 0)).toLocaleString("zh-CN")} 元`;
   const rows1 = [
     ["年度累计", moneyInt(m.signed_annual || m.signed_amount)],
-    ["季度累计", moneyInt(m.signed_q2 || 0)],
-    ["本月新增", moneyInt(m.signed_month || 0)],
+    ["本季度累计", moneyInt(m.signed_q2 || 0)],
+    ["本月累计", moneyInt(m.signed_month || 0)],
+    ["上本季度累计", moneyInt(m.signed_prev_q || 0)],
+    ["上月累计", moneyInt(m.signed_prev_month || 0)],
   ];
   const rows2 = [
     ["年度累计", moneyInt(m.revenue_annual)],
-    ["季度累计", moneyInt(m.revenue_q2)],
-    ["本月新增", moneyInt(m.monthly_revenue)],
+    ["本季度累计", moneyInt(m.revenue_q2)],
+    ["本月累计", moneyInt(m.monthly_revenue)],
+    ["上本季度累计", moneyInt(m.revenue_prev_q || 0)],
+    ["上月累计", moneyInt(m.revenue_prev_month || 0)],
   ];
   const rows3 = [
     ["年度累计", moneyInt(m.gross_annual)],
-    ["季度累计", moneyInt(m.gross_q2)],
-    ["本月新增", moneyInt(m.monthly_net_profit)],
+    ["本季度累计", moneyInt(m.gross_q2)],
+    ["本月累计", moneyInt(m.monthly_net_profit)],
+    ["上本季度累计", moneyInt(m.gross_prev_q || 0)],
+    ["上月累计", moneyInt(m.gross_prev_month || 0)],
   ];
   const rows4 = [
     ["年度累计", moneyInt(m.payment_annual || 0)],
-    ["季度累计", moneyInt(m.payment_q2 || 0)],
-    ["本月新增", moneyInt(m.payment_month || 0)],
+    ["本季度累计", moneyInt(m.payment_q2 || 0)],
+    ["本月累计", moneyInt(m.payment_month || 0)],
+    ["上本季度累计", moneyInt(m.payment_prev_q || 0)],
+    ["上月累计", moneyInt(m.payment_prev_month || 0)],
   ];
   const rows5 = [
     ["年度累计", moneyInt(m.cost_annual || 0)],
-    ["季度累计", moneyInt(m.cost_q2 || 0)],
-    ["本月新增", moneyInt(m.cost_month || 0)],
+    ["本季度累计", moneyInt(m.cost_q2 || 0)],
+    ["本月累计", moneyInt(m.cost_month || 0)],
+    ["上本季度累计", moneyInt(m.cost_prev_q || 0)],
+    ["上月累计", moneyInt(m.cost_prev_month || 0)],
   ];
-const tblCard = (title, rows) => card(`<h3 class="text-sm font-bold text-slate-700 mb-3">${title}</h3><table class="w-full text-sm"><tbody>${rows.map(([label, value]) => `<tr class="border-b border-slate-100 last:border-0"><td class="py-2 pr-4 text-slate-500">${label}</td><td class="py-2 text-right font-semibold text-slate-800">${value}</td></tr>`).join("")}</tbody></table>`, "p-4");
+  const rows7 = [
+    ["年度累计", moneyInt(m.paid_annual || 0)],
+    ["本季度累计", moneyInt(m.paid_q2 || 0)],
+    ["本月累计", moneyInt(m.paid_month || 0)],
+    ["上本季度累计", moneyInt(m.paid_prev_q || 0)],
+    ["上月累计", moneyInt(m.paid_prev_month || 0)],
+  ];
+  const rowsProjExpense = [
+    ["年度累计", moneyInt(m.proj_expense_annual || 0)],
+    ["本季度累计", moneyInt(m.proj_expense_q2 || 0)],
+    ["本月累计", moneyInt(m.proj_expense_month || 0)],
+    ["上本季度累计", moneyInt(m.proj_expense_prev_q || 0)],
+    ["上月累计", moneyInt(m.proj_expense_prev_month || 0)],
+  ];
+  const rows8 = [
+    ["年度累计", moneyInt(m.cashflow_annual || 0)],
+    ["本季度累计", moneyInt(m.cashflow_q2 || 0)],
+    ["本月累计", moneyInt(m.cashflow_month || 0)],
+    ["上本季度累计", moneyInt(m.cashflow_prev_q || 0)],
+    ["上月累计", moneyInt(m.cashflow_prev_month || 0)],
+  ];
+  const rows9 = [
+    ["年度累计", moneyInt(m.profit_annual || 0)],
+    ["本季度累计", moneyInt(m.profit_q2 || 0)],
+    ["本月累计", moneyInt(m.profit_month || 0)],
+    ["上本季度累计", moneyInt(m.profit_prev_q || 0)],
+    ["上月累计", moneyInt(m.profit_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 COLORS = ['text-slate-700','text-blue-600','text-green-600','text-rose-600','text-indigo-600','text-amber-600','text-purple-600','text-cyan-600'];
+  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, rows5, rows9, rows4, rows7, rows8];
+  // 现金流和项目利润的原始值数组，用于正负着色
+  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 valCls = function(ri) { return (ri === 4 || ri === 7) ? '' : 'text-slate-800'; };
+  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>';
+  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>';
+  }
   document.querySelector("#home").innerHTML = `
     <div class="grid gap-5">
       ${state.tenant === "总工作台" ? "" : `<div class="grid grid-cols-4 gap-3">
         ${[
-          ["经营管理", m.total_projects, "finance"],
+          ["项目管理", m.total_projects, "finance"],
           ["重点工作与台账", m.total_proposals, "projects"],
           ["业务方案", m.total_products, "proposals"],
           ["产品迭代", m.upcoming_products, "products"],
         ].map(([label, value, tab]) => `<button class="metric-card" onclick="switchTab('${tab}')"><span class="flex items-center gap-2 text-xs text-slate-500"><i data-lucide="gauge"></i>${label}</span><strong class="mt-2 block text-2xl">${value}</strong></button>`).join("")}
       </div>`}
-      <div class="grid grid-cols-5 gap-5">${tblCard("合同金额", rows1)}${tblCard("确收金额", rows2)}${tblCard("确收毛利", rows3)}${tblCard("回款金额", rows4)}${tblCard("费用金额", rows5)}</div>
-      <div class="grid grid-cols-3 gap-5">
+      ${card(`<h3 class="text-sm font-bold text-slate-700 mb-3">部门经营情况</h3><div class="overflow-x-auto"><table class="w-full text-sm"><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></thead><tbody>
+        ${(() => {
+          var d = [
+            ['部门毛利', [m.profit_annual||0, m.profit_q2||0, m.profit_month||0, m.profit_prev_q||0, m.profit_prev_month||0],
+              [m.profit_q2||0,m.profit_prev_q||0], [m.profit_month||0,m.profit_prev_month||0]],
+            ['部门费用', [m.expense_annual||0, m.expense_q2||0, (m.expense_month||0), m.expense_prev_q||0, m.expense_prev_month||0],
+              [m.expense_q2||0,m.expense_prev_q||0], [(m.expense_month||0),m.expense_prev_month||0]],
+            ['部门净利', [
+              (m.profit_annual||0)-(m.expense_annual||0), (m.profit_q2||0)-(m.expense_q2||0), (m.profit_month||0)-(m.expense_month||0),
+              (m.profit_prev_q||0)-(m.expense_prev_q||0), (m.profit_prev_month||0)-(m.expense_prev_month||0)
+            ], [
+              (m.profit_q2||0)-(m.expense_q2||0), (m.profit_prev_q||0)-(m.expense_prev_q||0)
+            ], [
+              (m.profit_month||0)-(m.expense_month||0), (m.profit_prev_month||0)-(m.expense_prev_month||0)
+            ]]
+          ];
+          var h = '';
+          var netCls = function(di, raw) { return di === 2 ? (raw >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-800'; };
+          for (var di = 0; di < 3; di++) {
+            var r = d[di];
+            h += '<tr class="border-b border-slate-100 last:border-0"><td class="py-2 text-left font-semibold text-slate-700">' + r[0] + '</td>' +
+              '<td class="py-2 text-right font-semibold ' + netCls(di, r[1][0]) + '">' + moneyInt(r[1][0]) + '</td>' +
+              '<td class="py-2 text-right font-semibold ' + netCls(di, r[1][3]) + '">' + moneyInt(r[1][3]) + '</td>' +
+              '<td class="py-2 text-right font-semibold ' + netCls(di, r[1][4]) + '">' + moneyInt(r[1][4]) + '</td>' +
+              '<td class="py-2 text-right font-semibold ' + netCls(di, r[1][1]) + '">' + moneyInt(r[1][1]) + '</td>' +
+              '<td class="py-2 text-right">' + qoq(r[2][0], r[2][1]) + '</td>' +
+              '<td class="py-2 text-right font-semibold ' + netCls(di, r[1][2]) + '">' + moneyInt(r[1][2]) + '</td>' +
+              '<td class="py-2 text-right">' + qoq(r[3][0], r[3][1]) + '</td></tr>';
+          }
+          return h;
+        })()}
+      </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="chartSign"></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="chartRev"></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="chartCash"></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="chartCash"></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="chartProfit"></canvas></div>`, "p-4")}
       </div>
       ${card(`<h2 class="text-lg font-bold">近期动态</h2><div class="mt-4 grid gap-2">${summary.recent.map((r) => `<div class="flex items-start justify-between rounded-md bg-slate-50 px-3 py-2 text-sm group"><span class="break-words">${r.content}</span><div class="flex items-center gap-2 flex-shrink-0 ml-2"><span class="text-xs text-slate-400">${r.followed_at}</span><button class="btn btn-ghost btn-sm text-red-400 opacity-0 group-hover:opacity-100 p-0 w-5 h-5" onclick="event.preventDefault();deleteActivity(${r.id})" title="删除动态"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></div></div>`).join("")}</div>`, "p-5")}
     </div>
@@ -98,15 +204,28 @@ function renderCharts(data) {
     });
   }
 
-  // 图3：月度回款与费用
+  // 图3：月度回款与已付
   const c3 = document.querySelector("#chartCash");
   if (c3 && window.Chart) {
     if (state.chart3) state.chart3.destroy();
     state.chart3 = new Chart(c3, {
-      type: "bar",
+      type: "line",
       data: { labels, datasets: [
-        { label: "回款", data: data.map((x) => x.payment || 0), backgroundColor: "#d97706", borderRadius: 4 },
-        { label: "费用", data: data.map((x) => x.cost || 0), backgroundColor: "#ef4444", borderRadius: 4 },
+        { label: "回款", data: data.map((x) => x.payment || 0), borderColor: "#d97706", backgroundColor: "rgba(217,119,6,0.06)", fill: true, tension: 0.3 },
+        { label: "已付", data: data.map((x) => x.cost || 0), borderColor: "#7c3aed", backgroundColor: "rgba(124,58,237,0.06)", fill: true, tension: 0.3 },
+      ]},
+      options: baseOpts,
+    });
+  }
+
+  // 图4：月度项目利润
+  const c4 = document.querySelector("#chartProfit");
+  if (c4 && window.Chart) {
+    if (state.chart4) state.chart4.destroy();
+    state.chart4 = new Chart(c4, {
+      type: "line",
+      data: { labels, datasets: [
+        { label: "利润", data: data.map((x) => (x.gross || 0)), borderColor: "#6366f1", backgroundColor: "rgba(99,102,241,0.06)", fill: true, tension: 0.3 },
       ]},
       options: baseOpts,
     });

static/modules/utils.js

@@ -9,13 +9,18 @@ const state = {
   selectedProject: null,
   taskQuery: "",
   taskView: localStorage.getItem("opc-task-view") || "detail",
-  finView: localStorage.getItem("opc-fin-view") || "rev",
+  finView: localStorage.getItem("opc-fin-view") || "overview",
   proposalTab: "standard",
   chart: null,
   chart2: null,
   chart3: null,
+  chart4: null,
   productPlatform: "all",
   uploadTasks: [],
+  expenseFilter: "全部",
+  expenseView: "total",
+  expenseMonth: "",
+  expenseQuarter: "",
 };
 
 const money = (value) => `${Number(value || 0).toLocaleString("zh-CN")} 元`;
@@ -147,6 +152,7 @@ function render() {
   renderProposals();
   renderProducts();
   renderFinance();
+  renderExpense();
   if (window.lucide) window.lucide.createIcons();
 }
 

static/styles.css

@@ -1,5 +1,6 @@
 body {
-  min-width: 1180px;
+  min-width: 1400px;
+  overflow-x: auto;
   font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "PingFang SC", "Microsoft YaHei", sans-serif;
 }
 
@@ -94,6 +95,33 @@ body {
   border-bottom-color: #1d4ed8;
 }
 
+/* 详情弹窗固定高度，tab 切换不抖动 */
+#financeModal > div {
+  height: 650px;
+  display: flex;
+  flex-direction: column;
+}
+#financeModal .finance-tabs { flex-shrink: 0; }
+#financeModal form {
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+#financeModal .finance-tab-body {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+  padding: 32px;
+}
+#financeModal .finance-form-actions {
+  flex-shrink: 0;
+  background: #fff;
+  padding: 12px 32px 8px;
+  border-top: 1px solid #f1f5f9;
+}
+
 /* 项目统一卡片布局 */
 .project-board {
   background: #fff;

templates/index.html

@@ -49,9 +49,13 @@
             <i data-lucide="home" 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="经营管理">
-            <i data-lucide="briefcase-business" style="width:20px;height:20px"></i>
-            <span class="text-[10px] mt-1">财务</span>
+          <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>
+          </div>
+          <div class="sidebar-tab" data-tab="expense" onclick="switchTab('expense')" title="费用管理">
+            <i data-lucide="receipt" style="width:20px;height:20px"></i>
+            <span class="text-[10px] mt-1">费用</span>
           </div>
           <div class="sidebar-tab" data-tab="projects" onclick="switchTab('projects')" title="重点工作与台账">
             <i data-lucide="file-text" style="width:20px;height:20px"></i>
@@ -86,6 +90,7 @@
       <section id="proposals" class="panel"></section>
       <section id="products" class="panel"></section>
       <section id="finance" class="panel"></section>
+      <section id="expense" class="panel"></section>
     </main>
       </div><!-- 关闭主内容区 -->
     </div><!-- 关闭 flex 容器 -->
@@ -114,6 +119,7 @@
     <script src="{{ url_for('static', filename='modules/proposals.js') }}"></script>
     <script src="{{ url_for('static', filename='modules/products.js') }}"></script>
     <script src="{{ url_for('static', filename='modules/finance.js') }}"></script>
+    <script src="{{ url_for('static', filename='modules/expense.js') }}"></script>
     <script src="{{ url_for('static', filename='modules/drawer.js') }}"></script>
     <script src="{{ url_for('static', filename='modules/admin.js') }}"></script>
     <script src="{{ url_for('static', filename='app.js') }}"></script>