From 464755b87001e90d017df4c6d4e1e4441fc5be28 Mon Sep 17 00:00:00 2001
From: "kin.rinzen" <yukikk0405@outlook.com>
Date: Wed, 10 Sep 2025 15:36:32 +0900
Subject: [PATCH] =?UTF-8?q?=E9=A7=90=E8=BC=AA=E5=A0=B4=E6=89=80=E3=80=81?=
 =?UTF-8?q?=E6=96=99=E9=87=91=E3=83=9E=E3=82=B9=E3=82=BF=E3=81=AE=E7=B7=A8?=
 =?UTF-8?q?=E9=9B=86=E7=94=BB=E9=9D=A2=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/admin/prices/_form.blade.php |  18 +-
 resources/views/admin/prices/list.blade.php  | 171 ++++++++++---------
 2 files changed, 105 insertions(+), 84 deletions(-)

diff --git a/resources/views/admin/prices/_form.blade.php b/resources/views/admin/prices/_form.blade.php
index eeb60ed..56f1139 100644
--- a/resources/views/admin/prices/_form.blade.php
+++ b/resources/views/admin/prices/_form.blade.php
@@ -99,7 +99,10 @@
                 <select name="price_ptypeid" class="form-control form-control-lg">
                     <option value="">{{ __('駐輪分類名') }}</option>
                     @foreach($ptypes as $key => $item)
-                        <option value="{{ $key }}" @if($key == $price_ptypeid) selected @endif>{{ $item }}</option>
+                        <option value="{{ $key }}"
+                            @if(isset($price_ptypeid) && $key == $price_ptypeid) selected @endif>
+                            {{ $item }}
+                        </option>
                     @endforeach
                 </select>
             </div>
@@ -130,22 +133,24 @@
                        class="form-control form-control-lg" />
             </div>
         </div>
-        </div>
 
         <!-- 駐輪料金（税込） -->
-        <div class="form-group row">
-            <label class="col-3 col-form-label required">{{ __('駐輪料金（税込）') }}</label>
-            <div class="col-9">
+        <div class="col-3">
+            <label class="required">{{ __('駐輪料金（税込）') }}</label>
+        </div>
+        <div class="form-group col-9">
+            <div class="input-group">
                 <input type="text" value="{{ $price }}" name="price"
                     class="form-control form-control-lg" />
             </div>
         </div>
+
         
        
     {{-- 下部ボタン --}}
     @if($isEdit)
         {{-- 編集画面 --}}
-        <button type="submit" class="btn btn-lg btn-success">{{ __('登録') }}</button>
+        <button type="submit" class="btn btn-lg btn-success mr-2">{{ __('登録') }}</button>
 
         <form method="POST" action="{{ route('prices_delete', ['id' => $price_parkplaceid]) }}" class="d-inline">
             @csrf
@@ -156,5 +161,6 @@
         {{-- 新規画面 --}}
         <button type="submit" class="btn btn-lg btn-success">{{ __('登録') }}</button>
     @endif
+
 </div>
 <!-- /.card-body -->
\ No newline at end of file
diff --git a/resources/views/admin/prices/list.blade.php b/resources/views/admin/prices/list.blade.php
index bb295d8..111dd4c 100644
--- a/resources/views/admin/prices/list.blade.php
+++ b/resources/views/admin/prices/list.blade.php
@@ -2,17 +2,18 @@
 @section('title', '[東京都|〇〇駐輪場] 駐輪場所、料金マスタ')
 
 @section('content')
+
 {{-- ▼ コンテンツヘッダー（パンくず） --}}
 <div class="content-header">
     <div class="container-fluid">
         <div class="row mb-2">
             <div class="col-lg-6">
-                <h1 class="m-0 text-dark">{{__('駐輪場所、料金マスタ')}}</h1>
+                <h1 class="m-0 text-dark">{{ __('駐輪場所、料金マスタ') }}</h1>
             </div>
             <div class="col-lg-6">
                 <ol class="breadcrumb float-sm-right text-sm">
-                    <li class="breadcrumb-item"><a href="{{route('home')}}">ホーム</a></li>
-                    <li class="breadcrumb-item active">{{__('駐輪場所、料金マスタ')}}</li>
+                    <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
+                    <li class="breadcrumb-item active">{{ __('駐輪場所、料金マスタ') }}</li>
                 </ol>
             </div>
         </div>
@@ -22,7 +23,8 @@
 {{-- ▼ メインコンテンツ --}}
 <section class="content">
     <div class="container-fluid">
-        {{-- 並び替え用 hidden --}}
+
+        {{-- ▼ 並び替え用 hidden --}}
         <form action="{{ route('prices') }}" method="POST" id="list-form">
             @csrf
             <input type="hidden" name="sort" value="{{ $sort ?? '' }}">
