fix: 月报/季报总览合同金额显示为0

- 后端新增sign_monthly[12]按月份拆分签单数据
- 月报/季报API均导出sign_monthly,季度转换包含sign_monthly
- 前端projVals首项改用sign_monthly替代硬编码0
- 版本号 v1.2.0.32

backend/routes.py

@@ -1093,6 +1093,7 @@ def _aggregate_monthly_from_json(conn, table, tenants):
     _year = date.today().year
     months = [f"{_year}-{m:02d}" for m in range(1, 13)]
     rev, gross, payment, cost, paid = [0]*12, [0]*12, [0]*12, [0]*12, [0]*12
+    sign_monthly = [0]*12
     sign_total = 0
     sign_cnt = 0
 
@@ -1103,6 +1104,10 @@ def _aggregate_monthly_from_json(conn, table, tenants):
             if sm.startswith(str(_year)):
                 sign_total += float(pf.get("sign_amount") or 0)
                 sign_cnt += 1
+                # 签单按月拆分
+                sm7 = sm[:7]
+                if sm7 in months:
+                    sign_monthly[months.index(sm7)] += float(pf.get("sign_amount") or 0)
             try:
                 bd = json.loads(pf.get("budget_data") or "[]")
             except:
@@ -1130,6 +1135,7 @@ def _aggregate_monthly_from_json(conn, table, tenants):
         "rev": rev, "gross": gross, "payment": payment, "cost": cost, "paid": paid,
         "cashflow": [payment[i] - paid[i] for i in range(12)],
         "sign_total": sign_total, "sign_cnt": sign_cnt,
+        "sign_monthly": sign_monthly,
     }
 
 
