From c123d0392282dda470f4e7ce5fa3761a5f3d0a36 Mon Sep 17 00:00:00 2001
From: xiaji <rembme@163.com>
Date: Sun, 8 Mar 2026 18:14:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=AE=B6=E5=BA=AD=E4=BA=8B=E9=A1=B9):=20?=
 =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E4=BA=8B=E9=A1=B9=EF=BC=8C=E4=B8=8D=E6=8C=89=E4=BA=BA=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改家庭事项视图，排除已完成状态的事项
- 修改首页待处理事项查询逻辑，与家庭事项页面保持一致
- 更新家庭事项页面标题和空状态提示信息
---
 core/templates/core/family_tasks.html | 8 ++++----
 core/views.py                         | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/templates/core/family_tasks.html b/core/templates/core/family_tasks.html
index 1926f1b..d40f1dc 100644
--- a/core/templates/core/family_tasks.html
+++ b/core/templates/core/family_tasks.html
@@ -4,7 +4,7 @@
 <!-- 页面标题 -->
 <div class="d-flex justify-content-between align-items-center mb-4">
     <h2 class="mb-0">
-        <i class="bi bi-list-check me-2 text-warning"></i>家庭事项
+        <i class="bi bi-list-check me-2 text-warning"></i>家庭事项 <small class="text-muted fs-5">(未完成)</small>
     </h2>
     <div>
         <a href="{% url 'add_family_task' %}" class="btn btn-primary">
@@ -79,9 +79,9 @@
         </div>
         {% else %}
         <div class="text-center py-5">
-            <i class="bi bi-inbox text-muted" style="font-size: 5rem;"></i>
-            <h5 class="text-muted mt-3">还没有家庭事项</h5>
-            <p class="text-muted">点击上方按钮添加您的第一条家庭事项</p>
+            <i class="bi bi-check-all text-success" style="font-size: 5rem;"></i>
+            <h5 class="text-muted mt-3">太棒了！没有未完成的家庭事项</h5>
+            <p class="text-muted">所有家庭事项都已完成，可以添加新的家庭事项</p>
             <a href="{% url 'add_family_task' %}" class="btn btn-primary">
                 <i class="bi bi-plus-lg me-1"></i>添加家庭事项
             </a>
diff --git a/core/views.py b/core/views.py
index 246861a..abbb7dd 100644
--- a/core/views.py
+++ b/core/views.py
@@ -74,8 +74,8 @@ def index(request):
     today_plan = TodayPlan.objects.filter(date=today)
     
     
-    # 获取待处理的家庭事项
-    pending_family_tasks = FamilyTask.objects.filter(status__name='pending')
+    # 获取未完成的家庭事项（排除已完成状态）
+    pending_family_tasks = FamilyTask.objects.exclude(status__name='completed')
     
     context = {
         'yesterday': yesterday,
@@ -397,9 +397,10 @@ def delete_summary(request, pk):
 # 家庭事项视图
 @login_required
 def family_tasks(request):
-    """家庭事项"""
+    """家庭事项 - 显示所有未完成的事项（非completed状态）"""
     logger.info("用户访问家庭事项页面")
-    tasks = FamilyTask.objects.all()
+    # 排除已完成的事项，显示所有未完成的事项
+    tasks = FamilyTask.objects.exclude(status__name='completed')
     
     context = {
         'tasks': tasks,