From c94f98f490a1844d3044695d2a2290a8c3f28d1e Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Mon, 2 Mar 2026 15:01:16 +0800
Subject: [PATCH] up

---
 app/Http/Controllers/Admin/HolidayController.php | 3 ++-
 resources/views/admin/holiday/index.blade.php    | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/HolidayController.php b/app/Http/Controllers/Admin/HolidayController.php
index 8fa4f04..99ec670 100644
--- a/app/Http/Controllers/Admin/HolidayController.php
+++ b/app/Http/Controllers/Admin/HolidayController.php
@@ -21,9 +21,10 @@ class HolidayController extends CommonController
             ->when($request->project_id, function ($query) use ($request) {
                 $query->where("project_id", $request->project_id);
             })
+            ->orderBy("project_id")
             ->orderBy("date", "desc")
             ->orderBy("id", "desc")
-            ->paginate(10);
+            ->paginate(100);
 
         return view($this->bladePath . ".index", compact("data"));
     }
diff --git a/resources/views/admin/holiday/index.blade.php b/resources/views/admin/holiday/index.blade.php
index 3063ec0..2fb280b 100644
--- a/resources/views/admin/holiday/index.blade.php
+++ b/resources/views/admin/holiday/index.blade.php
@@ -28,7 +28,16 @@
                         </tr>
                         </thead>
                         <tbody>
+                        @php($currentProjectId = null)
                         @foreach ($data as $row)
+                            @if($currentProjectId !== $row->project_id)
+                                @php($currentProjectId = $row->project_id)
+                                <tr class="table-active">
+                                    <td colspan="6">
+                                        <strong>项目：</strong>{{ optional($row->project)->name ?: '未设置项目' }}
+                                    </td>
+                                </tr>
+                            @endif
                             <tr data-id="{{ $row->id }}">
                                 <td>{{ $row->id }}</td>
                                 <td>{{ optional($row->project)->name }}</td>