@@ -1181,6 +1187,7 @@ def _build_overview_result(agg, exp_amount, exp_incurred):
     # 项目经营详情
     project = {
         "sign": agg["sign_total"],
+        "sign_monthly": agg["sign_monthly"],
         "revenue": rev,
         "gross": gross,
         "cost": cost,
@@ -1218,7 +1225,7 @@ def overview_plan_quarterly():
     conn.close()
     # Convert monthly to quarterly
     result = _build_overview_result(agg, exp_amount, exp_incurred)
-    for key in ["revenue","gross","payment","cost","paid","cashflow"]:
+    for key in ["sign_monthly","revenue","gross","payment","cost","paid","cashflow"]:
         result["project"][key] = _quarterly_from_monthly(result["project"][key])
     result["dept"]["project_gross"] = _quarterly_from_monthly(result["dept"]["project_gross"])
     result["dept"]["dept_expense"] = _quarterly_from_monthly(result["dept"]["dept_expense"])
@@ -1247,7 +1254,7 @@ def overview_finance_quarterly():
     exp_amount, exp_incurred = _aggregate_expenses(conn, "expense_records", OVERVIEW_TENANTS)
     conn.close()
     result = _build_overview_result(agg, exp_amount, exp_incurred)
-    for key in ["revenue","gross","payment","cost","paid","cashflow"]:
+    for key in ["sign_monthly","revenue","gross","payment","cost","paid","cashflow"]:
         result["project"][key] = _quarterly_from_monthly(result["project"][key])
     result["dept"]["project_gross"] = _quarterly_from_monthly(result["dept"]["project_gross"])
     result["dept"]["dept_expense"] = _quarterly_from_monthly(result["dept"]["dept_expense"])

static/modules/overview_finance.js

@@ -161,7 +161,7 @@ function renderOverviewFinanceData(data, view) {
   var cfCard = card('<h3 class="text-base font-bold text-slate-700 mb-3">部门现金流 <span class="text-sm text-slate-500 font-normal ml-3">部门现金流=所有项目产生的现金流 - 部门一级因费用产生的现金流出或流入</span></h3><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + deptThead + '</thead><tbody>' + cfTbody + '</tbody></table></div>', 'p-4');
 
   var LABELS = ['合同金额','确收金额','确收毛利','成本','支出','回款','项目现金流'];
-  var projVals = [p.revenue, p.gross, p.cost, p.paid, p.payment, p.cashflow];
+  var projVals = [p.sign_monthly || [], p.revenue, p.gross, p.cost, p.paid, p.payment, p.cashflow];
   var projAnnual = p.annual;
   var projThead = '<tr class="border-b border-slate-200"><th class="py-1.5 text-left text-slate-500 whitespace-nowrap">指标</th><th class="py-1.5 text-right font-semibold text-slate-700 whitespace-nowrap">年度累计</th>';
   for (var phi = 0; phi < cols; phi++) { projThead += '<th class="py-1.5 text-right font-semibold text-slate-600 whitespace-nowrap">' + headers[phi] + '</th>'; }
@@ -169,9 +169,9 @@ function renderOverviewFinanceData(data, view) {
   var projTbody = '';
   for (var ri = 0; ri < 7; ri++) {
     var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-1.5 text-left font-semibold text-slate-700 whitespace-nowrap">' + LABELS[ri] + '</td>';
-    rowHtml += '<td class="py-1.5 text-right font-semibold text-slate-800 whitespace-nowrap">' + (ri === 0 ? moneyIntL(p.sign) : moneyIntL(projAnnual[ri])) + '</td>';
+    rowHtml += '<td class="py-1.5 text-right font-semibold text-slate-800 whitespace-nowrap">' + moneyIntL(projAnnual[ri]) + '</td>';
     for (var i = 0; i < cols; i++) {
-      var val = ri === 0 ? 0 : (projVals[ri - 1] ? projVals[ri - 1][i] : 0);
+      var val = projVals[ri] ? (projVals[ri][i] || 0) : 0;
       var cls = 'text-slate-700';
       if (ri === 2) cls = 'text-green-600';
       if (ri === 6) cls = val >= 0 ? 'text-green-600' : 'text-red-600';

static/modules/overview_plan.js

@@ -160,7 +160,7 @@ function renderOverviewPlanData(data, view) {
 
   // ====== 项目经营详情 ======
   var LABELS = ['合同金额','确收金额','确收毛利','成本','支出','回款','项目现金流'];
-  var projVals = [p.revenue, p.gross, p.cost, p.paid, p.payment, p.cashflow];
+  var projVals = [p.sign_monthly || [], p.revenue, p.gross, p.cost, p.paid, p.payment, p.cashflow];
   var projAnnual = p.annual;
 
   var projThead = '<tr class="border-b border-slate-200"><th class="py-1.5 text-left text-slate-500 whitespace-nowrap">指标</th><th class="py-1.5 text-right font-semibold text-slate-700 whitespace-nowrap">年度累计</th>';
@@ -170,9 +170,9 @@ function renderOverviewPlanData(data, view) {
   var projTbody = '';
   for (var ri = 0; ri < 7; ri++) {
     var rowHtml = '<tr class="border-b border-slate-100 last:border-0"><td class="py-1.5 text-left font-semibold text-slate-700 whitespace-nowrap">' + LABELS[ri] + '</td>';
-    rowHtml += '<td class="py-1.5 text-right font-semibold text-slate-800 whitespace-nowrap">' + (ri === 0 ? moneyIntL(p.sign) : moneyIntL(projAnnual[ri])) + '</td>';
+    rowHtml += '<td class="py-1.5 text-right font-semibold text-slate-800 whitespace-nowrap">' + moneyIntL(projAnnual[ri]) + '</td>';
     for (var i = 0; i < cols; i++) {
-      var val = ri === 0 ? 0 : (projVals[ri - 1] ? projVals[ri - 1][i] : 0);
+      var val = projVals[ri] ? (projVals[ri][i] || 0) : 0;
       var cls = 'text-slate-700';
       if (ri === 2) cls = 'text-green-600';
       if (ri === 6) cls = val >= 0 ? 'text-green-600' : 'text-red-600';

templates/index.html

@@ -84,7 +84,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.31</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.32</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">