v2.0.6 — X轴12月(前9+当前+后2) + Y轴万元 + 净利口径=确认收入-人力-费用-采购

backend/flask_app.py

@@ -317,12 +317,29 @@ 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
+    from dateutil.relativedelta import relativedelta
+    start = today + relativedelta(months=-9)
+    months = []
+    for i in range(12):
+        m = start + relativedelta(months=i)
+        months.append(m.strftime("%Y-%m"))
     data = []
-    for item in rows(conn, "SELECT DISTINCT month FROM finance_records WHERE tenant=? ORDER BY month", (tenant,)):
+    for month in months:
-        month = item["month"]
+        def s(cat):
-        revenue = one(conn, "SELECT COALESCE(SUM(amount),0) AS v FROM finance_records WHERE month=? AND record_type='revenue' AND tenant=?", (month, tenant))["v"]
+            return one(conn, "SELECT COALESCE(SUM(amount),0) AS v FROM finance_records WHERE month=? AND category=? AND tenant=?", (month, cat, tenant))["v"]
-        cost = one(conn, "SELECT COALESCE(SUM(amount),0) AS v FROM finance_records WHERE month=? AND record_type='cost_expense' AND tenant=?", (month, tenant))["v"]
+        revenue = s("确认收入") + s("签单")
-        data.append({"month": month, "revenue": revenue, "gross_profit": revenue - cost, "cost_expense": cost, "net_profit": revenue - cost})
+        labor = s("人力成本")
+        expense = s("费用")
+        purchase = s("外部采购")
+        net = revenue - labor - expense - purchase
+        data.append({
+            "month": month, "revenue": revenue,
+            "labor": labor, "expense": expense, "purchase": purchase,
+            "net_profit": net,
+        })
     return data
 
 
@@ -346,16 +363,22 @@ def bootstrap():
         tasks = q("SELECT * FROM project_tasks WHERE tenant=? ORDER BY phase, sort_order, id", tenant)
         current_month = "2026-06"
         # Finance aggregates
-        def sum_finance(months, rtype):
+        def sum_cat(months, cat):
-            return sum(x["amount"] for x in finance if x["month"] in months and x["record_type"] == rtype)
+            return sum(x["amount"] for x in finance if x["month"] in months and x.get("category") == cat)
         months_2026 = [f"2026-{m:02d}" for m in range(1,7)]
         months_q2 = ["2026-04","2026-05","2026-06"]
-        revenue_annual = sum_finance(months_2026, "revenue")
+        rev_annual = sum_cat(months_2026, "确认收入") + sum_cat(months_2026, "签单")
-        cost_annual = sum_finance(months_2026, "cost_expense")
+        labor_annual = sum_cat(months_2026, "人力成本")
-        revenue_q2 = sum_finance(months_q2, "revenue")
+        expense_annual = sum_cat(months_2026, "费用")
-        cost_q2 = sum_finance(months_q2, "cost_expense")
+        purchase_annual = sum_cat(months_2026, "外部采购")
-        revenue_month = sum_finance([current_month], "revenue")
+        rev_q2 = sum_cat(months_q2, "确认收入") + sum_cat(months_q2, "签单")
-        cost_month = sum_finance([current_month], "cost_expense")
+        labor_q2 = sum_cat(months_q2, "人力成本")
+        expense_q2 = sum_cat(months_q2, "费用")
+        purchase_q2 = sum_cat(months_q2, "外部采购")
+        rev_month = sum_cat([current_month], "确认收入") + sum_cat([current_month], "签单")
+        labor_month = sum_cat([current_month], "人力成本")
+        expense_month = sum_cat([current_month], "费用")
+        purchase_month = sum_cat([current_month], "外部采购")
         # 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
@@ -378,8 +401,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": rev_month - labor_month - expense_month - purchase_month,
+                "monthly_gross": rev_month - labor_month - expense_month - purchase_month,
                 "upcoming_products": len([x for x in products if x["status"] in ["规划中", "设计中", "开发中", "测试中"]]),
                 "total_projects": len(operations),
                 "total_proposals": len(proposals),
@@ -390,10 +414,10 @@ 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": rev_annual - labor_annual - expense_annual - purchase_annual,
-                "gross_q2": revenue_q2 - cost_q2,
+                "gross_q2": rev_q2 - labor_q2 - expense_q2 - purchase_q2,
                 "signed_not_executed": signed_not_executed,
             },
             "recent": q("SELECT * FROM follow_up_records WHERE tenant=? ORDER BY id DESC LIMIT 8", tenant),

backend/requirements.txt

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

static/app.js

@@ -230,7 +230,21 @@ window.submitTaskForm = async (event, projectId) => {
     alert("保存失败：" + error.message);
   }
 };
-window.createFinance = (event) => createResource(event, "finance");
+window.createFinance = async (event) => {
+  event.preventDefault();
+  const data = Object.fromEntries(new FormData(event.currentTarget).entries());
+  // Map form: month(date)→month(YYYY-MM), category→category, amount, tenant
+  data.month = data.month.substring(0, 7);
+  data.project_name = state.tenant;
+  data.tenant = state.tenant;
+  data.record_type = "revenue"; // default, will be adjusted by category
+  try {
+    await api("/api/finance", { method: "POST", body: JSON.stringify({ data }) });
+    await load();
+  } catch (error) {
+    alert("新增失败：" + error.message);
+  }
+};
 window.switchTab = switchTab;
 window.switchTenant = (tenant) => {
   state.tenant = tenant;
@@ -405,19 +419,46 @@ 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 rows = state.data.finance.map((x) => [x.month, x.category, money(x.amount), text(x.notes)]);
   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")}
+    ${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(formHtml([
-      { label: "月份", input: `<input name="month" required placeholder="YYYY-MM" pattern="\\d{4}-\\d{2}">` },
+      { label: "日期", input: `<input name="month" type="date" required>` },
-      { label: "类型", input: `<select name="record_type"><option value="revenue">收入</option><option value="cost_expense">成本/费用</option></select>` },
+      { label: "类型", input: `<select name="category"><option>签单</option><option>确认收入</option><option>人力成本</option><option>费用</option><option>外部采购</option></select>` },
-      { label: "分类", input: `<input name="category" required>` },
       { label: "金额/万", input: `<input name="amount" type="number" step="0.01" required>` },
-      { label: "发生日期", input: `<input name="occurred_date" type="date">` },
+      { label: "费用说明", input: `<input name="notes" placeholder="摘要说明">` },
     ], { handler: "createFinance", text: "新增明细" }), "p-4")}
-    ${renderTable(["月份", "类型", "分类", "金额", "发生日期", "备注"], rows)}
+    ${card(`<h3 class="font-bold text-slate-700 mb-3">明细列表 <span class="text-slate-400 font-normal">(${state.data.finance.length})</span></h3>${renderTable(["日期", "类型", "金额", "备注"], rows)}`, "p-4")}
   </div>`;
-  renderChartOn("financeChart2", state.data.financeMonthly);
+  if (window.lucide) window.lucide.createIcons();
+}
+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.labor), borderColor: "#ef4444", tension: 0.3 },
+        { label: "费用", data: financeMonthly.map((x) => x.expense), borderColor: "#d97706", tension: 0.3 },
+        { label: "外部采购", data: financeMonthly.map((x) => x.purchase), borderColor: "#8b5cf6", tension: 0.3 },
+        { label: "月度净利", data: financeMonthly.map((x) => x.net_profit), borderColor: "#059669", tension: 0.3, borderDash: [5,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) {