v3.1.5 — 移除财务页面内嵌的旧表单，仅保留弹窗

backend/flask_app.py

@@ -319,11 +319,11 @@ def attach_common(conn, resource, items):
 def monthly_finance(conn, tenant="科普·无界"):
     from datetime import date
     today = date.today()
-    # 12 months: 9 before + current + 2 after
+    # 6 months: 3 before + current + 2 after
     from dateutil.relativedelta import relativedelta
-    start = today + relativedelta(months=-9)
+    start = today + relativedelta(months=-3)
     months = []
-    for i in range(12):
+    for i in range(6):
         m = start + relativedelta(months=i)
         months.append(m.strftime("%Y-%m"))
     data = []

static/app.js

@@ -3,6 +3,7 @@ const state = {
   data: null,
   tenant: "科普·无界",
   opFilter: "all",
+  finFilter: "已签单",
   projectView: null,
   chart: null,
   chart2: null,
@@ -241,12 +242,21 @@ window.createFinance = async (event) => {
     data["rev_"+k] = parseFloat(data["rev_"+k]) || 0;
     data["gross_"+k] = parseFloat(data["gross_"+k]) || 0;
   }
+  const pfId = data.pf_id;
+  delete data.pf_id;
   try {
+    if (pfId) {
+      await api("/api/projectFinances/" + pfId, { method: "PUT", body: JSON.stringify({ data }) });
+    } else {
       await api("/api/projectFinances", { method: "POST", body: JSON.stringify({ data }) });
+    }
     form.reset();
+    document.querySelector("#pf-id-input").value = "";
+    document.querySelector("#financeModalTitle").textContent = "新增项目财务";
+    closeFinanceModal();
     await load();
   } catch (error) {
-    alert("新增失败：" + error.message);
+    alert("保存失败：" + error.message);
   }
 };
 window.switchTab = switchTab;
