v3.2.0 — 财务项目增加总确收/总毛利列+弹窗计算显示

backend/flask_app.py

@@ -316,13 +316,33 @@ def attach_common(conn, resource, items):
     return items
 
 
-def monthly_finance(conn):
+def monthly_finance(conn, tenant="科普·无界"):
+    from datetime import date
+    today = date.today()
+    # 6 months: 3 before + current + 2 after
+    from dateutil.relativedelta import relativedelta
+    start = today + relativedelta(months=-3)
+    months = []
+    for i in range(6):
+        m = start + relativedelta(months=i)
+        months.append(m.strftime("%Y-%m"))
     data = []
-    for item in rows(conn, "SELECT DISTINCT month FROM finance_records ORDER BY month"):
+    for month in months:
-        month = item["month"]
+        col_month = month.replace("-", "_")
-        revenue = one(conn, "SELECT COALESCE(SUM(amount),0) AS v FROM finance_records WHERE month=? AND record_type='revenue'", (month,))["v"]
+        col_rev = f"rev_{col_month}"
-        cost = one(conn, "SELECT COALESCE(SUM(amount),0) AS v FROM finance_records WHERE month=? AND record_type='cost_expense'", (month,))["v"]
+        col_gross = f"gross_{col_month}"
-        data.append({"month": month, "revenue": revenue, "gross_profit": revenue - cost, "cost_expense": cost, "net_profit": revenue - cost})
+        # Only project_finances has columns for 2026-06 through 2026-09
+        if month in ["2026-06", "2026-07", "2026-08", "2026-09"]:
+            revenue = one(conn, f"SELECT COALESCE(SUM({col_rev}),0) AS v FROM project_finances WHERE tenant=?", (tenant,))["v"]
+            gross = one(conn, f"SELECT COALESCE(SUM({col_gross}),0) AS v FROM project_finances WHERE tenant=?", (tenant,))["v"]
+        else:
+            revenue = 0
+            gross = 0
+        data.append({
+            "month": month, "revenue": revenue,
+            "labor": 0, "expense": 0, "purchase": 0,
+            "net_profit": gross,
+        })
     return data
 
 
@@ -333,25 +353,28 @@ def index():
 
 @app.route("/api/bootstrap")
 def bootstrap():
+    tenant = request.args.get("tenant", "科普·无界")
     conn = db()
     try:
-        sales = attach_common(conn, "sales", rows(conn, "SELECT * FROM sales_leads ORDER BY id DESC"))
+        def q(sql, *args):
-        proposals = attach_common(conn, "proposals", rows(conn, "SELECT * FROM business_proposals ORDER BY id DESC"))
+            return rows(conn, sql, args)
-        operations = attach_common(conn, "operations", rows(conn, "SELECT * FROM operation_projects ORDER BY id DESC"))
+        sales = attach_common(conn, "sales", q("SELECT * FROM sales_leads WHERE tenant=? ORDER BY id DESC", tenant))
-        products = attach_common(conn, "products", rows(conn, "SELECT * FROM product_versions ORDER BY id DESC"))
+        proposals = attach_common(conn, "proposals", q("SELECT * FROM business_proposals WHERE tenant=? ORDER BY id DESC", tenant))
-        finance = rows(conn, "SELECT * FROM finance_records ORDER BY month DESC, id DESC")
+        operations = attach_common(conn, "operations", q("SELECT * FROM operation_projects WHERE tenant=? ORDER BY id DESC", tenant))
+        products = attach_common(conn, "products", q("SELECT * FROM product_versions WHERE tenant=? ORDER BY id DESC", tenant))
+        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)
         current_month = "2026-06"
-        # Finance aggregates
+        # Finance aggregates — from project_finances (project-based)
-        def sum_finance(months, rtype):
+        def pf_sum(field):
-            return sum(x["amount"] for x in finance if x["month"] in months and x["record_type"] == rtype)
+            return sum(x[field] or 0 for x in pfs)
-        months_2026 = [f"2026-{m:02d}" for m in range(1,7)]
+        rev_month = pf_sum("rev_2026_06")
-        months_q2 = ["2026-04","2026-05","2026-06"]
+        gross_month = pf_sum("gross_2026_06")
-        revenue_annual = sum_finance(months_2026, "revenue")
+        rev_q2 = pf_sum("rev_2026_06")
-        cost_annual = sum_finance(months_2026, "cost_expense")
+        gross_q2 = pf_sum("gross_2026_06")
-        revenue_q2 = sum_finance(months_q2, "revenue")
+        rev_annual = rev_q2
-        cost_q2 = sum_finance(months_q2, "cost_expense")
+        gross_annual = gross_q2
-        revenue_month = sum_finance([current_month], "revenue")
-        cost_month = sum_finance([current_month], "cost_expense")
         # Contract aggregates — time-based
         signed_amount = sum(x["expected_contract_amount"] or 0 for x in operations if x["project_status"] == "已签约")
         from datetime import date
