Merge branch 'dev'

refactor: 项目模块重构 — 统一渲染 + 配置驱动 + 交互优化
核心重构: - 提取 renderView() / tdRow() 统一函数，消除三视图 16000+ 字符重复代码 - METRIC_CARDS 配置驱动，调整卡片顺序/单位只需改配置 - 筛选区统一为下拉框（视图 + 状态 + 日期），删除筛选：前缀 - 日历选择器移至顶部工具栏，卡片内不再重复功能优化: - 项目状态简化为已签约/待签约 - 新增签约项目总数卡片（月度/季度按签约月份过滤） - 签约金额/已确收/已回款/应付/已付改为万元单位 - 项目名称固定300px + 省略号 + title悬停 - body min-width 1400px + overflow-x:auto - 首页费用金额→应付金额代码清理: - 删除 monthOpts/quarterOpts/qLabels 等死代码 - 删除 purchase.js（采购→费用模块已另表迁移） - 财务→项目（侧边栏），采购→费用（全域重命名）
2026-07-06 15:39:56 +08:00 · 2026-07-06 15:39:39 +08:00 · 2026-07-06 13:05:01 +08:00 · 2026-07-06 13:04:56 +08:00 · 2026-07-03 19:06:57 +08:00 · 2026-07-03 19:06:54 +08:00
9 changed files with 548 additions and 94 deletions
--- a/backend/migrations/columns.py
+++ b/backend/migrations/columns.py
@@ -92,6 +92,12 @@ 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 ''")

        conn.commit()
        print("[migrate] 加列迁移完成")