@@ -33,20 +35,30 @@
         <div class="container-fluid mb20">
             <button type="button" class="btn btn-sm btn-default mr10"
                 onclick="location.href='{{ route('price_add') }}'">新規</button>
-            <button type="submit" class="btn btn-sm btn-default mr10" form="form_delete" name="delete" id="delete"
+
+            <button type="submit" class="btn btn-sm btn-default mr10"
+                form="form_delete" name="delete" id="delete"
                 onclick="return confirm('選択した項目を削除しますか？');">削除</button>
-            <button type="submit" class="btn btn-sm btn-default mr10" name="export_csv" id="export_csv"
-                action="{{route('prices_export')}}">CSV出力</button>
-            <button type="submit" class="btn btn-sm btn-default mr10" name="import_csv" id="import_csv"
-                action="{{route('prices_import')}}">インポート</button>
+
+            <button type="submit" class="btn btn-sm btn-default mr10"
+                name="export_csv" id="export_csv"
+                action="{{ route('prices_export') }}">CSV出力</button>
+
+            <button type="submit" class="btn btn-sm btn-default mr10"
+                name="import_csv" id="import_csv"
+                action="{{ route('prices_import') }}">インポート</button>
+
             <button type="button" class="btn btn-sm btn-default mr10"
                 onclick="location.href='{{ route('prices_export') }}'">エクスポート</button>
         </div>
 
-        <div class="d-flex justify-content-end">
-            {{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }}
+        {{-- ▼ ページネーション --}}
+        <div class="container-fluid">
+            <div class="d-flex justify-content-end mb-3">
+                {{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }}
+            </div>
         </div>
-        
+
         {{-- ▼ フラッシュメッセージ --}}
         <div class="form col-lg-12">
             @if(Session::has('success'))
@@ -57,93 +69,96 @@
             @elseif(Session::has('error'))
                 <div class="alert alert-danger alert-dismissible">
                     <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                    <h4><i class="icon fa fa-ban"></i> {{__('誤差')}}:</h4>
+                    <h4><i class="icon fa fa-ban"></i> {{ __('誤差') }}:</h4>
                     {!! Session::get('error') !!}
                 </div>
             @elseif(isset($errorMsg))
                 <div class="alert alert-danger alert-dismissible">
                     <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                    <h4><i class="icon fa fa-ban"></i> {{__('誤差')}}:</h4>
+                    <h4><i class="icon fa fa-ban"></i> {{ __('誤差') }}:</h4>
                     {!! $errorMsg !!}
                 </div>
             @endif
         </div>
 
         {{-- ▼ 一覧（市区マスタ準拠：1枚テーブル／先頭が「チェック＋編集」統合列） --}}
-        <form action="{{route('prices_delete')}}" method="post" id="form_delete">
+        <form action="{{ route('prices_delete') }}" method="post" id="form_delete">
             @csrf
+
             <!-- ▼ ここから単一テーブル構成 ----------------------------------------- -->
             <div class="col-lg-12 mb20">
                 <div class="table-responsive">
-                    <form action="{{ route('prices_delete') }}" method="POST" id="form_delete">
-                        @csrf
-                        <table class="table table-bordered dataTable text-nowrap">
-                            <thead class="thead-light">
+                    <table class="table table-bordered dataTable text-nowrap">
+                        <thead class="thead-light">
+                            <tr>
+                                {{-- ★ チェック + 編集 用の1列 --}}
+                                <th style="width:140px; border-left:1px solid #dcdcdc;" class="text-left">
+                                    <input type="checkbox" onclick="$('input[name*=\'pk\']').prop('checked', this.checked);">
+                                </th>
+
+                                {{-- ▼ ソート対象列 --}}
+                                <th class="sorting {{ ($sort=='price_parkplaceid') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}"
+                                    sort="price_parkplaceid">
+                                    <span>駐輪場所ID</span>
+                                </th>
+                                <th class="sorting {{ ($sort=='park_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}"
+                                    sort="park_id">
+                                    <span>駐輪場ID</span>
+                                </th>
+
+                                {{-- ▼ ソート不要 --}}
+                                <th><span>商品名</span></th>
+                                <th><span>期間</span></th>
+                                <th><span>利用者分類ID</span></th>
+                                <th><span>駐輪料金（税込）</span></th>
+
+                                {{-- ▼ ソート対象列 --}}
+                                <th class="sorting {{ ($sort=='psection_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}"
+                                    sort="psection_id">
+                                    <span>車種区分ID</span>
+                                </th>
+                                <th class="sorting {{ ($sort=='price_ptypeid') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}"
+                                    sort="price_ptypeid">
+                                    <span>駐輪分類</span>
+                                </th>
+                                <th class="sorting {{ ($sort=='pplace_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}"
+                                    sort="pplace_id">
+                                    <span>駐車車室ID</span>
+                                </th>
+                            </tr>
+                        </thead>
+
+                        <tbody class="bg-white">
+                            @foreach($list as $item)
                                 <tr>
