From 76da3a21062ffa062f0d7c53328c6a2fed1e6fcb Mon Sep 17 00:00:00 2001
From: mac <mac@Qiukais-m1-macPro.local>
Date: Tue, 7 Jul 2026 18:44:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=83=A8=E9=97=A8=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=8E=92=E9=99=A4=E3=80=8C=E6=9A=82=E4=B8=8D?=
 =?UTF-8?q?=E8=AE=A1=E5=85=A5=E3=80=8D=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- t_expense_sum 和 expense_sum 新增状态过滤
- 首页部门费用指标不再累加 status='暂不计入' 的记录
- 版本号 v1.0.0.7
---
 backend/routes.py    | 2 ++
 templates/index.html | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/routes.py b/backend/routes.py
index 3334924..15d9a19 100644
--- a/backend/routes.py
+++ b/backend/routes.py
@@ -331,6 +331,7 @@ def bootstrap():
                 def t_expense_sum(m_range):
                     total = 0
                     for r in t_expense:
+                        if (r.get("status") or "") == "暂不计入": continue
                         m = (r.get("expense_month") or "").strip()
                         if not m or "-" not in m: continue
                         try:
@@ -459,6 +460,7 @@ def bootstrap():
         def expense_sum(month_range):
             total = 0
             for r in expense:
+                if (r.get("status") or "") == "暂不计入": continue
                 m = (r.get("expense_month") or "").strip()
                 if not m or "-" not in m: continue
                 try:
diff --git a/templates/index.html b/templates/index.html
index 3139b75..be9efed 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -76,7 +76,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.0.0.6</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.0.0.7</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">