--- a/backend/migrations/tables.py
+++ b/backend/migrations/tables.py
@@ -146,6 +146,20 @@ 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 '科普·无界',
+  project_name VARCHAR(200) NOT NULL DEFAULT '',
+  purchase_item VARCHAR(300) NOT NULL DEFAULT '',
+  supplier VARCHAR(200) NOT NULL DEFAULT '',
+  amount DOUBLE NOT NULL DEFAULT 0,
+  purchase_date VARCHAR(30) NOT NULL DEFAULT '',
+  status VARCHAR(50) NOT NULL DEFAULT '待审批',
+  category VARCHAR(100) NOT NULL DEFAULT '',
+  notes VARCHAR(1000) NOT NULL DEFAULT '',
+  created_at VARCHAR(30) NOT NULL DEFAULT '',
+  updated_at VARCHAR(30) NOT NULL DEFAULT ''
 )""",
        ]

--- a/backend/routes.py
+++ b/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", "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", ["project_name", "purchase_item", "supplier", "amount", "purchase_date", "status", "category", "notes", "tenant"]),
 }

 # ---------- 鉴权装饰器 ----------
@@ -268,6 +269,10 @@ def bootstrap():
                _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,23 +282,33 @@ 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]),
+                    "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_budget("cost", range(1, 13)),
                    "cost_q2": t_sum_budget("cost", _q_range),
                    "cost_month": t_sum_budget("cost", [_now_month]),
+                    "cost_prev_q": t_sum_budget("cost", _prev_q_range),
+                    "cost_prev_month": t_sum_budget("cost", [_prev_month]) if _prev_month else 0,
                })
                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"]:
                agg[key] = sum(m.get(key, 0) for m in all_metrics)
            merged_monthly = []
            for i in range(12):
@@ -307,7 +322,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 +333,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):
@@ -341,18 +357,29 @@ def bootstrap():
        _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))
        payment_q2 = sum_budget("payment", _q_range)
        cost_q2 = sum_budget("cost", _q_range)
        payment_month = sum_budget("payment", [_now_month])
        cost_month = sum_budget("cost", [_now_month])
+        payment_prev_q = sum_budget("payment", _prev_q_range)
+        cost_prev_q = sum_budget("cost", _prev_q_range)
+        payment_prev_month = sum_budget("payment", [_prev_month]) if _prev_month else 0
+        cost_prev_month = sum_budget("cost", [_prev_month]) if _prev_month else 0
        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 +387,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 +410,33 @@ 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,
                "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 +517,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):
--- a/static/modules/expense.js
+++ b/static/modules/expense.js
@@ -0,0 +1,103 @@
+// expense.js — 费用管理模块
+
+function renderExpense() {
+  const records = state.data.expense || [];
+  const money = (v) => `¥ ${(Number(v || 0)).toLocaleString("zh-CN", { minimumFractionDigits: 0, maximumFractionDigits: 2 })}`;
+  const badge = (s) => {
+    const m = { "已审批": "green", "已采购": "blue", "已完成": "slate", "待审批": "amber" };
+    const c = m[s] || "amber";
+    return `<span class="text-xs px-2 py-0.5 rounded-full bg-${c}-100 text-${c}-700 font-medium">${s}</span>`;
+  };
+  const esc = (s) => (s || "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+
+  const totalAmount = records.reduce((s, r) => s + (r.amount || 0), 0);
+
+  document.querySelector("#expense").innerHTML = `<div class="grid gap-4">
+    <div class="grid grid-cols-3 gap-3">
+      <div class="metric-card"><span class="flex items-center gap-2 text-xs text-slate-500">费用记录</span><strong class="mt-2 block text-2xl">${records.length}</strong></div>
+      <div class="metric-card"><span class="flex items-center gap-2 text-xs text-slate-500">费用金额</span><strong class="mt-2 block text-2xl">${money(totalAmount)}</strong></div>
+      <div class="metric-card"><span class="flex items-center gap-2 text-xs text-slate-500">待审批</span><strong class="mt-2 block text-2xl">${records.filter(r => r.status === '待审批').length}</strong></div>
+    </div>
+    <div class="flex justify-between items-center">
+      <h3 class="font-bold text-slate-700">费用列表 <span class="text-slate-400 font-normal">(${records.length})</span></h3>
+      <button class="btn btn-primary btn-sm" onclick="openExpenseModal()">新增费用</button>
+    </div>
+    <div id="purchaseModal" 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="purchaseModalTitle">新增费用</h3><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closeExpenseModal()"><i data-lucide="x"></i></button></div><form onsubmit="saveExpense(event)" class="p-6 grid gap-4" novalidate><input type="hidden" name="expense_id" id="purchase-id-input" 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><input name="project_name" required class="form-ctrl" placeholder="请输入项目名称"></label><label class="block"><span class="text-xs text-slate-500 mb-1 block">采购内容 <span class="text-red-500">*</span></span><input name="purchase_item" required class="form-ctrl" placeholder="请输入采购内容"></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="supplier" class="form-ctrl" placeholder="请输入供应商"></label><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></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="purchase_date" type="date" class="form-ctrl"></label><label class="block"><span class="text-xs text-slate-500 mb-1 block">状态</span><select name="status" class="form-ctrl bg-white"><option>待审批</option><option>已审批</option><option>已采购</option><option>已完成</option></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="category" class="form-ctrl" placeholder="如：办公用品、设备等"></label></div><div class="grid"><label class="block"><span class="text-xs text-slate-500 mb-1 block">备注</span><textarea name="notes" class="form-ctrl" rows="2" placeholder="备注信息"></textarea></label></div><div class="flex justify-end gap-2 pt-2 border-t border-slate-100"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="purchaseDeleteBtn" onclick="deleteExpenseItem()" type="button">删除</button><button class="btn btn-ghost btn-sm" onclick="closeExpenseModal()" type="button">取消</button><button class="btn btn-primary btn-sm" type="submit">保存</button></div></form></div></div>
+    <div class="overflow-x-auto card p-4"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-left font-semibold">项目名称</th><th class="p-2 text-left font-semibold">采购内容</th><th class="p-2 text-left font-semibold">供应商</th><th class="p-2 text-right font-semibold">金额</th><th class="p-2 text-center font-semibold">采购日期</th><th class="p-2 text-center font-semibold">状态</th><th class="p-2 text-left font-semibold">分类</th><th class="p-2 text-left font-semibold">备注</th></tr></thead><tbody>${records.length ? records.map(r => `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openExpenseEdit(${r.id})"><td class="p-2 font-medium">${esc(r.project_name)}</td><td class="p-2">${esc(r.purchase_item)}</td><td class="p-2">${esc(r.supplier)}</td><td class="p-2 text-right font-medium">${money(r.amount)}</td><td class="p-2 text-center text-xs">${r.purchase_date || '—'}</td><td class="p-2 text-center">${badge(r.status)}</td><td class="p-2">${esc(r.category)}</td><td class="p-2 text-xs text-slate-500">${esc(r.notes) || '—'}</td></tr>`).join("") : '<tr><td colspan="8" 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" colspan="3">合计（${records.length} 条）</td><td class="p-2 text-right">${money(totalAmount)}</td><td class="p-2" colspan="4"></td></tr></tbody></table></div>
+  </div>`;
+  if (window.lucide) window.lucide.createIcons();
+}
+
+window.openExpenseModal = () => {
+  const 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 = () => {
+  document.querySelector("#expenseModal").classList.add("hidden");
+};
+
+window.openExpenseEdit = (id) => {
+  const r = (state.data.expense || []).find(x => x.id === id);
+  if (!r) return;
+  const form = document.querySelector("#expenseModal form");
+  form.reset();
+  const setVal = (name, val) => { const el = form.querySelector(`[name="${name}"]`); if (el) el.value = val || ""; };
+  setVal("expense_id", r.id);
+  setVal("project_name", r.project_name);
+  setVal("purchase_item", r.purchase_item);
+  setVal("supplier", r.supplier);
+  setVal("amount", r.amount);
+  setVal("purchase_date", r.purchase_date);
+  setVal("status", r.status);
+  setVal("category", r.category);
+  setVal("notes", r.notes);
+  document.querySelector("#expenseModalTitle").textContent = "编辑费用";
+  document.querySelector("#expenseDeleteBtn").classList.remove("hidden");
+  document.querySelector("#expenseModal").classList.remove("hidden");
+};
+
+window.saveExpense = async (event) => {
+  event.preventDefault();
+  const form = event.target;
+  const data = Object.fromEntries(new FormData(form).entries());
+  const isEdit = !!data.expense_id;
+  delete data.expense_id;
+
+  const url = isEdit
+    ? `/api/expense/${form.querySelector('[name="expense_id"]').value}`
+    : "/api/expense";
+  const method = isEdit ? "PUT" : "POST";
+
+  const resp = await fetch(url, { method, headers: { "Content-Type": "application/json" }, body: JSON.stringify({ data: { ...data, tenant: state.tenant } }) });
+  if (!resp.ok) { alert("保存失败"); return; }
+
+  // Refresh data
+  const bResp = await fetch(`/api/bootstrap?tenant=${encodeURIComponent(state.tenant)}`);
+  if (bResp.ok) {
+    const bd = await bResp.json();
+    state.data = bd;
+    applyUserTenants();
+    renderExpense();
+  }
+  closeExpenseModal();
+};
+
+window.deleteExpenseItem = async () => {
+  const id = document.querySelector("#expenseModal form [name='expense_id']").value;
+  if (!id || !confirm("确定删除？")) return;
+  const resp = await fetch(`/api/expense/${id}`, { method: "DELETE" });
+  if (!resp.ok) { alert("删除失败"); return; }
+  const bResp = await fetch(`/api/bootstrap?tenant=${encodeURIComponent(state.tenant)}`);
+  if (bResp.ok) {
+    const bd = await bResp.json();
+    state.data = bd;
+    applyUserTenants();
+    renderExpense();
+  }
+  closeExpenseModal();
+};
--- a/static/modules/finance.js
+++ b/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,12 +25,10 @@ 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 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) => {
      let budget = [];
@@ -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,63 @@ 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="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="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">
-        <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 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>
+      <label class="block"><span class="fin-label">项目编号</span><input name="project_code" class="form-ctrl" placeholder="如：KP-2026-001"></label>
+      <label class="block"><span class="fin-label">项目名称 <span class="text-red-500">*</span></span><input name="customer_name" required class="form-ctrl" placeholder="请输入项目名称"></label>
    </div>
-    <div class="fin-field-group">
-      <p class="fin-section-label">合同信息</p>
-      <div class="grid gap-4">
-        <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>
-        </div>
-        <div class="grid grid-cols-2 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>
-        </div>
-      </div>
+    <div class="grid grid-cols-3 gap-3">
+      <label class="block"><span class="fin-label">签约金额（元） <span class="text-red-500">*</span></span><input name="sign_amount" class="form-ctrl" placeholder="必须大于 0"></label>
+      <label class="block"><span class="fin-label">签约月份 <span class="text-red-500">*</span></span><select name="sign_month" required class="form-ctrl bg-white"><option value="">选择</option>${monthOptions('')}</select></label>
+      <label class="block"><span class="fin-label">项目状态</span><select name="status" class="form-ctrl bg-white"><option>已签约</option><option>待签约</option></select></label>
    </div>
+    <div class="grid grid-cols-3 gap-3">
+      <label class="block"><span class="fin-label">商务负责人 <span class="text-red-500">*</span></span><input name="sales_person" required class="form-ctrl" placeholder="请输入商务负责人"></label>
+      <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 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>
@@ -191,51 +199,161 @@ 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' ? (() => {
-      const allPfs = pfs.filter(x => x.status === state.finFilter);
-      const now = new Date();
-      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;
-      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;
+<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 => ctx.signCnt, color: 'text-slate-700' },
+        { label: '签约金额', value: ctx => moneyWan(ctx.signTotal), color: 'text-slate-700' },
+        { label: '已确收', value: ctx => moneyWan(ctx.sumRev), color: 'text-blue-700' },
+        { label: '执行率', value: ctx => ctx.sumRev && ctx.signTotal ? Math.round(ctx.sumRev / ctx.signTotal * 100) + '%' : '—', color: 'text-slate-500' },
+        { label: '毛利', value: ctx => money(ctx.sumGross), color: 'text-green-700' },
+        { label: '毛利率', value: ctx => ctx.sumRev && ctx.sumGross ? Math.round(ctx.sumGross / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
+        { label: '已回款', value: ctx => moneyWan(ctx.sumPay), color: 'text-amber-700' },
+        { label: '回款率', value: ctx => ctx.sumRev && ctx.sumPay ? Math.round(ctx.sumPay / ctx.sumRev * 100) + '%' : '—', color: 'text-slate-500' },
+        { label: '应付', value: ctx => moneyWan(ctx.sumCost), color: 'text-rose-700' },
+        { label: '已付', value: ctx => moneyWan(ctx.sumPaid), color: 'text-purple-700' },
+        { label: '付款率', value: ctx => ctx.sumCost && ctx.sumPaid ? Math.round(ctx.sumPaid / ctx.sumCost * 100) + '%' : '—', color: 'text-slate-500' },
+        { label: '现金流', value: ctx => { const v = ctx.sumPay - ctx.sumPaid; return { val: money(v), cls: v >= 0 ? 'text-green-600' : 'text-red-600' }; }, color: null },
+      ];
+
+      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">毛利</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">回款率</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>';
+        const tbody = rows.length ? `<tbody>${rows.join("")}</tbody>` : `<tr><td colspan="13" 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(`<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;
-        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>`);
-      });
-      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 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';
+        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-xs">${exe}</td><td class="p-2 text-center align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="p-2 text-center align-middle text-xs">${grossR}</td><td class="p-2 text-center text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="p-2 text-center align-middle text-xs">${payR}</td><td class="p-2 text-center text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="p-2 text-center text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="p-2 text-center align-middle text-xs">${paidR}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</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");
+        if (!state.finMonth) state.finMonth = defaultMonth;
+        const selMonth = state.finMonth;
+        const rows = [];
+        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);
+          const gross = Math.round(parseFloat(b.gross || 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));
+        });
+        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;
+        };
+        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 cost = sumBudget(pf, "cost");
+          const paid = sumBudget(pf, "paid");
+          const gross = sumBudget(pf, "gross");
+          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; });
+        let rev = 0, payment = 0, cost = 0, gross = 0;
+        budget.forEach(b => { rev += parseFloat(b.rev || 0) || 0; gross += parseFloat(b.gross || 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) };
+        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();
@@ -306,7 +424,7 @@ window.initBudgetTable = (budgetData) => {
 };

 // ---------- 任务管理 tab ----------
-const TASK_TYPES = ["科普视频", "科普专访", "科普文章"];
+const TASK_TYPES = ["科普视频", "科普专访", "科普文章", "问卷调研", "病例征集"];

 function taskMonthOptions(selected) {
  const now = new Date();
@@ -324,8 +442,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 +487,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 +503,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");
@@ -409,7 +554,63 @@ 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("#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 +623,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,6 +653,9 @@ 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);
@@ -449,6 +663,7 @@ window.openPfEditModal = (pfId) => {
  try { taskData = JSON.parse(pf.task_data || "[]"); } catch (e) { taskData = []; }
  initTaskTable(taskData.length ? taskData : null);
  setTimeout(() => updateBudgetSummary(), 100);
+  loadFinFollowups(pf.id);
  openFinanceModal();
 };

@@ -456,6 +671,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; }
--- a/static/modules/home.js
+++ b/static/modules/home.js
@@ -8,28 +8,55 @@ function renderHome() {
    ["年度累计", moneyInt(m.signed_annual || m.signed_amount)],
    ["季度累计", 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_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_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_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_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");
+let _cardId = 0;
+const tblCard = (title, rows) => {
+  const id = 'finCard' + (++_cardId);
+  const visible = rows.slice(0, 3);
+  const extra = rows.slice(3);
+  const rowHtml = (r) => r.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("");
+  return card(`<h3 class="text-sm font-bold text-slate-700 mb-3">${title}</h3><table class="w-full text-sm"><tbody>${rowHtml(visible)}</tbody></table><table class="w-full text-sm hidden" id="${id}"><tbody>${rowHtml(extra)}</tbody></table><button class="w-full text-center py-1 text-xs text-slate-400 hover:text-slate-600" onclick="toggleFinCard('${id}')" id="${id}_btn"><i data-lucide="chevron-down" style="width:14px;height:14px;display:inline"></i></button>`, "p-4");
+};
+window.toggleFinCard = (id) => {
+  const t = document.getElementById(id);
+  if (!t) return;
+  t.classList.toggle("hidden");
+  const btn = document.getElementById(id + "_btn");
+  btn.innerHTML = t.classList.contains("hidden")
+    ? '<i data-lucide="chevron-down" style="width:14px;height:14px;display:inline"></i>'
+    : '<i data-lucide="chevron-up" style="width:14px;height:14px;display:inline"></i>';
+  if (window.lucide) window.lucide.createIcons();
+};
  document.querySelector("#home").innerHTML = `
    <div class="grid gap-5">
      ${state.tenant === "总工作台" ? "" : `<div class="grid grid-cols-4 gap-3">
@@ -40,7 +67,7 @@ const tblCard = (title, rows) => card(`<h3 class="text-sm font-bold text-slate-7
          ["产品迭代", 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-5 gap-5">${tblCard("合同金额", rows1)}${tblCard("确收金额", rows2)}${tblCard("确收毛利", rows3)}${tblCard("回款金额", rows4)}${tblCard("应付金额", rows5)}</div>
      <div class="grid grid-cols-3 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")}
--- a/static/modules/utils.js
+++ b/static/modules/utils.js
@@ -9,7 +9,7 @@ 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,
@@ -147,6 +147,7 @@ function render() {
  renderProposals();
  renderProducts();
  renderFinance();
+  renderExpense();
  if (window.lucide) window.lucide.createIcons();
 }

--- a/static/styles.css
+++ b/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;
--- a/templates/index.html
+++ b/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>
Author	SHA1	Message	Date
mac	d21497bce3	Merge branch 'dev' All checks were successful Deploy / deploy (push) Successful in 12s Details	2026-07-06 15:39:56 +08:00
mac	8a78c756b7	refactor: 项目模块重构 — 统一渲染 + 配置驱动 + 交互优化核心重构: - 提取 renderView() / tdRow() 统一函数，消除三视图 16000+ 字符重复代码 - METRIC_CARDS 配置驱动，调整卡片顺序/单位只需改配置 - 筛选区统一为下拉框（视图 + 状态 + 日期），删除筛选：前缀 - 日历选择器移至顶部工具栏，卡片内不再重复功能优化: - 项目状态简化为已签约/待签约 - 新增签约项目总数卡片（月度/季度按签约月份过滤） - 签约金额/已确收/已回款/应付/已付改为万元单位 - 项目名称固定300px + 省略号 + title悬停 - body min-width 1400px + overflow-x:auto - 首页费用金额→应付金额代码清理: - 删除 monthOpts/quarterOpts/qLabels 等死代码 - 删除 purchase.js（采购→费用模块已另表迁移） - 财务→项目（侧边栏），采购→费用（全域重命名）	2026-07-06 15:39:39 +08:00
mac	574e3c5700	Merge branch 'dev' All checks were successful Deploy / deploy (push) Successful in 11s Details	2026-07-06 13:05:01 +08:00
mac	8430c93b97	feat: 新增采购模块 + 财务表格重建采购模块: - 新增 purchase_records 表 + CRUD 路由 + bootstrap 数据加载 - 前端采购管理页面: 表格 + 弹窗新增/编辑 + 侧边栏入口财务模块: - 表格新增签约金额、执行率、回款率、付款率、毛利、毛利率列 - 状态/日期筛选统一为无边框下拉框，移至页面顶部工具栏 - 删除 metric 卡片，新增 11 张汇总卡片（签约金额~现金流） - 表格合计行移至表头下方，后改为汇总卡片 - 所有单元格统一水平/垂直居中 - 修复季度视图 gross 变量缺失、合计行遗漏	2026-07-06 13:04:56 +08:00
mac	c70293b447	Merge branch 'dev' All checks were successful Deploy / deploy (push) Successful in 12s Details	2026-07-03 19:06:57 +08:00
mac	ff7eb19d5d	refactor: 财务模块卡片头部重构为单行功能区 + 表格增加状态列 - 卡片头部简化为单行: 视图标签 \| 筛选:状态/月份/季度下拉 + 新增按钮 - 状态筛选从标签按钮改为统一风格下拉框（自定义SVG箭头） - 下拉框字体/高度与视图标签 btn-sm 完全对齐 - 表格增加状态列（已签约/流程中/待签约，分色显示） - 季度视图 p-4 padding 修复	2026-07-03 19:06:54 +08:00