@@ -427,6 +437,13 @@ function renderProducts() {
 function renderFinance() {
   const pfs = state.data.projectFinances || [];
   const ops = state.data.operations || [];
+  const fmTypesByTenant = {
+    "科普·无界": ["科普音频","科普视频","科普文章","全品类科普"],
+    "科研·无界": ["真实世界研究","调研问卷","病例征集","患者招募"],
+    "医患·无界": ["医患运营","患者管理","患教会","创新支付","电商","其他"],
+  };
+  const fmTypes = fmTypesByTenant[state.tenant] || fmTypesByTenant["科普·无界"];
+  const tenantOps = (state.data.operations || []).filter(o => (o.project_name || "").includes(state.tenant.replace("·无界","")) || o.tenant === state.tenant);
   const months = ["2026-06","2026-07","2026-08","2026-09"];
   const monthLabels = ["6月","7月","8月","9月"];
   
@@ -444,7 +461,7 @@ function renderFinance() {
       const gross = pf["gross_"+m.replace("-","_")] || 0;
       return `<td class="p-2 text-right whitespace-nowrap"><span class="${rev ? 'text-blue-700 font-medium' : 'text-slate-300'}">${rev ? money(rev) : '—'}</span><br><span class="text-xs ${gross ? 'text-green-600' : 'text-slate-300'}">${gross ? money(gross) : '—'}</span></td>`;
     }).join("");
-    return `<tr class="border-b border-slate-100 hover:bg-slate-50"><td class="p-2 text-sm font-medium">${pf.customer_name}</td><td class="p-2 text-sm">${pf.business_type}</td><td class="p-2 text-sm">${pf.status === "已签单" ? badge("已签") : badge(pf.status,"amber")}</td><td class="p-2 text-right text-sm">${money(pf.sign_amount)}</td>${mCols}<td class="p-2 text-sm text-slate-500">${pf.sales_person || ""}</td></tr>`;
+    return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium">${pf.customer_name}</td><td class="p-2 text-sm">${pf.business_type}</td><td class="p-2 text-sm">${pf.status === "已签单" ? badge("已签") : badge(pf.status,"amber")}</td><td class="p-2 text-right text-sm">${money(pf.sign_amount)}</td>${mCols}<td class="p-2 text-sm text-slate-500">${pf.sales_person || ""}</td></tr>`;
   };
 
   document.querySelector("#finance").innerHTML = `<div class="grid gap-4">
@@ -452,11 +469,41 @@ function renderFinance() {
       ${[["已签项目","" + signed.length],["签约金额",money(sumSign)],["待签项目","" + pending.length],["待签金额",money(sumPending)],["本月确收",money(monthRev[0])],["本月毛利",money(monthGross[0])]].map(([l,v]) => `<div class="bg-white rounded-lg border border-slate-200 p-3 text-center"><p class="text-xs text-slate-500">${l}</p><p class="text-xl font-bold text-slate-800">${v}</p></div>`).join("")}
     </div>
     ${card(`<div class="flex items-center justify-between cursor-pointer" onclick="toggleFinanceChart()"><h2 class="text-lg font-bold text-slate-700">月度趋势</h2><i data-lucide="chevron-down" class="transition-transform rotate-90" id="financeChartIcon"></i></div><div id="financeChartWrap" class="hidden mt-4"><div style="position:relative;height:300px"><canvas id="financeChart2"></canvas></div></div>`, "p-5")}
-    ${card(`<div class="flex items-center justify-between cursor-pointer" onclick="document.querySelector('#pf-form-wrap').classList.toggle('hidden')"><h3 class="font-bold text-slate-700">新增项目财务</h3><i data-lucide="plus-circle" class="text-blue-600"></i></div><div id="pf-form-wrap" class="hidden mt-3"><form onsubmit="createFinance(event)" class="grid gap-3"><div class="grid grid-cols-3 gap-3"><label class="text-xs text-slate-500">项目<select name="project_id" class="w-full rounded border px-2 py-1.5 text-sm">${ops.map(o => `<option value="${o.id}">${o.project_name}</option>`).join("")}</select></label><label class="text-xs text-slate-500">业务类型<select name="business_type" class="w-full rounded border px-2 py-1.5 text-sm">${["患者管理","创新支付","电商","MCN","科普视频","科普运营","医患运营","真实世界研究","其他"].map(t => `<option>${t}</option>`).join("")}</select></label><label class="text-xs text-slate-500">客户名称<input name="customer_name" class="w-full rounded border px-2 py-1.5 text-sm"></label><label class="text-xs text-slate-500">签约金额/万<input name="sign_amount" type="number" step="0.01" class="w-full rounded border px-2 py-1.5 text-sm"></label><label class="text-xs text-slate-500">签约月份<input name="sign_month" class="w-full rounded border px-2 py-1.5 text-sm"></label><label class="text-xs text-slate-500">状态<select name="status" class="w-full rounded border px-2 py-1.5 text-sm"><option>已签单</option><option>待签</option></select></label></div><div class="grid grid-cols-8 gap-2">${["06","07","08","09"].map(m => `<div class="border rounded p-2"><p class="text-xs text-slate-400 mb-1">${m}月</p><label class="text-xs text-slate-500">确收<br><input name="rev_2026_${m}" type="number" step="0.01" class="w-full rounded border px-1 py-1 text-sm" placeholder="万"></label><label class="text-xs text-slate-500 mt-1">毛利<br><input name="gross_2026_${m}" type="number" step="0.01" class="w-full rounded border px-1 py-1 text-sm" placeholder="万"></label></div>`).join("")}</div><button type="submit" class="btn btn-primary btn-sm justify-self-end">新增项目财务</button></form></div>`, "p-4")}
+    
-    ${card(`<h3 class="font-bold text-slate-700 mb-3">项目明细 <span class="text-slate-400 font-normal">(${pfs.length})</span></h3><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-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>${monthLabels.map(l => `<th class="p-2 text-center font-semibold">${l}<br><span class="text-xs text-slate-400">确收/毛利</span></th>`).join("")}<th class="p-2 text-left font-semibold">销售</th></tr></thead><tbody>${pfs.map(renderPfRow).join("")}</tbody></table></div>`, "p-4")}
+    <div class="flex justify-end"><button class="btn btn-primary btn-sm" onclick="openFinanceModal()"><i data-lucide="plus"></i>新增财务项目</button></div>
+    <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-5xl 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><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closeFinanceModal()"><i data-lucide="x"></i></button></div><form onsubmit="createFinance(event)" class="p-8 grid gap-6"><input type="hidden" name="pf_id" id="pf-id-input" value=""><div class="grid grid-cols-2 gap-6"><div class="bg-slate-50 rounded-xl p-5"><h4 class="text-sm font-semibold text-slate-500 mb-4 flex items-center gap-2"><i data-lucide="briefcase-business"></i>基本信息</h4><div class="grid gap-4"><label class="block"><span class="text-xs font-medium text-slate-500">项目</span><select name="project_id" class="mt-1 block w-full rounded-lg border border-slate-200 px-3 py-2.5 text-sm bg-white">${tenantOps.map(o => `<option value="${o.id}">${o.project_name}</option>`).join("")}</select></label><label class="block"><span class="text-xs font-medium text-slate-500">业务类型</span><select name="business_type" class="mt-1 block w-full rounded-lg border border-slate-200 px-3 py-2.5 text-sm bg-white">${fmTypes.map(t => `<option>${t}</option>`).join("")}</select></label><label class="block"><span class="text-xs font-medium text-slate-500">客户名称</span><input name="customer_name" class="mt-1 block w-full rounded-lg border border-slate-200 px-3 py-2.5 text-sm"></label></div></div><div class="bg-slate-50 rounded-xl p-5"><h4 class="text-sm font-semibold text-slate-500 mb-4 flex items-center gap-2"><i data-lucide="banknote"></i>签约信息</h4><div class="grid gap-4"><label class="block"><span class="text-xs font-medium text-slate-500">签约金额（万元）</span><input name="sign_amount" type="number" step="0.01" class="mt-1 block w-full rounded-lg border border-slate-200 px-3 py-2.5 text-sm" placeholder="0.00"></label><label class="block"><span class="text-xs font-medium text-slate-500">签约月份</span><input name="sign_month" class="mt-1 block w-full rounded-lg border border-slate-200 px-3 py-2.5 text-sm" placeholder="如 2026-06"></label><label class="block"><span class="text-xs font-medium text-slate-500">项目状态</span><select name="status" class="mt-1 block w-full rounded-lg border border-slate-200 px-3 py-2.5 text-sm bg-white"><option>已签单</option><option>待签</option></select></label></div></div></div><div class="bg-slate-50 rounded-xl p-5"><h4 class="text-sm font-semibold text-slate-500 mb-4 flex items-center gap-2"><i data-lucide="calendar"></i>月度确收 & 毛利预估（万元）</h4><div class="grid grid-cols-4 gap-3">${["06","07","08","09"].map(m => `<div class="bg-white rounded-lg border border-slate-200 p-3 text-center"><p class="text-xs font-semibold text-slate-400 mb-2">${m}月</p><div class="grid grid-cols-2 gap-2"><div><p class="text-[10px] text-slate-400 mb-0.5">确收</p><input name="rev_2026_${m}" type="number" step="0.01" class="w-full rounded-md border border-slate-200 px-2 py-1.5 text-sm text-center" placeholder="—"></div><div><p class="text-[10px] text-slate-400 mb-0.5">毛利</p><input name="gross_2026_${m}" type="number" step="0.01" class="w-full rounded-md border border-slate-200 px-2 py-1.5 text-sm text-center" placeholder="—"></div></div></div>`).join("")}</div></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>
+
+    ${card(`<h3 class="font-bold text-slate-700 mb-3">项目明细 <span class="text-slate-400 font-normal">(${pfs.length})</span></h3><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-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>${monthLabels.map(l => `<th class="p-2 text-center font-semibold">${l}<br><span class="text-xs text-slate-400">确收/毛利</span></th>`).join("")}<th class="p-2 text-left font-semibold">销售</th></tr></thead><tbody>${pfs.filter(x => x.status === state.finFilter).map(renderPfRow).join("")}</tbody></table></div>`, "p-4")}
   </div>`;
   if (window.lucide) window.lucide.createIcons();
 }
