diff --git a/backend/flask_app.py b/backend/flask_app.py index bd5976d..4eb6ee4 100644 --- a/backend/flask_app.py +++ b/backend/flask_app.py @@ -320,9 +320,19 @@ def monthly_finance(conn, tenant="科普·无界"): data = [] for item in rows(conn, "SELECT DISTINCT month FROM finance_records WHERE tenant=? ORDER BY month", (tenant,)): month = item["month"] - revenue = one(conn, "SELECT COALESCE(SUM(amount),0) AS v FROM finance_records WHERE month=? AND record_type='revenue' AND tenant=?", (month, 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"] - data.append({"month": month, "revenue": revenue, "gross_profit": revenue - cost, "cost_expense": cost, "net_profit": revenue - cost}) + def s(cat): + return one(conn, "SELECT COALESCE(SUM(amount),0) AS v FROM finance_records WHERE month=? AND category=? AND tenant=?", (month, cat, tenant))["v"] + revenue = s("确认收入") + s("签单") + labor = s("人力成本") + expense = s("费用") + purchase = s("外部采购") + sign = s("签单") + net = revenue - labor - expense - purchase + data.append({ + "month": month, "revenue": revenue, "sign": sign, + "labor": labor, "expense": expense, "purchase": purchase, + "net_profit": net, + }) return data @@ -346,15 +356,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): - return sum(x["amount"] for x in finance if x["month"] in months and x["record_type"] == rtype) + def sum_cat(months, cat): + 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") - cost_annual = sum_finance(months_2026, "cost_expense") - revenue_q2 = sum_finance(months_q2, "revenue") - cost_q2 = sum_finance(months_q2, "cost_expense") - revenue_month = sum_finance([current_month], "revenue") + rev_annual = sum_cat(months_2026, "确认收入") + sum_cat(months_2026, "签单") + labor_annual = sum_cat(months_2026, "人力成本") + expense_annual = sum_cat(months_2026, "费用") + purchase_annual = sum_cat(months_2026, "外部采购") + rev_q2 = sum_cat(months_q2, "确认收入") + sum_cat(months_q2, "签单") + 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], "外部采购") 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"] == "已签约") @@ -378,8 +395,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_net_profit": revenue_month - cost_month, + "monthly_revenue": rev_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 +408,10 @@ def bootstrap(): "signed_q2": signed_q2, "signed_month": signed_month, "pipeline_amount": pipeline_amount, - "revenue_annual": revenue_annual, - "revenue_q2": revenue_q2, - "gross_annual": revenue_annual - cost_annual, - "gross_q2": revenue_q2 - cost_q2, + "revenue_annual": rev_annual, + "revenue_q2": rev_q2, + "gross_annual": rev_annual - labor_annual - expense_annual - purchase_annual, + "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), diff --git a/static/app.js b/static/app.js index 5d96735..278185b 100644 --- a/static/app.js +++ b/static/app.js @@ -450,10 +450,11 @@ function renderFinanceChart() { 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.gross_profit), borderColor: "#059669", tension: 0.3 }, - { label: "成本/费用", data: financeMonthly.map((x) => x.cost_expense), borderColor: "#d97706", tension: 0.3 }, - { label: "净利", data: financeMonthly.map((x) => x.net_profit), borderColor: "#7c3aed", tension: 0.3 }, + { 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 } } } } },