-                                    {{-- ★ チェック + 編集 用の1列 --}}
-                                    <th style="width:140px;" class="text-left">
-                                        <input type="checkbox" onclick="$('input[name*=\'pk\']').prop('checked', this.checked);">
-                                    </th>
+                                    {{-- ★ 同じセル内に チェック + 編集ボタン --}}
+                                    <td class="align-middle" style="background-color:#faebd7; border-left:1px solid #dcdcdc;">
+                                        <div class="d-flex align-items-center">
+                                            <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->price_parkplaceid }}">
+                                            <a href="{{ route('price_edit', ['id' => $item->price_parkplaceid]) }}"
+                                               class="btn btn-sm btn-default ml10">編集</a>
+                                        </div>
+                                    </td>
 
-                                    {{-- ▼ ソート対象列 --}}
-                                    <th class="sorting {{ ($sort=='price_parkplaceid') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="price_parkplaceid">
-                                        <span>駐輪場所ID</span>
-                                    </th>
-                                    <th class="sorting {{ ($sort=='park_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="park_id">
-                                        <span>駐輪場ID</span>
-                                    </th>
-
-                                    {{-- ▼ ソート不要 --}}
-                                    <th><span>商品名</span></th>
-                                    <th><span>期間</span></th>
-                                    <th><span>利用者分類ID</span></th>
-                                    <th><span>駐輪料金（税込）</span></th>
-
-                                    {{-- ▼ ソート対象列 --}}
-                                    <th class="sorting {{ ($sort=='psection_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="psection_id">
-                                        <span>車種区分ID</span>
-                                    </th>
-                                    <th class="sorting {{ ($sort=='price_ptypeid') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="price_ptypeid">
-                                        <span>駐輪分類</span>
-                                    </th>
-                                    <th class="sorting {{ ($sort=='pplace_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="pplace_id">
-                                        <span>駐車車室ID</span>
-                                    </th>
+                                    {{-- データ列 --}}
+                                    <td class="sm-item text-left align-middle">{{ $item->price_parkplaceid }}</td>
+                                    <td class="sm-item text-left align-middle">{{ $item->park_id }}</td>
+                                    <td class="sm-item text-left align-middle">{{ $item->prine_name }}</td>
+                                    <td class="sm-item text-left align-middle">{{ $item->price_month }}</td>
+                                    <td class="sm-item text-left align-middle">{{ $item->user_categoryid }}</td>
+                                    <td class="sm-item text-left align-middle">{{ $item->price }}</td>
+                                    <td class="sm-item text-left align-middle">{{ $item->psection_id }}</td>
+                                    <td class="sm-item text-left align-middle">{{ $item->price_ptypeid }}</td>
+                                    <td class="sm-item text-left align-middle">{{ $item->pplace_id }}</td>
                                 </tr>
-                            </thead>
-
-                            <tbody class="bg-white">
-                                @foreach($list as $item)
-                                    <tr>
-                                        {{-- ★ 同じセル内に チェック + 編集ボタン --}}
-                                        <td class="align-middle" style="background-color:#faebd7;">
-                                            <div class="d-flex align-items-center">
-                                                <input type="checkbox" class="m-0 checkbox" name="pk[]" value="{{ $item->price_parkplaceid }}">
-                                                <a href="{{ route('price_edit', ['id' => $item->price_parkplaceid]) }}" class="btn btn-sm btn-default ml10">編集</a>
-                                            </div>
-                                        </td>
-
-                                        {{-- データ列 --}}
-                                        <td class="sm-item text-left align-middle">{{ $item->price_parkplaceid }}</td>
-                                        <td class="sm-item text-left align-middle">{{ $item->park_id }}</td>
-                                        <td class="sm-item text-left align-middle">{{ $item->prine_name }}</td>
-                                        <td class="sm-item text-left align-middle">{{ $item->price_month }}</td>
-                                        <td class="sm-item text-left align-middle">{{ $item->user_categoryid }}</td>
-                                        <td class="sm-item text-left align-middle">{{ $item->price }}</td>
-                                        <td class="sm-item text-left align-middle">{{ $item->psection_id }}</td>
-                                        <td class="sm-item text-left align-middle">{{ $item->price_ptypeid }}</td>
-                                        <td class="sm-item text-left align-middle">{{ $item->pplace_id }}</td>
-                                    </tr>
-                                @endforeach
-                            </tbody>
-                        </table>
-                    </form>
+                            @endforeach
+                        </tbody>
+                    </table>
                 </div>
             </div>
             <!-- ▲ 単一テーブル構成ここまで ----------------------------------------- -->
-
-            
         </form>
+
     </div>
 </section>
 
@@ -175,4 +190,4 @@ $(function(){
     });
 });
 </script>
-@endsection
\ No newline at end of file
+@endsection