+
+window.openFinanceModal = () => {
+  const modal = document.querySelector("#financeModal");
+  modal.classList.remove("hidden");
+};
+window.closeFinanceModal = () => {
+  const modal = document.querySelector("#financeModal");
+  modal.classList.add("hidden");
+};
+window.openPfEditModal = (pfId) => {
+  const pf = (state.data.projectFinances || []).find(x => x.id === pfId);
+  if (!pf) return;
+  document.querySelector("#pf-id-input").value = pf.id;
+  document.querySelector("#financeModalTitle").textContent = "编辑项目财务";
+  const form = document.querySelector("#financeModal form");
+  form.querySelector('[name="project_id"]').value = pf.project_id || "";
+  form.querySelector('[name="business_type"]').value = pf.business_type || "";
+  form.querySelector('[name="customer_name"]').value = pf.customer_name || "";
+  form.querySelector('[name="sign_amount"]').value = pf.sign_amount || "";
+  form.querySelector('[name="sign_month"]').value = pf.sign_month || "";
+  form.querySelector('[name="status"]').value = pf.status || "已签单";
+  for (const m of ["06","07","08","09"]) {
+    form.querySelector('[name="rev_2026_' + m + '"]').value = pf["rev_2026_" + m] || "";
+    form.querySelector('[name="gross_2026_' + m + '"]').value = pf["gross_2026_" + m] || "";
+  }
+  openFinanceModal();
+};
 window.toggleFinanceChart = () => {
   const wrap = document.querySelector("#financeChartWrap");
   const icon = document.querySelector("#financeChartIcon");