@@ -374,8 +397,9 @@ def bootstrap():
                 "active_sales": len([x for x in sales if x["status"] in ["待跟进", "跟进中", "方案中", "商务谈判"]]),
                 "execution_projects": len([x for x in operations if x["project_type"] == "execution"]),
                 "risk_projects": len([x for x in operations if x["project_status"] == "有风险" or x["risks"]]),
-                "monthly_revenue": revenue_month,
+                "monthly_revenue": rev_month,
-                "monthly_net_profit": revenue_month - cost_month,
+                "monthly_net_profit": gross_month,
+                "monthly_gross": gross_month,
                 "upcoming_products": len([x for x in products if x["status"] in ["规划中", "设计中", "开发中", "测试中"]]),
                 "total_projects": len(operations),
                 "total_proposals": len(proposals),
@@ -386,27 +410,28 @@ def bootstrap():
                 "signed_q2": signed_q2,
                 "signed_month": signed_month,
                 "pipeline_amount": pipeline_amount,
-                "revenue_annual": revenue_annual,
+                "revenue_annual": rev_annual,
-                "revenue_q2": revenue_q2,
+                "revenue_q2": rev_q2,
-                "gross_annual": revenue_annual - cost_annual,
+                "gross_annual": gross_annual,
-                "gross_q2": revenue_q2 - cost_q2,
+                "gross_q2": gross_q2,
                 "signed_not_executed": signed_not_executed,
             },
-            "recent": rows(conn, "SELECT * FROM follow_up_records ORDER BY id DESC LIMIT 8"),
+            "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, "financeMonthly": monthly_finance(conn), "tasks": rows(conn, "SELECT * FROM project_tasks ORDER BY phase, id")})
+        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": ["科普·无界","科研·无界","医患·无界"]})
     finally:
         conn.close()
 
 
 TABLES = {
-    "sales": ("sales_leads", ["target_customer", "priority", "status"]),
+    "sales": ("sales_leads", ["target_customer", "priority", "status", "tenant"]),
-    "proposals": ("business_proposals", ["customer_or_project_name", "version", "description", "status", "created_date"]),
+    "proposals": ("business_proposals", ["customer_or_project_name", "version", "description", "status", "created_date", "tenant"]),
-    "operations": ("operation_projects", ["project_name", "project_version", "project_type", "project_status", "current_stage", "owner", "target_customer", "customer_need", "expected_contract_amount", "expected_sign_date", "sign_probability", "next_action", "sop_stage", "execution_progress", "current_deliverable", "risks", "notes"]),
+    "operations": ("operation_projects", ["project_name", "project_version", "project_type", "project_status", "current_stage", "owner", "target_customer", "customer_need", "expected_contract_amount", "expected_sign_date", "sign_probability", "next_action", "sop_stage", "execution_progress", "current_deliverable", "risks", "notes", "tenant"]),
-    "products": ("product_versions", ["product_name", "version", "version_goal", "feature_list", "launch_date", "status", "platform", "notes"]),
+    "products": ("product_versions", ["product_name", "version", "version_goal", "feature_list", "launch_date", "status", "platform", "notes", "tenant"]),
-    "finance": ("finance_records", ["month", "project_name", "record_type", "category", "amount", "occurred_date", "notes"]),
+    "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"]),
+    "tasks": ("project_tasks", ["project_id", "phase", "milestone", "task", "owner", "due_date", "blockers", "notes", "status", "sort_order", "tenant"]),
+    "projectFinances": ("project_finances", ["project_id", "tenant", "business_type", "customer_name", "sign_amount", "sign_month", "status", "sales_person", "rev_2026_06", "rev_2026_07", "rev_2026_08", "rev_2026_09", "gross_2026_06", "gross_2026_07", "gross_2026_08", "gross_2026_09"]),
 }
 
 
