From 3518a63397cf93264ca24d4d724924877a8f6f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=A0=E7=9A=84=E5=90=8D=E5=AD=97?= <你的邮箱>
Date: Wed, 15 Oct 2025 18:56:29 +0900
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=89=E5=8A=B9=E6=9C=9F=E9=99=90?=
 =?UTF-8?q?=E3=80=91=E3=81=8B=E3=82=89=E3=80=90=E5=AF=BE=E8=B1=A1=E6=9C=88?=
 =?UTF-8?q?=E3=80=91=E3=81=B8=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/ContractorListController.php        | 22 +++++++------
 .../admin/contractor_list/list.blade.php      | 32 ++++++++++++++++---
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/Admin/ContractorListController.php b/app/Http/Controllers/Admin/ContractorListController.php
index 1c6b6ac..24e68c6 100644
--- a/app/Http/Controllers/Admin/ContractorListController.php
+++ b/app/Http/Controllers/Admin/ContractorListController.php
@@ -101,16 +101,18 @@ class ContractorListController extends Controller
             $q->where('u.user_tag_serial_64','like','%'.$val.'%');
         }
 
-        // 有効期限で絞る（指定日以前を抽出する＝ <= を使用）
-        if ($request->filled('contract_periode')) {
-            $raw  = trim($request->contract_periode);
-            $norm = str_replace('/', '-', $raw); // スラッシュ入力を許容
-            try {
-                $target = \Carbon\Carbon::parse($norm)->format('Y-m-d');
-                // 指定日「以前」を含める
-                $q->whereDate('rc.contract_periode', '<=', $target);
-            } catch (\Exception $e) {
-                // 無効な日付は無視する
+        // 対象月
+        $target = $request->input('target_month');
+        if (in_array($target,['last','this','next','after2'],true)) {
+            $base = now()->startOfMonth();
+            $offset = ['last'=>-1,'this'=>0,'next'=>1,'after2'=>2][$target];
+            $m = $base->copy()->addMonths($offset);
+            if ($target === 'after2') {
+                // 2か月後「以降」を抽出（該当月の月初以降）
+                $q->whereDate('rc.contract_periode', '>=', $m->toDateString());
+            } else {
+                $q->whereYear('rc.contract_periode',$m->year)
+                  ->whereMonth('rc.contract_periode',$m->month);
             }
         }
 
diff --git a/resources/views/admin/contractor_list/list.blade.php b/resources/views/admin/contractor_list/list.blade.php
index 8e2e9ae..2b64888 100644
--- a/resources/views/admin/contractor_list/list.blade.php
+++ b/resources/views/admin/contractor_list/list.blade.php
@@ -94,14 +94,36 @@
                 </div>
               </div>
 
-              <div class="form-group row">
-                <label class="col-sm-3 col-form-label">有効期限</label>
-                <div class="col-sm-9">
-                  <input type="date" name="contract_periode" value="{{ request('contract_periode') }}"
-                    class="form-control">
+            <div class="form-group row">
+              <label class="col-sm-3 col-form-label">対象月</label>
+              <div class="col-sm-9 d-flex align-items-center">
+                @php
+                  // 既定選択なし（送信時だけ適用）
+                  $target_month = request('target_month');
+                @endphp
+                <div class="form-check mr-3">
+                  <input class="form-check-input" type="radio" name="target_month" id="none_month" value="" {{ $target_month === null || $target_month === '' ? 'checked' : '' }}>
+                  <label class="form-check-label" for="none_month">指定なし</label>
+                </div>
+                <div class="form-check mr-3">
+                  <input class="form-check-input" type="radio" name="target_month" id="last_month" value="last" {{ $target_month === 'last' ? 'checked' : '' }}>
+                  <label class="form-check-label" for="last_month">先月</label>
+                </div>
+                <div class="form-check mr-3">
+                  <input class="form-check-input" type="radio" name="target_month" id="this_month" value="this" {{ $target_month === 'this' ? 'checked' : '' }}>
+                  <label class="form-check-label" for="this_month">今月</label>
+                </div>
+                <div class="form-check mr-3">
+                  <input class="form-check-input" type="radio" name="target_month" id="next_month" value="next" {{ $target_month === 'next' ? 'checked' : '' }}>
+                  <label class="form-check-label" for="next_month">来月</label>
+                </div>
+                <div class="form-check">
+                  <input class="form-check-input" type="radio" name="target_month" id="after_2_month" value="after2" {{ $target_month === 'after2' ? 'checked' : '' }}>
+                  <label class="form-check-label" for="after_2_month">2か月後</label>
                 </div>
               </div>
             </div>
+          </div>
 
             {{-- 右カラム --}}
             <div class="col-md-6">