fix: 展开明细合并月份+tab选中态+默认排序+已发生改名

- 展开明细合并budget_data和expense_data月份(修复只有费用没预算时看不到)
- switchFinanceTab选择器限定#financeModal(修复弹窗tab误伤顶部筛选tab)
- 项目管理表格默认按确收金额从高到低排序
- 执行→已发生, tip改淡黄色
- 登录后默认选权限范围内第一个工作台
- 版本号 v1.2.0.10

backend/routes.py

@@ -14,7 +14,7 @@ from helpers import add_file_index, attach_common, monthly_finance
 
 bp = Blueprint("api", __name__)
 
-ALL_TENANTS = ["总览", "科普·无界", "科研·无界", "医患·无界", "MCN·无界", "学术·无界"]
+ALL_TENANTS = ["科普·无界", "科研·无界", "医患·无界", "MCN·无界", "学术·无界"]
 
 TABLES = {
     "sales": ("sales_leads", ["target_customer", "priority", "status", "tenant"]),
@@ -75,7 +75,7 @@ def auth_login():
         session["display_name"] = user["display_name"]
         session["role"] = user["role"]
         if user["role"] == "admin":
-            session["tenants"] = ["总览", "科普·无界", "科研·无界", "医患·无界", "MCN·无界", "学术·无界"]
+            session["tenants"] = ["科普·无界", "科研·无界", "医患·无界", "MCN·无界", "学术·无界"]
         else:
             ut = rows(conn, "SELECT tenant FROM user_tenants WHERE user_id=?", (user["id"],))
             session["tenants"] = [x["tenant"] for x in ut]
@@ -126,10 +126,9 @@ def auth_me():
     if "user_id" not in session:
         return jsonify({"logged_in": False})
     tenants = session.get("tenants", [])
-    tenants = [t if t != "总工作台" else "总览" for t in tenants]
+    tenants = [t if t != "总工作台" else "科普·无界" for t in tenants]
     tenants = [t if t != "学会·无界" else "学术·无界" for t in tenants]
-    if "总览" not in tenants:
-        tenants = ["总览"] + tenants
+    tenants = [t for t in tenants if t != "总览" and t != "总工作台"]
     return jsonify({
         "logged_in": True,
         "user": {"id": session["user_id"], "username": session["username"], "display_name": session["display_name"], "role": session["role"]},
@@ -263,47 +262,13 @@ def bootstrap():
     _year = date.today().year
     tenant = request.args.get("tenant", session.get("tenants", ["科普·无界"])[0])
     allowed = session.get("tenants", [])
-    allowed = [t if t != "总工作台" else "总览" for t in allowed]
+    allowed = [t if t != "总工作台" else "科普·无界" for t in allowed]
     allowed = [t if t != "学会·无界" else "学术·无界" for t in allowed]
-    if "总览" not in allowed:
-        allowed = ["总览"] + allowed
+    allowed = [t for t in allowed if t != "总览" and t != "总工作台"]
     if tenant not in allowed:
-        tenant = allowed[0]
+        tenant = allowed[0] if allowed else ""
     conn = db()
     try:
-        if tenant == "总览":
-            real_tenants = [t for t in allowed if t != "总览"]
-            all_metrics = []
-            all_monthly = []
-            all_recent = []
-            for t in real_tenants:
-                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_proposals = attach_common(conn, "proposals", rows(conn, "SELECT * FROM business_proposals WHERE tenant=? ORDER BY id DESC", [t]))
-                t_pfs = rows(conn, "SELECT * FROM project_finances WHERE tenant=? ORDER BY id DESC", [t])
-                t_expense = rows(conn, "SELECT * FROM expense_records WHERE tenant=? ORDER BY id DESC", [t])
-                t_metrics = compute_metrics(t_pfs, t_ops, t_sales, t_products, t_proposals, t_expense, _year, conn, t)
-                all_metrics.append(t_metrics)
-                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","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","expense_paid_annual","expense_paid_q2","expense_paid_month","expense_paid_prev_q","expense_paid_prev_month","dept_cf_annual","dept_cf_q2","dept_cf_month","dept_cf_prev_q","dept_cf_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"{_year}-{i+1:02d}"}
-                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 = {
-                "project_name": "总览",
-                "metrics": agg,
-                "recent": sorted(all_recent, key=lambda x: x.get("id", 0), reverse=True)[:8],
-                "risks": [],
-            }
-            return jsonify({"summary": summary, "financeMonthly": merged_monthly, "tenant": tenant, "tenants": allowed})
-
         # 普通工作台：只查 summary 所需的数据（project_finances + operations + sales + products + proposals + expense）
         pfs = rows(conn, "SELECT * FROM project_finances WHERE tenant=? ORDER BY id DESC", [tenant])
         operations = attach_common(conn, "operations", rows(conn, "SELECT * FROM operation_projects WHERE tenant=? ORDER BY id ASC", [tenant]))

static/app.js

@@ -1,23 +1,12 @@
 // app.js — 入口文件（加载模块 + 初始化）
 
-// 恢复上次的工作台和标签页
-const savedTenant = localStorage.getItem("opc-active-tenant");
-if (savedTenant) {
-  state.tenant = savedTenant;
-  const label = savedTenant.replace("·无界", "");
-  document.querySelector("#workspaceTitle").textContent = label + " OPC 工作台";
-  const tLabel = document.querySelector("#currentTenantLabel");
-  if (tLabel) { tLabel.textContent = label || "工作台"; tLabel.title = savedTenant; }
-}
-const savedTab = localStorage.getItem("opc-active-tab");
-
 // 初始化
-applyUserTenants();
-updateSidebarTabs();
-load().then(() => {
-  if (state.tenant === "总览") {
-    switchTab("home");
-  } else if (savedTab && savedTab !== "home") {
+applyUserTenants().then(() => {
+  updateSidebarTabs();
+  return load();
+}).then(() => {
+  const savedTab = localStorage.getItem("opc-active-tab");
+  if (savedTab && savedTab !== "home") {
     switchTab(savedTab);
   }
 }).catch((error) => {

static/modules/finance.js

@@ -114,14 +114,14 @@ function renderFinance() {
   const finHeaderBase = `<div class="flex items-center gap-2"><button onclick="setFinView('overview')" class="px-3 py-0.5 rounded text-sm font-medium ${state.finView==='overview'?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">总视图</button><span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">年份：</span><select onchange="setFinYear(this.value)" class="px-2 py-0.5 rounded text-sm font-medium border border-slate-200 bg-white">${yearOpts.map(y => `<option value="${y}" ${state.finYear===y?'selected':''}>${y}</option>`).join('')}</select><span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">季度：</span>${qLabels.map((q,i) => `<button onclick="setFinQuarter(${i})" class="px-3 py-0.5 rounded text-sm font-medium ${state.finView==='quarterly'&&activeQ===i?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${q}</button>`).join('')}<span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">月度：</span>${activeMonths.map(m => { const ms = `${state.finYear}-${String(m).padStart(2,'0')}`; return `<button onclick="setFinMonth('${ms}')" class="px-3 py-0.5 rounded text-sm font-medium ${state.finView==='monthly'&&state.finMonth===ms?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${m}月</button>`; }).join('')}</div>`;
   const finAddBtn = `<button class="btn btn-primary btn-sm" onclick="openFinanceModal()">新增财务项目</button>`;
 
-  const isOverviewMode = state.tenant === "总览";
+  const isOverviewMode = false;
   const finFilterTabs = `<div class="finance-tabs" style="padding:0;border-bottom:1px solid #e2e8f0;margin-bottom:0"><button onclick="switchFinFilter('overview')" class="finance-tab${state.finFilter==='overview'?' active':''}" style="font-size:14px;font-weight:600">经营月报</button><button onclick="switchFinFilter('quarterlyOverview')" class="finance-tab${state.finFilter==='quarterlyOverview'?' active':''}" style="font-size:14px;font-weight:600">经营季报</button>${isOverviewMode ? '' : `<button onclick="switchFinFilter('projects')" class="finance-tab${state.finFilter==='projects'?' active':''}" style="font-size:14px;font-weight:600">项目管理 (${pfs.length})</button><button onclick="switchFinFilter('expense')" class="finance-tab${state.finFilter==='expense'?' active':''}" style="font-size:14px;font-weight:600">平台费用</button>`}</div>`;
 
   document.querySelector("#finance").innerHTML = `<div class="grid gap-2">
     ${finFilterTabs}
-    ${isOverviewMode ? '' : `<div class="flex items-center gap-3 px-4 py-2 rounded-lg border" style="background:linear-gradient(135deg,#dbeafe,#bfdbfe);border-color:#3b82f6">
-      <i data-lucide="lightbulb" class="text-blue-600 flex-shrink-0" style="width:18px;height:18px"></i>
-      <span class="text-sm text-blue-900"><strong>执行提示：</strong>先关注确收，毛利确保业务运营，再关注回款，回款率，最后逐步优化成本与支出</span>
+    ${isOverviewMode ? '' : `<div class="flex items-center gap-3 px-4 py-2 rounded-lg border" style="background:linear-gradient(135deg,#fef9c3,#fde047);border-color:#eab308">
+      <i data-lucide="lightbulb" class="text-yellow-700 flex-shrink-0" style="width:18px;height:18px"></i>
+      <span class="text-sm text-yellow-900"><strong>已发生模块：</strong>只记录，已经发生的确收，毛利，回款，成本，支出</span>
     </div>`}
     ${state.finFilter !== 'expense' && state.finFilter !== 'overview' && state.finFilter !== 'quarterlyOverview' ? card(`<div class="flex justify-between items-center"><div class="flex items-center gap-2">${finHeaderBase}</div>${finAddBtn}</div>`, "py-2 px-4") : ''}
     <div id="financeModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closeFinanceModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-6xl mx-4 max-h-[92vh] overflow-y-auto" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-8 py-5 flex items-center justify-between"><div><h3 class="text-xl font-bold text-slate-800" id="financeModalTitle">新增项目财务</h3><p class="text-xs text-slate-400 mt-0.5">填写项目财务信息与月度预算</p></div><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="financeDeleteBtn" onclick="deleteFinanceItem()"><i data-lucide="trash-2"></i>删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closeFinanceModal()"><i data-lucide="x"></i></button></div></div>
@@ -266,10 +266,14 @@ function renderFinance() {
         { label: '付款率', hideUnsigned: true, value: ctx => ctx.sumCost && ctx.sumPaid ? Math.round(ctx.sumPaid / ctx.sumCost * 100) + '%' : '—', color: 'text-slate-500' },
       ].filter(c => true);
 
-      // 列排序
-      if (!state.finSort) state.finSort = { key: null, asc: true };
+      // 列排序（默认按确收金额从高到低）
+      if (!state.finSort) state.finSort = { key: 'sig|rev', asc: false };
       const sortData = (data, key) => {
-        if (!key || !state.finSort.key) return data;
+        if (!key) return data;
+        if (!state.finSort.key) {
+          // 默认按确收金额从高到低
+          return data.slice().sort(function(a, b) { return (parseFloat(b.rev) || 0) - (parseFloat(a.rev) || 0); });
+        }
         var asc = state.finSort.asc ? 1 : -1;
         return data.slice().sort(function(a, b) {
           var va = a[key], vb = b[key];
@@ -290,6 +294,7 @@ function renderFinance() {
         return h;
       };
       const SIGNED_COLS = [
+        { key: '_expand', label: '' },
         { key: 'client_name', label: '客户' }, { key: 'customer_name', label: '项目名称' }, { key: 'sign_amount', label: '签约金额' },
         { key: 'rev', label: '已确收' }, { key: 'gross', label: '毛利' }, { key: 'gross_rate', label: '毛利率' },
         { key: 'payment', label: '回款' }, { key: 'pay_rate', label: '回款率' },
@@ -331,7 +336,29 @@ function renderFinance() {
         const grossR = rev && gross ? Math.round(gross / rev * 100) + '%' : '<span class="text-slate-300">—</span>';
                 const cf = cashflow ? money(cashflow) : '<span class="text-slate-300">—</span>';
         const cfCls = cashflow >= 0 ? 'text-green-600' : 'text-red-600';
-        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="px-2 py-px text-center  align-middle text-sm">${esc(pf.client_name || "")}</td><td class="px-2 py-px 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="px-2 py-px text-center  align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="px-2 py-px text-center  text-blue-700 align-middle">${fmtNoUnit(rev)}</td><td class="px-2 py-px text-center  align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="px-2 py-px text-center  align-middle text-sm">${grossR}</td><td class="px-2 py-px text-center  text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="px-2 py-px text-center  align-middle text-sm">${payR}</td><td class="px-2 py-px text-center  text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="px-2 py-px text-center  text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="px-2 py-px text-center  align-middle text-sm">${paidR}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</td></tr>`;
+        var budgetArr = [];
+        var expenseArr = [];
+        try { budgetArr = JSON.parse(pf.budget_data || "[]"); } catch(e) {}
+        try { expenseArr = JSON.parse(pf.expense_data || "[]"); } catch(e) {}
+        // 合并 budget 和 expense 的所有月份
+        var allMonths = {};
+        budgetArr.forEach(function(b) { allMonths[b.month || ''] = true; });
+        expenseArr.forEach(function(e) { allMonths[e.month || ''] = true; });
+        var detailRows = Object.keys(allMonths).filter(function(m) {
+          var b = budgetArr.find(function(x) { return x.month === m; }) || {};
+          var exp = expenseArr.find(function(x) { return x.month === m; }) || {};
+          var bRev = parseFloat(b.rev || 0), bGross = parseFloat(b.gross || 0), bPay = parseFloat(b.payment || 0);
+          var eCost = parseFloat(exp.cost || 0), ePaid = parseFloat(exp.paid || 0);
+          return bRev || bGross || bPay || eCost || ePaid;
+        }).sort().map(function(m) {
+          var b = budgetArr.find(function(x) { return x.month === m; }) || {};
+          var exp = expenseArr.find(function(x) { return x.month === m; }) || {};
+          var bRev = parseFloat(b.rev || 0), bGross = parseFloat(b.gross || 0), bPay = parseFloat(b.payment || 0);
+          var eCost = parseFloat(exp.cost || 0), ePaid = parseFloat(exp.paid || 0);
+          var bCf = bPay - ePaid;
+          return '<tr class="bg-slate-50"><td class="px-2 py-px"></td><td class="px-2 py-px"></td><td class="px-2 py-px text-center text-xs text-slate-400">' + m + '</td><td class="px-2 py-px text-center text-xs text-blue-600">' + (bRev ? money(bRev) : '—') + '</td><td class="px-2 py-px text-center text-xs text-green-600">' + (bGross ? money(bGross) : '—') + '</td><td class="px-2 py-px"></td><td class="px-2 py-px text-center text-xs text-amber-600">' + (bPay ? money(bPay) : '—') + '</td><td class="px-2 py-px"></td><td class="px-2 py-px text-center text-xs text-rose-600">' + (eCost ? money(eCost) : '—') + '</td><td class="px-2 py-px text-center text-xs text-purple-600">' + (ePaid ? money(ePaid) : '—') + '</td><td class="px-2 py-px"></td><td class="px-2 py-px text-center text-xs ' + (bCf >= 0 ? 'text-green-600' : 'text-red-600') + '">' + (bCf ? money(bCf) : '—') + '</td></tr>';
+        }).join('');
+        return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="px-2 py-px text-center align-middle text-sm" onclick="event.stopPropagation();finToggleExpand(${pf.id})"><i data-lucide="chevron-right" style="width:14px;height:14px;color:#94a3b8" id="fin_expand_icon_${pf.id}"></i></td><td class="px-2 py-px text-center  align-middle text-sm">${esc(pf.client_name || "")}</td><td class="px-2 py-px 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="px-2 py-px text-center  align-middle text-sm font-medium">${money(pf.sign_amount)}</td><td class="px-2 py-px text-center  text-blue-700 align-middle">${fmtNoUnit(rev)}</td><td class="px-2 py-px text-center  align-middle text-sm font-medium">${fmtNoUnit(gross)}</td><td class="px-2 py-px text-center  align-middle text-sm">${grossR}</td><td class="px-2 py-px text-center  text-amber-700 align-middle">${fmtNoUnit(payment)}</td><td class="px-2 py-px text-center  align-middle text-sm">${payR}</td><td class="px-2 py-px text-center  text-rose-700 align-middle">${fmtNoUnit(cost)}</td><td class="px-2 py-px text-center  text-purple-700 align-middle">${fmtNoUnit(paid)}</td><td class="px-2 py-px text-center  align-middle text-sm">${paidR}</td><td class="p-2 text-center font-semibold align-middle ${cfCls}">${cf}</td></tr><tr class="hidden" id="fin_expand_${pf.id}"><td colspan="13"><table class="w-full"><thead><tr class="border-b border-slate-200"><th class="px-2 py-1"></th><th class="px-2 py-1"></th><th class="px-2 py-1 text-center text-xs text-slate-400">月份</th><th class="px-2 py-1 text-center text-xs text-slate-400">确收</th><th class="px-2 py-1 text-center text-xs text-slate-400">毛利</th><th class="px-2 py-1"></th><th class="px-2 py-1 text-center text-xs text-slate-400">回款</th><th class="px-2 py-1"></th><th class="px-2 py-1 text-center text-xs text-slate-400">成本</th><th class="px-2 py-1 text-center text-xs text-slate-400">支出</th><th class="px-2 py-1"></th><th class="px-2 py-1 text-center text-xs text-slate-400">现金流</th></tr></thead><tbody>${detailRows}</tbody></table></td></tr>`;
       };
       // 待签约简版行
       const tdRowUnsigned = (pf, cost, gross) => {
@@ -689,7 +716,7 @@ window.editPfSignMonth = (event, pfId) => {
 };
 
 window.switchFinanceTab = (tab) => {
-  document.querySelectorAll(".finance-tab").forEach(b => b.classList.toggle("active", b.dataset.tab === tab));
+  document.querySelectorAll("#financeModal .finance-tab").forEach(b => b.classList.toggle("active", b.dataset.tab === tab));
   document.querySelector("#financeTabInfo").classList.toggle("hidden", tab !== "info");
   document.querySelector("#financeTabRevpay").classList.toggle("hidden", tab !== "revpay");
   document.querySelector("#financeTabCost").classList.toggle("hidden", tab !== "cost");
@@ -752,6 +779,19 @@ window.deleteFinFollowup = async (event, followupId) => {
   if (pfId) await loadFinFollowups(pfId);
 };
 
+window.finToggleExpand = (pfId) => {
+  var row = document.getElementById('fin_expand_' + pfId);
+  var icon = document.getElementById('fin_expand_icon_' + pfId);
+  if (!row) return;
+  if (row.classList.contains('hidden')) {
+    row.classList.remove('hidden');
+    if (icon) { icon.setAttribute('data-lucide', 'chevron-down'); if (window.lucide) window.lucide.createIcons(); }
+  } else {
+    row.classList.add('hidden');
+    if (icon) { icon.setAttribute('data-lucide', 'chevron-right'); if (window.lucide) window.lucide.createIcons(); }
+  }
+};
+
 window.openPfEditModal = (pfId) => {
   const pf = (state.data.projectFinances || []).find(x => x.id === pfId);
   if (!pf) return;

static/modules/home.js

@@ -117,7 +117,7 @@ function renderHome() {
   }
   document.querySelector("#home").innerHTML = `
     <div class="grid gap-5">
-      ${state.tenant === "总览" ? "" : `<div class="grid grid-cols-4 gap-3">
+      ${`<div class="grid grid-cols-4 gap-3">
         ${[
           ["项目管理", m.total_projects, "finance"],
           ["重点工作与台账", m.total_proposals, "projects"],

static/modules/plan.js

@@ -112,7 +112,7 @@ function renderPlan() {
   const finHeaderBase = `<div class="flex items-center gap-2"><button onclick="setPlanView('overview')" class="px-3 py-0.5 rounded text-sm font-medium ${state.planView==='overview'?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">总视图</button><span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">年份：</span><select onchange="setPlanYear(this.value)" class="px-2 py-0.5 rounded text-sm font-medium border border-slate-200 bg-white">${yearOpts.map(y => `<option value="${y}" ${state.planYear===y?'selected':''}>${y}</option>`).join('')}</select><span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">季度：</span>${qLabels.map((q,i) => `<button onclick="setPlanQuarter(${i})" class="px-3 py-0.5 rounded text-sm font-medium ${state.planView==='quarterly'&&activeQ===i?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${q}</button>`).join('')}<span class="text-slate-300 mx-2">|</span><span class="text-sm text-slate-500">月度：</span>${activeMonths.map(m => { const ms = `${state.planYear}-${String(m).padStart(2,'0')}`; return `<button onclick="setPlanMonth('${ms}')" class="px-3 py-0.5 rounded text-sm font-medium ${state.planView==='monthly'&&state.planMonth===ms?'bg-blue-600 text-white':'bg-slate-100 text-slate-600 hover:bg-slate-200'}">${m}月</button>`; }).join('')}</div>`;
   const finAddBtn = `<button class="btn btn-primary btn-sm" onclick="openPlanModal()">新增财务项目</button>`;
 
-  const isOverviewMode = state.tenant === "总览";
+  const isOverviewMode = false;
   const planFilterTabs = `<div class="finance-tabs" style="padding:0 0 0 0;border-bottom:1px solid #e2e8f0;margin-bottom:0;display:flex;gap:4px"><button onclick="switchPlanFilter('overview')" class="finance-tab${state.planFilter==='overview'?' active':''}" style="font-size:14px;font-weight:600;padding:8px 16px;margin-right:0">经营月报</button><button onclick="switchPlanFilter('quarterlyOverview')" class="finance-tab${state.planFilter==='quarterlyOverview'?' active':''}" style="font-size:14px;font-weight:600">经营季报</button>${isOverviewMode ? '' : `<button onclick="switchPlanFilter('projects')" class="finance-tab${state.planFilter==='projects'?' active':''}" style="font-size:14px;font-weight:600">项目管理 (${pfs.length})</button><button onclick="switchPlanFilter('expense')" class="finance-tab${state.planFilter==='expense'?' active':''}" style="font-size:14px;font-weight:600">平台费用计划</button>`}</div>`;
 
   document.querySelector("#plan").innerHTML = `<div class="grid gap-2">
@@ -264,10 +264,14 @@ function renderPlan() {
         { label: '付款率', hideUnsigned: true, value: ctx => ctx.sumCost && ctx.sumPaid ? Math.round(ctx.sumPaid / ctx.sumCost * 100) + '%' : '—', color: 'text-slate-500' },
       ].filter(c => true);
 
-      // 列排序
-      if (!state.planSort) state.planSort = { key: null, asc: true };
+      // 列排序（默认按确收金额从高到低）
+      if (!state.planSort) state.planSort = { key: 'sig|rev', asc: false };
       const sortData = (data, key) => {
-        if (!key || !state.planSort.key) return data;
+        if (!key) return data;
+        if (!state.planSort.key) {
+          // 默认按确收金额从高到低
+          return data.slice().sort(function(a, b) { return (parseFloat(b.rev) || 0) - (parseFloat(a.rev) || 0); });
+        }
         var asc = state.planSort.asc ? 1 : -1;
         return data.slice().sort(function(a, b) {
           var va = a[key], vb = b[key];
@@ -351,14 +355,19 @@ function renderPlan() {
         var expenseArr = [];
         try { budgetArr = JSON.parse(pf.budget_data || "[]"); } catch(e) {}
         try { expenseArr = JSON.parse(pf.expense_data || "[]"); } catch(e) {}
-        var detailRows = budgetArr.filter(function(b) {
-          var exp = expenseArr.find(function(e) { return e.month === (b.month || ''); }) || {};
+        // 合并 budget 和 expense 的所有月份
+        var allMonths = {};
+        budgetArr.forEach(function(b) { allMonths[b.month || ''] = true; });
+        expenseArr.forEach(function(e) { allMonths[e.month || ''] = true; });
+        var detailRows = Object.keys(allMonths).filter(function(m) {
+          var b = budgetArr.find(function(x) { return x.month === m; }) || {};
+          var exp = expenseArr.find(function(x) { return x.month === m; }) || {};
           var bRev = parseFloat(b.rev || 0), bGross = parseFloat(b.gross || 0), bPay = parseFloat(b.payment || 0);
           var eCost = parseFloat(exp.cost || 0), ePaid = parseFloat(exp.paid || 0);
           return bRev || bGross || bPay || eCost || ePaid;
-        }).map(function(b) {
-          var m = b.month || '';
-          var exp = expenseArr.find(function(e) { return e.month === m; }) || {};
+        }).sort().map(function(m) {
+          var b = budgetArr.find(function(x) { return x.month === m; }) || {};
+          var exp = expenseArr.find(function(x) { return x.month === m; }) || {};
           var bRev = parseFloat(b.rev || 0), bGross = parseFloat(b.gross || 0), bPay = parseFloat(b.payment || 0);
           var eCost = parseFloat(exp.cost || 0), ePaid = parseFloat(exp.paid || 0);
           var bCf = bPay - ePaid;

static/modules/projects.js

@@ -1,7 +1,7 @@
 // projects.js — 重点工作与台账（项目管理 + 任务管理）
 
 function applyUserTenants() {
-  fetch("/api/auth/me").then(r => r.json()).then(data => {
+  return fetch("/api/auth/me").then(r => r.json()).then(data => {
     if (!data.logged_in) { window.location.href = "/login"; return; }
     const user = data.user;
     const avatar = document.querySelector("#userAvatar");
@@ -15,6 +15,13 @@ function applyUserTenants() {
     });
     // 缓存可用工作台列表，供下拉菜单使用
     state.allowedTenants = data.tenants || [];
+    // 如果当前工作台不在权限范围内，选择第一个
+    if (state.allowedTenants.length > 0 && state.allowedTenants.indexOf(state.tenant) < 0) {
+      state.tenant = state.allowedTenants[0];
+      localStorage.setItem("opc-active-tenant", state.tenant);
+      var label0 = state.tenant.replace("·无界", "");
+      document.querySelector("#workspaceTitle").textContent = label0 + " OPC 工作台";
+    }
     updateTenantLabel();
   });
 }
@@ -25,7 +32,7 @@ window.toggleTenantMenu = (event) => {
   if (menu) { menu.remove(); return; }
   const btn = event.currentTarget;
   const rect = btn.getBoundingClientRect();
-  const tenants = (state.allowedTenants || []).slice().sort(function(a, b) { var order = ['总览','学术·无界','MCN·无界','科普·无界','医患·无界','科研·无界']; var ai = order.indexOf(a); var bi = order.indexOf(b); if (ai < 0) ai = 99; if (bi < 0) bi = 99; return ai - bi; });
+  const tenants = (state.allowedTenants || []).slice().sort(function(a, b) { var order = ['学术·无界','MCN·无界','科普·无界','医患·无界','科研·无界']; var ai = order.indexOf(a); var bi = order.indexOf(b); if (ai < 0) ai = 99; if (bi < 0) bi = 99; return ai - bi; });
   menu = document.createElement("div");
   menu.id = "tenantMenu";
   menu.className = "fixed bg-white rounded-lg shadow-xl border border-slate-200 py-1 min-w-[160px] z-[9999]";
@@ -56,7 +63,7 @@ window.switchTenantFromMenu = (tenant) => {
 };
 
 function updateTenantLabel() {
-  const tenants = (state.allowedTenants || []).slice().sort(function(a, b) { var order = ['总览','学术·无界','MCN·无界','科普·无界','医患·无界','科研·无界']; var ai = order.indexOf(a); var bi = order.indexOf(b); if (ai < 0) ai = 99; if (bi < 0) bi = 99; return ai - bi; });
+  const tenants = (state.allowedTenants || []).slice().sort(function(a, b) { var order = ['学术·无界','MCN·无界','科普·无界','医患·无界','科研·无界']; var ai = order.indexOf(a); var bi = order.indexOf(b); if (ai < 0) ai = 99; if (bi < 0) bi = 99; return ai - bi; });
   var tenantIcons = {
     '学术·无界': 'graduation-cap',
     'MCN·无界': 'video',
@@ -84,7 +91,7 @@ window.toggleTenantMenu = (event) => {
   if (menu) { menu.remove(); return; }
   const btn = event.currentTarget;
   const rect = btn.getBoundingClientRect();
-  const tenants = (state.allowedTenants || []).slice().sort(function(a, b) { var order = ['总览','学术·无界','MCN·无界','科普·无界','医患·无界','科研·无界']; var ai = order.indexOf(a); var bi = order.indexOf(b); if (ai < 0) ai = 99; if (bi < 0) bi = 99; return ai - bi; });
+  const tenants = (state.allowedTenants || []).slice().sort(function(a, b) { var order = ['学术·无界','MCN·无界','科普·无界','医患·无界','科研·无界']; var ai = order.indexOf(a); var bi = order.indexOf(b); if (ai < 0) ai = 99; if (bi < 0) bi = 99; return ai - bi; });
   var tenantIcons = {
     '学术·无界': 'graduation-cap',
     'MCN·无界': 'video',

static/modules/utils.js

@@ -123,7 +123,7 @@ var _loadingSteps = [
   { fn: 'renderProposals', label: '正在加载业务方案列表' },
   { fn: 'renderProducts', label: '正在加载产品迭代列表' },
   { fn: 'renderPerformance', label: '正在加载绩效管理' },
-  { fn: 'renderFinance', label: '正在加载执行模块（表格+总览+图表）' },
+  { fn: 'renderFinance', label: '正在加载已发生模块（表格+总览+图表）' },
   { fn: 'renderPlan', label: '正在加载预算模块' },
 ];
 
@@ -185,15 +185,22 @@ async function load() {
   if (!state.data.planExpense) state.data.planExpense = [];
   clearTabCache();
   updateLoadingStep(0, allSteps.length);
-  // 首次加载时确保标准资料库 7 项已初始化
-  if (typeof ensureStandardProposals === "function") {
-    const existing = (state.data.proposals || []).filter(p => p.proposal_type === "标准资料");
-    const missingCount = 7 - existing.length;
-    if (missingCount > 0) {
-      hideLoadingOverlay();
-      await ensureStandardProposals();
-      return;  // ensureStandardProposals 内部会再次 render
-    }
+  // 按需加载当前 tab 的数据（必须在 ensureStandardProposals 之前，否则会被 return 跳过）
+  await ensureTabData(state.active);
+  // 首次加载时确保标准资料库 7 项已初始化（仅首次，避免每次切换工作台都触发）
+  if (!_proposalsInitialized && typeof ensureStandardProposals === "function") {
+    _proposalsInitialized = true;
+    try {
+      const proposalsData = await api("/api/proposals/list?tenant=" + encodeURIComponent(state.tenant));
+      state.data.proposals = proposalsData;
+      const existing = (proposalsData || []).filter(p => p.proposal_type === "标准资料");
+      const missingCount = 7 - existing.length;
+      if (missingCount > 0) {
+        hideLoadingOverlay();
+        await ensureStandardProposals();
+        return;
+      }
+    } catch(e) { /* non-critical */ }
   }
   // 逐步渲染
   for (var i = 0; i < _loadingSteps.length; i++) {
@@ -221,6 +228,7 @@ var _tabResourceMap = {
 };
 
 var _tabLoaded = {};
+var _proposalsInitialized = false;
 
 async function ensureTabData(tab) {
   if (tab === 'home' || tab === 'performance') return;
@@ -231,10 +239,12 @@ async function ensureTabData(tab) {
   _tabLoaded[dataKey + '_' + state.tenant] = true;
   try {
     state.data[dataKey] = await api("/api/" + resource + "/list?tenant=" + encodeURIComponent(state.tenant));
-  } catch(e) { /* non-critical */ }
+  } catch(e) { console.error('ensureTabData failed:', resource, e.message); }
   // Load related expense data for finance/plan tabs
   if (tab === 'finance') {
     try { state.data.expense = await api("/api/expense/list?tenant=" + encodeURIComponent(state.tenant)); } catch(e) {}
+    try { state.data.finance = await api("/api/finance/list?tenant=" + encodeURIComponent(state.tenant)); } catch(e) {}
+    try { state.data.tasks = await api("/api/tasks/list?tenant=" + encodeURIComponent(state.tenant)); } catch(e) {}
   } else if (tab === 'plan') {
     try { state.data.planExpense = await api("/api/planExpense/list?tenant=" + encodeURIComponent(state.tenant)); } catch(e) {}
   }
@@ -356,7 +366,7 @@ window.setPlanSort = (key) => {
   else { state.planSort.key = key; state.planSort.asc = true; }
   renderPlan();
 };
-window.switchTenant = (tenant) => {
+window.switchTenant = async (tenant) => {
   state.tenant = tenant;
   state.selectedProject = null;
   localStorage.setItem("opc-active-tenant", tenant);
@@ -364,7 +374,8 @@ window.switchTenant = (tenant) => {
   if (typeof updateTenantLabel === "function") updateTenantLabel();
   updateSidebarTabs();
   if (tenant === "总览") { state.planFilter = 'overview'; state.finFilter = 'overview'; switchTab("home"); }
-  load();
+  else if (state.active === 'home') { state.active = 'plan'; localStorage.setItem("opc-active-tab", "plan"); document.querySelectorAll(".sidebar-tab").forEach((btn) => btn.classList.toggle("active", btn.dataset.tab === "plan")); document.querySelectorAll(".panel").forEach((panel) => panel.classList.toggle("active", panel.id === "plan")); }
+  await load();
 };
 
 // 轻量刷新辅助函数

templates/index.html

@@ -49,9 +49,9 @@
             <i data-lucide="calendar-range" style="width:20px;height:20px"></i>
             <span class="text-[10px] mt-1">预算</span>
           </div>
-          <div class="sidebar-tab" data-tab="finance" onclick="switchTab('finance')" title="执行">
+          <div class="sidebar-tab" data-tab="finance" onclick="switchTab('finance')" title="已发生">
             <i data-lucide="folder-open-dot" style="width:20px;height:20px"></i>
-            <span class="text-[10px] mt-1">执行</span>
+            <span class="text-[10px] mt-1">已发生</span>
           </div>
           <div class="sidebar-tab" data-tab="projects" onclick="switchTab('projects')" title="Focus">
             <i data-lucide="file-text" style="width:20px;height:20px"></i>
@@ -76,7 +76,7 @@
     <header class="topbar border-b border-slate-200 bg-white px-8 py-5">
       <div class="flex items-center gap-3 w-full">
         <div class="flex-1">
-          <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager <span class="ml-2 text-xs font-normal text-slate-400 tracking-normal">v1.2.0.4</span></p>
+          <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager <span class="ml-2 text-xs font-normal text-slate-400 tracking-normal">v1.2.0.10</span></p>
           <div class="flex items-center gap-4 mt-1">
             <h1 class="text-2xl font-semibold" id="workspaceTitle">科普 OPC 工作台</h1>
             <div class="hidden sm:flex items-center gap-1.5 bg-gradient-to-r from-blue-50 to-indigo-50 border border-blue-100 rounded-full px-4 py-1.5">