@@ -489,6 +514,19 @@ def delete_followup(followup_id):
         conn.close()
 
 
+@app.route("/api/tasks/batch-sort", methods=["POST"])
+def batch_sort_tasks():
+    conn = db()
+    try:
+        items = request.get_json(force=True).get("items", [])
+        for item in items:
+            conn.execute("UPDATE project_tasks SET sort_order=? WHERE id=?", (item["sort_order"], item["id"]))
+        conn.commit()
+        return jsonify({"ok": True})
+    finally:
+        conn.close()
+
+
 @app.route("/api/files/upload", methods=["POST"])
 def upload_file():
     file = request.files["file"]

backend/requirements.txt

@@ -1 +1,2 @@
 Flask==3.0.3
+python-dateutil==2.9.0

static/app.js

@@ -1,7 +1,9 @@
 const state = {
   active: "home",
   data: null,
+  tenant: "科普·无界",
   opFilter: "all",
+  finFilter: "已签单",
   projectView: null,
   chart: null,
   chart2: null,
@@ -48,7 +50,7 @@ function renderTable(headers, rows, rowClicks) {
 }
 
 async function load() {
-  state.data = await api("/api/bootstrap");
+  state.data = await api(`/api/bootstrap?tenant=${encodeURIComponent(state.tenant)}`);
   render();
 }
 
@@ -229,8 +231,42 @@ window.submitTaskForm = async (event, projectId) => {
     alert("保存失败：" + error.message);
   }
 };
-window.createFinance = (event) => createResource(event, "finance");
+window.createFinance = async (event) => {
+  event.preventDefault();
+  const form = event.currentTarget;
+  const data = Object.fromEntries(new FormData(form).entries());
+  data.tenant = state.tenant;
+  data.sign_amount = parseFloat(data.sign_amount) || 0;
+  for (const m of ["2026-06","2026-07","2026-08","2026-09"]) {
+    const k = m.replace("-","_");
+    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);
+  }
+};
 window.switchTab = switchTab;
+window.switchTenant = (tenant) => {
+  state.tenant = tenant;
+  state.projectView = null;
+  const label = tenant.replace("·无界", "");
+  document.querySelector("#workspaceTitle").textContent = label + " OPC 工作台";
+  load();
+};
 
 function renderProjects() {
   // 二级页面：项目任务详情
@@ -247,18 +283,13 @@ function renderProjects() {
     `<button class="btn btn-ghost btn-sm text-blue-600" onclick="event.stopPropagation(); state.projectView=${x.id}; renderProjects()"><i data-lucide="eye"></i>查看</button>`
   ]);
   document.querySelector("#projects").innerHTML = `<div class="grid gap-4">
-    <div class="flex items-center justify-end">
+    <div id="project-form">
-      <button class="btn btn-primary" onclick="document.querySelector('#project-form').classList.toggle('hidden')">
-        <i data-lucide="plus"></i>新增项目
-      </button>
-    </div>
-    <div id="project-form" class="hidden">
       ${card(formHtml([
         { label: "项目名称", input: `<input name="project_name" required>` },
         { label: "当前阶段", input: `<select name="current_stage"><option>商务洽谈</option><option>系统上线</option><option>团队分工</option><option>项目交付</option><option>上线推广</option><option>结项验收</option></select>` },
         { label: "项目金额", input: `<input name="expected_contract_amount" type="number" step="0.01" placeholder="万元">` },
         { label: "负责人", input: `<input name="owner">` },
-      ], { handler: "createOperation", text: "确认新增" }), "p-4")}
+      ], { handler: "createOperation", text: "新增项目" }), "p-4")}
     </div>
     ${renderTable(["项目", "项目说明", "当前阶段", "项目金额", "负责人", "进展"], rows, items.map((x) => ({ resource: "operations", id: x.id })))}
   </div>`;
@@ -283,11 +314,11 @@ function renderProjectTasks(projectId) {
       ${phases.map((phase) => {
       const pt = tasks.filter((t) => t.phase === phase);
       if (!pt.length) return "";
-      return `<div class="task-group"><div class="task-group-hd"><span class="task-group-icon"><i data-lucide="layers"></i></span><span class="task-group-label">${phase}</span><span class="task-group-n">${pt.length}</span></div><div class="task-group-list">${pt.map((t) => `<div class="task-row" data-id="${t.id}" onclick="openTaskForm(${projectId}, ${t.id})"><span class="task-dot"><i data-lucide="${t.status === 'done' ? 'check-circle' : 'circle'}"></i></span><div class="task-main"><span class="task-name">${t.task}</span>${t.notes ? `<span class="task-desc">${t.notes}</span>` : ""}${t.blockers ? `<span class="task-blocker">⚠ ${t.blockers}</span>` : ""}</div><span class="task-col">${t.owner || ""}</span><span class="task-col-badge">${t.due_date || ""}</span></div>`).join("")}</div></div>`;
+      return `<div class="task-group"><div class="task-group-hd"><span class="task-group-icon"><i data-lucide="layers"></i></span><span class="task-group-label">${phase}</span><span class="task-group-n">${pt.length}</span></div><div class="task-group-list" data-phase="${phase}" ondrop="handleTaskDrop(event, ${projectId}, '${phase}')" ondragover="event.preventDefault(); event.currentTarget.classList.add('drag-over')" ondragleave="event.currentTarget.classList.remove('drag-over')">${pt.map((t) => `<div class="task-row ${t.status === 'done' ? 'task-done' : ''}" data-id="${t.id}" draggable="true" ondragstart="handleTaskDragStart(event, ${t.id})" ondragend="event.currentTarget.classList.remove('dragging')"><span class="task-dot" onclick="event.stopPropagation(); toggleTaskDone(${t.id}, ${projectId})"><i data-lucide="${t.status === 'done' ? 'check-circle' : 'circle'}"></i></span><span class="task-grip"><i data-lucide="grip-vertical"></i></span><div class="task-main" onclick="openTaskForm(${projectId}, ${t.id})"><span class="task-name">${t.task}</span>${t.notes ? `<span class="task-desc">${t.notes}</span>` : ""}${t.blockers ? `<span class="task-blocker">⚠ ${t.blockers}</span>` : ""}</div><span class="task-col">${t.owner || ""}</span><span class="task-col-badge">${t.due_date || ""}</span></div>`).join("")}</div></div>`;
     }).join("")}
       </div>
       <div id="task-drawer-${projectId}" class="task-drawer">
-        <div class="task-drawer-hd"><span class="task-drawer-title">编辑任务</span><button class="task-close" onclick="closeTaskDrawer(${projectId})"><i data-lucide="x"></i></button></div>
+        <div class="task-drawer-hd"><span class="task-drawer-title">编辑任务</span><div class="flex items-center gap-2"><button type="button" class="btn btn-ghost btn-sm text-red-600 hover:bg-red-50" onclick="deleteTask(${projectId})"><i data-lucide="trash-2"></i>删除</button><button class="task-close" onclick="closeTaskDrawer(${projectId})"><i data-lucide="x"></i></button></div></div>
         <form class="task-drawer-form" onsubmit="submitTaskForm(event, ${projectId})">
           <input type="hidden" name="task_id" id="task-id-${projectId}" value="">
           <label class="task-field"><span>任务名称</span><input name="task" required id="task-name-${projectId}"></label>
@@ -404,19 +435,107 @@ function renderProducts() {
 }
 
 function renderFinance() {
-  const rows = state.data.finance.map((x) => [x.month, badge(x.record_type === "revenue" ? "收入" : "成本/费用"), x.category, money(x.amount), x.occurred_date, text(x.notes)]);
+  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月"];
+  
+  // Aggregates
+  const signed = pfs.filter(x => x.status === "已签单");
+  const pending = pfs.filter(x => x.status !== "已签单");
+  const sumSign = signed.reduce((s,x) => s + (x.sign_amount||0), 0);
+  const sumPending = pending.reduce((s,x) => s + (x.sign_amount||0), 0);
+  const monthRev = months.map(m => pfs.reduce((s,x) => s + (x["rev_"+m.replace("-","_")]||0), 0));
+  const monthGross = months.map(m => pfs.reduce((s,x) => s + (x["gross_"+m.replace("-","_")]||0), 0));
+  
+  const renderPfRow = (pf) => {
+    const mCols = months.map(m => {
+      const rev = pf["rev_"+m.replace("-","_")] || 0;
+      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("");
+    const totalRev = months.reduce((s,m) => s + (pf["rev_"+m.replace("-","_")]||0), 0);
+    const totalGross = months.reduce((s,m) => s + (pf["gross_"+m.replace("-","_")]||0), 0);
+    const totalCol = `<td class="p-2 text-right whitespace-nowrap font-semibold"><span class="${totalRev ? 'text-blue-700' : 'text-slate-300'}">${totalRev ? money(totalRev) : '—'}</span><br><span class="text-xs ${totalGross ? 'text-green-600' : 'text-slate-300'}">${totalGross ? money(totalGross) : '—'}</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">${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}${totalCol}<td class="p-2 text-sm text-slate-500">${pf.sales_person || ""}</td></tr>`;
+  };
+
   document.querySelector("#finance").innerHTML = `<div class="grid gap-4">
-    ${card(`<h2 class="mb-4 text-lg font-bold">收入、毛利、成本/费用、净利月度曲线</h2><div style="position:relative;height:300px"><canvas id="financeChart2"></canvas></div>`, "p-5")}
+    <div class="grid grid-cols-6 gap-3">
-    ${card(formHtml([
+      ${[["已签项目","" + 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("")}
-      { label: "月份", input: `<input name="month" required placeholder="YYYY-MM" pattern="\\d{4}-\\d{2}">` },
+    </div>
-      { label: "类型", input: `<select name="record_type"><option value="revenue">收入</option><option value="cost_expense">成本/费用</option></select>` },
+    ${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")}
-      { label: "分类", input: `<input name="category" required>` },
+    
-      { label: "金额/万", input: `<input name="amount" type="number" step="0.01" required>` },
+    <div class="flex justify-end"><button class="btn btn-primary btn-sm" onclick="openFinanceModal()"><i data-lucide="plus"></i>新增财务项目</button></div>
-      { label: "发生日期", input: `<input name="occurred_date" type="date">` },
+    <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 class="grid grid-cols-2 gap-3 mt-3"><div class="bg-white rounded-lg border border-slate-200 p-3 text-center"><p class="text-xs font-semibold text-slate-400 mb-1">总确收</p><input name="total_rev" id="total-rev-display" class="w-full rounded-md border border-slate-200 px-2 py-1.5 text-sm text-center font-bold text-blue-700" readonly placeholder="自动计算"></div><div class="bg-white rounded-lg border border-slate-200 p-3 text-center"><p class="text-xs font-semibold text-slate-400 mb-1">总毛利</p><input name="total_gross" id="total-gross-display" class="w-full rounded-md border border-slate-200 px-2 py-1.5 text-sm text-center font-bold text-green-600" readonly placeholder="自动计算"></div></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>
-    ], { handler: "createFinance", text: "新增明细" }), "p-4")}
+
-    ${renderTable(["月份", "类型", "分类", "金额", "发生日期", "备注"], rows)}
+    ${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-center font-semibold">总计<br><span class="text-xs text-slate-400">确收/毛利</span></th><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>`;
-  renderChartOn("financeChart2", state.data.financeMonthly);
+  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] || "";
+  }
+  // Calculate totals
+  const totalRev = (pf.rev_2026_06||0) + (pf.rev_2026_07||0) + (pf.rev_2026_08||0) + (pf.rev_2026_09||0);
+  const totalGross = (pf.gross_2026_06||0) + (pf.gross_2026_07||0) + (pf.gross_2026_08||0) + (pf.gross_2026_09||0);
+  document.querySelector("#total-rev-display").value = money(totalRev);
+  document.querySelector("#total-gross-display").value = money(totalGross);
+  openFinanceModal();
+};
+window.toggleFinanceChart = () => {
+  const wrap = document.querySelector("#financeChartWrap");
+  const icon = document.querySelector("#financeChartIcon");
+  if (!wrap) return;
+  wrap.classList.toggle("hidden");
+  icon.classList.toggle("rotate-90");
+  if (!wrap.classList.contains("hidden") && !state.chart2) renderFinanceChart();
+};
+function renderFinanceChart() {
+  const { financeMonthly } = state.data;
+  const canvas = document.querySelector("#financeChart2");
+  if (!canvas || !window.Chart) return;
+  if (state.chart2) state.chart2.destroy();
+  state.chart2 = new Chart(canvas, {
+    type: "line",
+    data: {
+      labels: financeMonthly.map((x) => x.month),
+      datasets: [
+        { label: "月度确收", data: financeMonthly.map((x) => x.revenue), borderColor: "#2563eb", tension: 0.3 },
+        { label: "月度毛利", data: financeMonthly.map((x) => x.net_profit), borderColor: "#059669", tension: 0.3 },
+      ],
+    },
+    options: { responsive: true, maintainAspectRatio: false, plugins: { legend: { position: "bottom", labels: { boxWidth: 12, font: { size: 11 } } } }, scales: { x: { ticks: { font: { size: 11 } }, grid: { display: false } }, y: { ticks: { font: { size: 11 }, callback: (v) => v + "万" } } } },
+  });
 }
 
 function renderChartOn(id, data) {
@@ -474,7 +593,7 @@ function openDrawer(resource, id) {
   const multilineFields = ["customer_need", "current_deliverable", "risks", "next_action", "version_goal", "feature_list", "notes"];
   const followupTarget = resource === "sales" ? "sales" : resource === "proposals" ? "proposal" : resource === "operations" ? "operation" : resource === "products" ? "product" : "";
   const title = item.target_customer || item.project_name || item.customer_or_project_name || item.product_name;
-  drawer.innerHTML = `<div class="drawer-panel"><div class="sticky top-0 z-10 flex items-center justify-between border-b border-slate-200 bg-white/95 px-5 py-3 backdrop-blur"><div><p class="text-[10px] font-semibold uppercase tracking-[0.18em] text-slate-400">Detail Drawer</p><div class="flex items-center gap-2"><h2 class="drawer-title text-[17px] font-semibold leading-6 text-slate-900">${title}</h2><span id="drawerSaveStatus" class="save-status"></span></div></div><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hover:bg-red-50" onclick="deleteOperation(${id})"><i data-lucide="trash-2"></i>删除</button><button class="btn btn-ghost btn-sm" onclick="closeDrawer()">关闭</button></div></div><div class="grid gap-5 p-5">
+  drawer.innerHTML = `<div class="drawer-panel"><div class="sticky top-0 z-10 flex items-center justify-between border-b border-slate-200 bg-white/95 px-5 py-3 backdrop-blur"><div><p class="text-[10px] font-semibold uppercase tracking-[0.18em] text-slate-400">Detail Drawer</p><div class="flex items-center gap-2"><h2 class="drawer-title text-[17px] font-semibold leading-6 text-slate-900">${title}</h2><span id="drawerSaveStatus" class="save-status"></span></div></div><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hover:bg-red-50" onclick="deleteDrawerItem('${resource}', ${id})"><i data-lucide="trash-2"></i>删除</button><button class="btn btn-ghost btn-sm" onclick="closeDrawer()">关闭</button></div></div><div class="grid gap-5 p-5">
     <section>
       <h3 class="drawer-section-title">属性</h3>
       <form id="drawerForm" class="drawer-fields">
@@ -576,16 +695,79 @@ function bindDrawerAutosave(resource, id, item) {
 
 
 window.openDrawer = openDrawer;
-window.deleteOperation = async (id) => {
+window.deleteDrawerItem = async (resource, id) => {
-  if (!confirm("确认删除该项目？此操作不可撤销。")) return;
+  if (!confirm("确认删除？此操作不可撤销。")) return;
   try {
-    await api(`/api/operations/${id}`, { method: "DELETE" });
+    await api(`/api/${resource}/${id}`, { method: "DELETE" });
     closeDrawer();
     await load();
   } catch (error) {
     alert("删除失败：" + error.message);
   }
 };
+window.toggleTaskDone = async (taskId, projectId) => {
+  const task = (state.data.tasks || []).find((t) => t.id === taskId);
+  if (!task) return;
+  const newStatus = task.status === "done" ? "" : "done";
+  try {
+    await api(`/api/tasks/${taskId}`, { method: "PUT", body: JSON.stringify({ data: { status: newStatus } }) });
+    await load();
+  } catch (error) {
+    alert("更新失败：" + error.message);
+  }
+};
+window.deleteTask = async (projectId) => {
+  const taskId = document.querySelector(`#task-id-${projectId}`).value;
+  if (!taskId) return;
+  if (!confirm("确认删除该任务？此操作不可撤销。")) return;
+  try {
+    await api(`/api/tasks/${taskId}`, { method: "DELETE" });
+    closeTaskDrawer(projectId);
+    await load();
+  } catch (error) {
+    alert("删除失败：" + error.message);
+  }
+};
+let dragTaskId = null;
+window.handleTaskDragStart = (event, taskId) => {
+  dragTaskId = taskId;
+  event.currentTarget.classList.add("dragging");
+  event.dataTransfer.effectAllowed = "move";
+};
+window.handleTaskDrop = async (event, projectId, phase) => {
+  event.preventDefault();
+  event.currentTarget.classList.remove("drag-over");
+  const target = event.currentTarget;
+  if (!dragTaskId) return;
+  // Find the dragged element and insert after the nearest task
+  const dragged = document.querySelector(`.task-row[data-id="${dragTaskId}"]`);
+  if (!dragged) return;
+  const afterElement = getDragAfterElement(target, event.clientY);
+  if (afterElement) {
+    target.insertBefore(dragged, afterElement);
+  } else {
+    target.appendChild(dragged);
+  }
+  dragged.classList.remove("dragging");
+  // Update sort_order in DB
+  const rows = [...target.querySelectorAll(".task-row")];
+  const updates = rows.map((row, i) => ({ id: parseInt(row.dataset.id), sort_order: i }));
+  try {
+    await api(`/api/tasks/batch-sort`, { method: "POST", body: JSON.stringify({ items: updates }) });
+  } catch (e) { /* non-critical */ }
+  dragTaskId = null;
+};
+function getDragAfterElement(container, y) {
+  const elements = [...container.querySelectorAll(".task-row:not(.dragging)")];
+  return elements.reduce((closest, child) => {
+    const box = child.getBoundingClientRect();
+    const offset = y - box.top - box.height / 2;
+    if (offset < 0 && offset > closest.offset) {
+      return { offset, element: child };
+    }
+    return closest;
+  }, { offset: Number.NEGATIVE_INFINITY }).element;
+}
 window.closeDrawer = () => document.querySelector("#drawer").classList.remove("open");
 window.squireInstances = {};
 window.squireCmd = (cmd) => {

static/styles.css

@@ -543,13 +543,20 @@ td {
   padding: 1px 7px; border-radius: 10px;
 }
 .task-group-list { display: flex; flex-direction: column; }
+.task-group-list.drag-over { background: #f0f9ff; }
 .task-row {
   display: flex; align-items: center; gap: 16px;
   padding: 10px 16px; border-top: 1px solid #f1f5f9;
-  cursor: pointer;
+  cursor: pointer; transition: background 0.15s;
 }
+.task-row.dragging { opacity: 0.4; background: #f1f5f9; }
+.task-row.task-done .task-name { text-decoration: line-through; color: #94a3b8; }
 .task-row:hover { background: #f8fafc; }
-.task-dot { display: flex; color: #cbd5e1; flex-shrink: 0; }
+.task-dot { display: flex; color: #cbd5e1; flex-shrink: 0; cursor: pointer; }
+.task-dot:hover { color: #6366f1; }
+.task-grip { display: flex; color: #cbd5e1; flex-shrink: 0; cursor: grab; }
+.task-grip:hover { color: #94a3b8; }
+.task-grip:active { cursor: grabbing; }
 .task-main { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 2px; }
 .task-name { color: #1e293b; font-size: 13px; }
 .task-desc { color: #94a3b8; font-size: 12px; word-wrap: break-word; overflow-wrap: break-word; }

templates/index.html

@@ -27,9 +27,18 @@
   </head>
   <body class="min-h-screen bg-slate-50 text-slate-950">
     <header class="topbar border-b border-slate-200 bg-white px-8 py-5">
-      <div>
+      <div class="flex items-center gap-3">
-        <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager · 单用户 · 单项目</p>
+        <div>
-        <h1 class="mt-1 text-2xl font-semibold">科普（慰心斋）OPC 工作台</h1>
+          <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager</p>
+          <div class="flex items-center gap-3 mt-1">
+            <h1 class="text-2xl font-semibold" id="workspaceTitle">科普 OPC 工作台</h1>
+            <select id="tenantSelect" class="rounded-md border border-slate-200 bg-white px-3 py-1.5 text-sm font-medium text-slate-700 outline-none focus:border-blue-500" onchange="switchTenant(this.value)">
+              <option value="科普·无界">科普·无界</option>
+              <option value="科研·无界">科研·无界</option>
+              <option value="医患·无界">医患·无界</option>
+            </select>
+          </div>
+        </div>
       </div>
       <button id="refreshBtn" class="rounded-md border border-slate-200 bg-white px-3 py-2 text-sm font-medium hover:bg-slate-50" type="button"><i data-lucide="refresh-cw"></i>刷新</button>
     </header>