SWA98,SWA95ビューを整理・統一し、不要なコードを削除

app/Http/Controllers/Admin/ContractAllowableCityController.php

@@ -17,79 +17,84 @@ class ContractAllowableCityController extends Controller
      * 一覧表示
      */
     public function list(Request $request)
-{
+    {
-    $inputs = $request->all();
+        $inputs = $request->all();
-    $inputs['isMethodPost'] = $request->isMethod('post');
+        $inputs['isMethodPost'] = $request->isMethod('post');
 
-    // 解除処理
+        // 解除処理
-    if ($request->isMethod('post') && $request->input('action') === 'unlink') {
+        if ($request->isMethod('post') && $request->input('action') === 'unlink') {
-        $query = ContractAllowableCity::query();
+            // バリデーション：解除条件が1つも入力されていない場合はエラー
+            if (
+                !$request->filled('contract_allowable_city_id')
+                && !$request->filled('city_id')
+                && !$request->filled('contract_allowable_city_name')
+                && !$request->filled('park_id')
+            ) {
+                return back()->withErrors(['解除条件を1つ以上入力してください。']);
+            }
 
-        if ($request->filled('contract_allowable_city_id')) {
+            $query = ContractAllowableCity::query();
-            $query->where('contract_allowable_city_id', $request->contract_allowable_city_id);
+
-        }
+            if ($request->filled('contract_allowable_city_id')) {
-        if ($request->filled('city_id')) {
+                $query->where('contract_allowable_city_id', $request->contract_allowable_city_id);
-            $query->where('city_id', $request->city_id);
+            }
-        }
+            if ($request->filled('city_id')) {
-        if ($request->filled('contract_allowable_city_name')) {
+                $query->where('city_id', $request->city_id);
-            $query->where('contract_allowable_city_name', 'like', '%' . $request->contract_allowable_city_name . '%');
+            }
-        }
+            if ($request->filled('contract_allowable_city_name')) {
-        if ($request->filled('park_id')) {
+                $query->where('contract_allowable_city_name', 'like', '%' . $request->contract_allowable_city_name . '%');
-            $query->where('park_id', $request->park_id);
+            }
+            if ($request->filled('park_id')) {
+                $query->where('park_id', $request->park_id);
+            }
+
+            // 推荐：直接批量删除
+            $count = $query->delete();
+            return redirect()->route('contract_allowable_cities')->with('success', '解除しました');
         }
 
-        $records = $query->get();
+        // 通常の絞り込み処理
-        foreach ($records as $record) {
+        $list = ContractAllowableCity::search($inputs);
-            $record->delete(); 
-        }
 
-        return redirect()->route('contract_allowable_cities')->with('success', '解除しました');
+        return view('admin.contract_allowable_cities.list', [
+            'list' => $list,
+            'inputs' => $inputs,
+            'sort' => $inputs['sort'] ?? '',
+            'sort_type' => $inputs['sort_type'] ?? '',
+            'cityList' => City::getList(),
+            'parkList' => Park::getList(),
+        ]);
     }
 
-    // 通常の絞り込み処理
-    $list = ContractAllowableCity::search($inputs);
-
-    return view('admin.contract_allowable_cities.list', [
-        'list' => $list,
-        'inputs' => $inputs,
-        'sort' => $inputs['sort'] ?? '',
-        'sort_type' => $inputs['sort_type'] ?? '',
-        'cityList' => City::getList(),
-        'parkList' => Park::getList(),
-    ]);
-}
-
-
     /**
      * 新規登録
      */
     public function add(Request $request)
     {
         if ($request->isMethod('post')) {
-            $request->validate([
+            $validated = $request->validate([
                 'city_id' => 'required|integer',
                 'contract_allowable_city_name' => 'required|string|max:20',
                 'park_id' => 'required|integer',
                 'same_district_flag' => 'required|integer',
             ]);
 
-            $data = $request->all();
+            $validated['operator_id'] = Auth::user()->ope_id;
-            $data['operator_id'] = Auth::user()->ope_id;
 
-            ContractAllowableCity::create($data);
+            ContractAllowableCity::create($validated);
 
-            return redirect()->route('contract_allowable_cities')->with('success', '登録しました');
+            return redirect()->route('contract_allowable_cities')
+                ->with('success', '登録しました。');
         }
 
-            return view('admin.contract_allowable_cities.add', [
+        return view('admin.contract_allowable_cities.add', [
-                'record' => null,
+            'record'   => null,
-                'cityList' => City::getList(),
+            'cityList' => City::getList(),
-                'parkList' => Park::getList(),
+            'parkList' => Park::getList(),
-                'contractAllowableCityList' => ContractAllowableCity::getList(),
-                'mode' => 'add'
         ]);
     }
 
+
     /**
      * 編集
      */
@@ -97,32 +102,34 @@ class ContractAllowableCityController extends Controller
     {
         $record = ContractAllowableCity::getByPk($id);
         if (!$record) {
-            return redirect()->route('contract_allowable_cities')->with('error', 'データが存在しません');
+            return redirect()->route('contract_allowable_cities')
+                ->with('error', 'データが存在しません');
         }
 
         if ($request->isMethod('post')) {
-            $request->validate([
+            $validated = $request->validate([
                 'city_id' => 'required|integer',
                 'contract_allowable_city_name' => 'required|string|max:20',
                 'park_id' => 'required|integer',
                 'same_district_flag' => 'required|integer',
             ]);
 
-            $record->fill($request->all());
+            $record->fill($validated);
             $record->operator_id = Auth::user()->ope_id;
             $record->save();
 
-            return redirect()->route('contract_allowable_cities')->with('success', '更新しました');
+            return redirect()->route('contract_allowable_cities')
+                ->with('success', '更新しました。');
         }
 
         return view('admin.contract_allowable_cities.edit', [
-            'record' => $record,
+            'record'   => $record,
-            'cities' => City::getList(),
+            'cityList' => City::getList(),
-            'parks' => Park::getList(),
+            'parkList' => Park::getList(),
-            'mode' => 'edit'
         ]);
     }
 
+
     /**
      * 詳細参照（表示のみ）
      */
@@ -142,16 +149,29 @@ class ContractAllowableCityController extends Controller
     }
 
     /**
-     * 一括削除
+     * 一括削除（単一・複数対応）
      */
     public function delete(Request $request)
     {
-        if ($request->has('id')) {
+        // バリデーション：'id'は必須、配列の場合は各要素が整数
-            ContractAllowableCity::deleteByPk($request->id);
+        $request->validate([
-            return redirect()->route('contract_allowable_cities')->with('success', '削除しました');
+            'id' => 'required',
-        }
+            'id.*' => 'integer',
+        ]);
 
-        return redirect()->route('contract_allowable_cities')->with('error', '削除対象が見つかりません');
+        // idを配列化（単一でも複数でも対応）
+        $ids = (array)$request->input('id');
+
+        // 削除処理
+        // ContractAllowableCity::destroy($ids) が使える場合
+        $deleted = ContractAllowableCity::destroy($ids);
+
+        // 削除件数でメッセージ分岐
+        if ($deleted > 0) {
+            return redirect()->route('contract_allowable_cities')->with('success', '削除しました。');
+        } else {
+            return redirect()->route('contract_allowable_cities')->with('error', '削除に失敗しました。');
+        }
     }
 
     /**

app/Http/Controllers/Admin/JurisdictionParkingController.php

@@ -26,19 +26,33 @@ class JurisdictionParkingController extends Controller
     {
         if ($request->isMethod('post')) {
             $validated = $request->validate([
-                'jurisdiction_parking_name' => 'required|string|max:255',
+                'jurisdiction_parking_name' => [
-                'operator_id' => 'nullable|integer',
+                    'required',
-                'park_id' => 'nullable|integer',
+                    'string',
+                    'max:20',
+                ],
+                'ope_id' => [
+                    'required',
+                ],
+                'park_id' => [
+                    'required',
+                ],
+                'operator_id' => [
+                    'nullable',
+                    'integer',
+                ],
             ]);
 
             JurisdictionParking::create($validated);
-            return redirect()->route('jurisdiction_parkings')->with('success', '登録しました');
+
+            return redirect()->route('jurisdiction_parkings')
+                ->with('success', '登録しました。');
         }
 
         $parks = Park::pluck('park_name', 'park_id');
-        $operators = Ope::pluck('ope_name', 'ope_id'); 
+        $opes = Ope::pluck('ope_name', 'ope_id');
 
-        return view('admin.jurisdiction_parkings.add', compact('parks', 'operators'));
+        return view('admin.jurisdiction_parkings.add', compact('parks', 'opes'));
     }
 
 
@@ -48,14 +62,27 @@ class JurisdictionParkingController extends Controller
 
         if ($request->isMethod('post')) {
             $validated = $request->validate([
-                'jurisdiction_parking_name' => 'required|string|max:255',
+                'jurisdiction_parking_name' => [
-                'ope_id' => 'nullable|integer',
+                    'required',
-                'park_id' => 'nullable|integer',
+                    'string',
-                'operator_id' => 'nullable|integer',
+                    'max:20',
+                ],
+                'ope_id' => [
+                    'required',
+                ],
+                'park_id' => [
+                    'required',
+                ],
+                'operator_id' => [
+                    'nullable',
+                    'integer',
+                ],
             ]);
 
             $record->update($validated);
-            return redirect()->route('jurisdiction_parkings')->with('success', '更新しました');
+
+            return redirect()->route('jurisdiction_parkings')
+                ->with('success', '更新しました。');
         }
 
         $parks = Park::pluck('park_name', 'park_id');
@@ -67,12 +94,22 @@ class JurisdictionParkingController extends Controller
 
     public function delete(Request $request)
     {
-        if ($request->has('pk')) {
+        $request->validate([
-            JurisdictionParking::destroy($request->input('pk'));
+            'pk' => 'required',
-            return redirect()->route('jurisdiction_parkings')->with('success', '削除しました');
+            'pk.*' => 'integer', // 各要素が整数であることを確認
-        }
+        ]);
 
-        return redirect()->route('jurisdiction_parkings')->with('error', '削除対象が見つかりません');
+        $ids = (array) $request->input('pk'); // 配列として取得
+
+        $deleted = JurisdictionParking::destroy($ids);
+
+        if ($deleted > 0) {
+            return redirect()->route('jurisdiction_parkings')
+                ->with('success', '削除しました。');
+        } else {
+            return redirect()->route('jurisdiction_parkings')
+                ->with('error', '削除に失敗しました。');
+        }
     }
 
     public function info(Request $request, $jurisdiction_parking_id)

app/Http/Controllers/Admin/PrintAreaController.php

@@ -37,7 +37,7 @@ class PrintAreaController extends Controller
             $validated['operator_id'] = auth()->id(); // 現在のログインユーザーを記録
             PrintArea::create($validated);
 
-            return redirect()->route('print_areas')->with('success', '登録しました');
+            return redirect()->route('print_areas')->with('success', '登録しました。');
         }
 
         $parks = Park::pluck('park_name', 'park_id');
@@ -58,7 +58,7 @@ class PrintAreaController extends Controller
             $validated['operator_id'] = auth()->id(); // 更新者を記録
             $record->update($validated);
 
-            return redirect()->route('print_areas')->with('success', '更新しました');
+            return redirect()->route('print_areas')->with('success', '更新しました。');
         }
 
         $parks = Park::pluck('park_name', 'park_id');
@@ -72,15 +72,26 @@ class PrintAreaController extends Controller
         return view('admin.print_areas.info', compact('record'));
     }
 
-    // 削除（複数可）
     public function delete(Request $request)
     {
-        if ($request->has('pk')) {
+        // バリデーション：'pk'は必須、配列の場合は各要素が整数
-            PrintArea::destroy($request->input('pk'));
+        $request->validate([
-            return redirect()->route('print_areas')->with('success', '削除しました');
+            'pk' => 'required',
-        }
+            'pk.*' => 'integer',
+        ]);
 
-        return redirect()->route('print_areas')->with('error', '削除対象が見つかりません');
+        // pkを配列化（単一でも配列でも対応）
+        $ids = (array)$request->input('pk');
+
+        // 削除処理
+        $deleted = PrintArea::destroy($ids);
+
+        // 削除結果によってメッセージを分岐
+        if ($deleted > 0) {
+            return redirect()->route('print_areas')->with('success', '削除しました。');
+        } else {
+            return redirect()->route('print_areas')->with('error', '削除に失敗しました。');
+        }
     }
 
     // CSVエクスポート

resources/js/app.js

@@ -185,8 +185,8 @@ $('#register_edit').on('click', function (e) {
 $('#delete_edit').on('click', function (e) {
     e.preventDefault();
     $.confirm({
-        title: '確認ダイアログ',
+        title: '削除ダイアログ',
-        content: 'このレコードを削除してよろしいですか？',
+        content: '！削除してよろしいですか？',
         buttons: {
             ok: {
                 text: "はい",

resources/lang/ja/validation.php

@@ -387,6 +387,10 @@ return [
         'use_flag' => '契約内容フラグ',
         'terms_created_at' => '契約内容作成日',
         'terms_updated_at' => '契約内容更新日',
+//SWA-98
+        'contract_allowable_city_id' => '契約許容市区マスタID',
+        'contract_allowable_city_name' => '許容市区名',
+        'same_district_flag' => '隣接区フラグ',       
 
     ],
 ];

resources/views/admin/contract_allowable_cities/_form.blade.php

@@ -1,94 +1,111 @@
-@php
+<div class="card">
-    $isEdit = $mode === 'edit';
+    <div class="card-body">
-    $isInfo = $mode === 'info';
+        <!-- バリデーションエラー表示 -->
-@endphp
+        @if ($errors->any())
+            <div class="form-group col-12">
+                <div class="alert alert-danger">
+                    <ul>
+                        @foreach ($errors->all() as $error)
+                            <li>{{ $error }}</li>
+                        @endforeach
+                    </ul>
+                </div>
+            </div>
+        @endif
 
-@if($isEdit || $isInfo)
+        @if($isEdit)
-    <!-- 契約許容市区ID -->
+            <div class="row align-items-center mb-3">
-    <div class="form-group col-3">
+                <!-- 許容市区ID -->
-        <label>{{ __('validation.attributes.contract_allowable_city_id') }}</label>
+                <div class="form-group col-2">
-    </div>
+                    <label>{{ __('validation.attributes.contract_allowable_city_id') }}</label>
-    <div class="form-group col-9">
+                </div>
-        <input type="text" class="form-control form-control-lg" readonly
+                <div class="form-group col-10">
-               value="{{ $record->contract_allowable_city_id ?? '' }}">
+                    <input type="text" class="form-control form-control-lg" readonly
-    </div>
+                        value="{{ $record->contract_allowable_city_id ?? '' }}">
-@endif
+                </div>
+            </div>
+        @endif
 
-<!-- 市区ID -->
+        <!-- 市区ID -->
-<div class="form-group col-3">
+        <div class="row align-items-center mb-3">
-    <label @if(!$isInfo) class="required" @endif>{{ __('validation.attributes.city_id') }}</label>
+            <div class="form-group col-2">
-</div>
+                <label class="required">{{ __('validation.attributes.city_id') }}</label>
-<div class="form-group col-9">
+            </div>
-    <select class="form-control form-control-lg" name="city_id" @if($isInfo) disabled @endif>
+            <div class="form-group col-10">
-        <option value="">{{ __('validation.attributes.city_id') }}</option>
+                <select class="form-control form-control-lg" name="city_id" required>
-        @foreach($cityList as $key => $item)
+                    <option value="">{{ __('validation.attributes.city_id') }}</option>
-            <option value="{{ $key }}" @if($key == old('city_id', $record->city_id ?? '')) selected @endif>{{ $item }}</option>
+                    @foreach($cityList as $key => $item)
-        @endforeach
+                        <option value="{{ $key }}" @if($key == old('city_id', $record->city_id ?? '')) selected @endif>{{ $item }}</option>
-    </select>
+                    @endforeach
-</div>
+                </select>
+            </div>
+        </div>
 
-<!-- 許容市区名 -->
+        <!-- 許容市区名 -->
-<div class="form-group col-3">
+        <div class="row align-items-center mb-3">
-    <label @if(!$isInfo) class="required" @endif>{{ __('validation.attributes.contract_allowable_city_name') }}</label>
+            <div class="form-group col-2">
-</div>
+                <label class="required">{{ __('validation.attributes.contract_allowable_city_name') }}</label>
-<div class="form-group col-9">
+            </div>
-    <input type="text" class="form-control form-control-lg"
+            <div class="form-group col-10">
-           name="contract_allowable_city_name"
+                <input type="text" class="form-control form-control-lg"
-           value="{{ old('contract_allowable_city_name', $record->contract_allowable_city_name ?? '') }}"
+                    name="contract_allowable_city_name"
-           placeholder="{{ __('validation.attributes.contract_allowable_city_name') }}"
+                    value="{{ old('contract_allowable_city_name', $record->contract_allowable_city_name ?? '') }}"
-           @if($isInfo) readonly @endif>
+                    placeholder="{{ __('validation.attributes.contract_allowable_city_name') }}"
-</div>
+                    maxlength="50"
+                    required
+                >
+            </div>
+        </div>
 
-<!-- 駐輪場 -->
+        <!-- 駐輪場 -->
-<div class="form-group col-3">
+        <div class="row align-items-center mb-3">
-    <label @if(!$isInfo) class="required" @endif>{{ __('validation.attributes.park_id') }}</label>
+            <div class="form-group col-2">
-</div>
+                <label class="required">{{ __('validation.attributes.park_id') }}</label>
-<div class="form-group col-9">
+            </div>
-    <select class="form-control form-control-lg" name="park_id" @if($isInfo) disabled @endif>
+            <div class="form-group col-10">
-        <option value="">{{ __('validation.attributes.park_id') }}</option>
+                <select class="form-control form-control-lg" name="park_id" required>
-        @foreach($parkList as $key => $item)
+                    <option value="">{{ __('validation.attributes.park_id') }}</option>
-            <option value="{{ $key }}" @if($key == old('park_id', $record->park_id ?? '')) selected @endif>{{ $item }}</option>
+                    @foreach($parkList as $key => $item)
-        @endforeach
+                        <option value="{{ $key }}" @if($key == old('park_id', $record->park_id ?? '')) selected @endif>{{ $item }}</option>
-    </select>
+                    @endforeach
-</div>
+                </select>
+            </div>
+        </div>
 
-<!-- 隣接区フラグ -->
+        <!-- 隣接区フラグ -->
-<div class="form-group col-3">
+        <div class="row align-items-center mb-3">
-    <label @if(!$isInfo) class="required" @endif>{{ __('validation.attributes.same_district_flag') }}</label>
+            <div class="form-group col-2">
+                <label class="required">{{ __('validation.attributes.same_district_flag') }}</label>
+            </div>
+            <div class="form-group col-10">
+                <select class="form-control form-control-lg" name="same_district_flag" required>
+                    <option value="">{{ __('validation.attributes.same_district_flag') }}</option>
+                    <option value="0" @if(old('same_district_flag', $record->same_district_flag ?? '') == 0) selected @endif>隣接市</option>
+                    <option value="1" @if(old('same_district_flag', $record->same_district_flag ?? '') == 1) selected @endif>その他</option>
+                </select>
+            </div>
+        </div>
+
+        {{-- ▼ 下部ボタン --}}
+        <div class="col-3"></div>
+        <div class="form-group col-9 d-flex align-items-center gap-2 mt-4">
+            {{-- 登録ボタン --}}
+            @if($isEdit)
+                <button type="submit" id="register_edit" class="btn btn-lg btn-success mr-2">
+                    {{ __('登録') }}
+                </button>
+            @else
+                <button type="submit" id="register" class="btn btn-lg btn-success mr-2 register">
+                    {{ __('登録') }}
+                </button>
+            @endif
+
+            {{-- 削除ボタン（編集時のみ表示） --}}
+            @if($isEdit && !empty($record->contract_allowable_city_id))
+                <button type="button" id="delete_edit" class="btn btn-lg btn-danger">
+                    {{ __('削除') }}
+                </button>
+            @endif
+        </div>
+    </div>
 </div>
-<div class="form-group col-9">
-    <select class="form-control form-control-lg" name="same_district_flag" @if($isInfo) disabled @endif>
-        <option value="">{{ __('validation.attributes.same_district_flag') }}</option>
-        <option value="0" @if(old('same_district_flag', $record->same_district_flag ?? '') == 0) selected @endif>隣接市</option>
-        <option value="1" @if(old('same_district_flag', $record->same_district_flag ?? '') == 1) selected @endif>その他</option>
-    </select>
-</div>
-
-@if($isInfo)
-    <!-- 更新オペレータ -->
-    <div class="form-group col-3">
-        <label>{{ __('validation.attributes.operator_id') }}</label>
-    </div>
-    <div class="form-group col-9">
-        <input type="text" class="form-control form-control-lg" readonly
-               value="{{ $record->operator_id ?? '' }}">
-    </div>
-
-    <!-- 登録日時 -->
-    <div class="form-group col-3">
-        <label>{{ __('validation.attributes.created_at') }}</label>
-    </div>
-    <div class="form-group col-9">
-        <input type="text" class="form-control form-control-lg" readonly
-               value="{{ $record->created_at ?? '' }}">
-    </div>
-
-    <!-- 更新日時 -->
-    <div class="form-group col-3">
-        <label>{{ __('validation.attributes.updated_at') }}</label>
-    </div>
-    <div class="form-group col-9">
-        <input type="text" class="form-control form-control-lg" readonly
-               value="{{ $record->updated_at ?? '' }}">
-    </div>
-@endif

resources/views/admin/contract_allowable_cities/add.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title', '契約許容市区マスタ（新規）')
+@section('title', '新規')
 
 @section('content')
 <div class="content-header">
@@ -21,76 +21,16 @@
 
 <section class="content">
   <div class="container-fluid">
-    <form action="{{ route('contract_allowable_cities_add') }}" method="POST" id="form_main">
+    {{-- 新規登録フォーム --}}
-      @csrf
+    <form id="form_add" action="{{ route('contract_allowable_cities_add') }}" method="POST">
-      <div class="card p-4">
+        @csrf
-
+        @include('admin.contract_allowable_cities._form', [
-        {{-- 契約許容市区マスタID --}}
+            'isEdit' => false,
-        <div class="row mb-3">
+            'record' => null,
-          <label class="col-md-2 col-form-label">契約許容市区マスタID<span class="text-danger">*</span></label>
+            'cityList' => $cityList ?? [],
-          <div class="col-md-10">
+            'parkList' => $parkList ?? []
-            <select name="contract_allowable_city_id" class="form-control" required>
+        ])
-              <option value="">選択してください</option>
-              @foreach($contractAllowableCityList as $id => $name)
-                <option value="{{ $id }}" {{ old('contract_allowable_city_id', $record->contract_allowable_city_id ?? '') == $id ? 'selected' : '' }}>{{ $name }}</option>
-              @endforeach
-            </select>
-          </div>
-        </div>
-
-        {{-- 市区ID --}}
-        <div class="row mb-3">
-          <label class="col-md-2 col-form-label">市区ID<span class="text-danger">*</span></label>
-          <div class="col-md-10">
-            <select name="city_id" class="form-control" required>
-              <option value="">選択してください</option>
-              @foreach($cityList as $id => $name)
-                <option value="{{ $id }}" {{ old('city_id') == $id ? 'selected' : '' }}>{{ $id }}</option>
-              @endforeach
-            </select>
-          </div>
-        </div>
-
-        {{-- 許容市区名 --}}
-        <div class="row mb-3">
-          <label class="col-md-2 col-form-label">許容市区名<span class="text-danger">*</span></label>
-          <div class="col-md-10">
-            <input type="text" name="contract_allowable_city_name" class="form-control" value="{{ old('contract_allowable_city_name') }}" placeholder="許容市区名を入力">
-          </div>
-        </div>
-
-        {{-- 駐輪場ID --}}
-        <div class="row mb-3">
-          <label class="col-md-2 col-form-label">駐輪場ID<span class="text-danger">*</span></label>
-          <div class="col-md-10">
-            <select name="park_id" class="form-control" required>
-              <option value="">選択してください</option>
-              @foreach($parkList as $id => $name)
-                <option value="{{ $id }}" {{ old('park_id') == $id ? 'selected' : '' }}>{{ $name }}</option>
-              @endforeach
-            </select>
-          </div>
-        </div>
-
-        {{-- 隣接区フラグ --}}
-        <div class="row mb-3">
-          <label class="col-md-2 col-form-label">隣接区フラグ<span class="text-danger">*</span></label>
-          <div class="col-md-10">
-            <select name="same_district_flag" class="form-control" required>
-              <option value="">選択してください</option>
-              <option value="0" {{ old('same_district_flag') == '0' ? 'selected' : '' }}>同一区</option>
-              <option value="1" {{ old('same_district_flag') == '1' ? 'selected' : '' }}>隣接区</option>
-            </select>
-          </div>
-        </div>
-
-        {{-- 下部登録ボタン --}}
-        <div class="mb-3">
-          <button type="submit" class="btn btn-success btn-lg" onclick="return confirm('登録してよろしいですか？')">登録</button>
-        </div>
-        
-      </div>
     </form>
   </div>
 </section>
-@endsection
+@endsection

resources/views/admin/contract_allowable_cities/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title', '契約許容市区マスタ - 編集')
+@section('title', '編集')
 
 @section('content')
 <div class="content-header">
@@ -21,70 +21,24 @@
 
 <section class="content">
   <div class="container-fluid">
-    <form method="post" action="{{ route('contract_allowable_cities_edit', ['id' => $record->contract_allowable_city_id]) }}">
-      @csrf
-        <div class="card p-4">
-            {{-- 契約許容市区マスタID --}}
-            <div class="row mb-3">
-                <label class="col-md-2 col-form-label">契約許容市区マスタID<span class="text-danger">*</span></label>
-                <div class="col-md-10">
-                <input type="text" class="form-control" value="{{ $record->contract_allowable_city_id }}" readonly>
-                </div>
-            </div>
-
-            {{-- 市区ID --}}
-            <div class="row mb-3">
-                <label class="col-md-2 col-form-label">市区ID<span class="text-danger">*</span></label>
-                <div class="col-md-10">
-                <select name="city_id" class="form-control" required>
-                    <option value="">選択してください</option>
-                    @foreach($cities as $id => $name)
-                    <option value="{{ $id }}" {{ old('city_id', $record->city_id) == $id ? 'selected' : '' }}>{{ $id }}</option>
-                    @endforeach
-                </select>
-                </div>
-            </div>
-
-            {{-- 許容市区名 --}}
-            <div class="row mb-3">
-                <label class="col-md-2 col-form-label">許容市区名 <span class="text-danger">*</span></label>
-                <div class="col-md-10">
-                <input type="text" name="contract_allowable_city_name" class="form-control" value="{{ old('contract_allowable_city_name', $record->contract_allowable_city_name) }}" maxlength="20" required>
-                </div>
-            </div>
-
-            {{-- 駐輪場 --}}
-            <div class="row mb-3">
-                <label class="col-md-2 col-form-label">駐輪場所ID <span class="text-danger">*</span></label>
-                <div class="col-md-10">
-                <select name="park_id" class="form-control" required>
-                    <option value="">選択してください</option>
-                    @foreach($parks as $id => $name)
-                    <option value="{{ $id }}" {{ old('park_id', $record->park_id) == $id ? 'selected' : '' }}>{{ $name }}</option>
-                    @endforeach
-                </select>
-                </div>
-            </div>
-
-            {{-- 隣接区フラグ --}}
-            <div class="row mb-4">
-                <label class="col-md-2 col-form-label">隣接区フラグ <span class="text-danger">*</span></label>
-                <div class="col-md-10">
-                <select name="same_district_flag" class="form-control" required>
-                    <option value="">選択してください</option>
-                    <option value="0" {{ old('same_district_flag', $record->same_district_flag) == '0' ? 'selected' : '' }}>0:隣接市</option>
-                </select>
-                </div>
-            </div>
-
-            {{-- ボタンエリア --}}
-            <div class="text-left">
-                <button type="submit" class="btn btn-success px-3">登録</button>
-                <a href="{{ route('contract_allowable_cities') }}" class="btn btn-secondary px-3">戻る</a>
-            </div>
-        </div>
 
+    {{-- 編集フォーム --}}
+    <form id="form_edit" action="{{ route('contract_allowable_cities_edit', ['id' => $record->contract_allowable_city_id]) }}" method="POST">
+        @csrf
+          @include('admin.contract_allowable_cities._form', [
+              'isEdit'   => true,
+              'record'   => $record,
+              'cityList' => $cityList,   // 改为 $cityList
+              'parkList' => $parkList    // 改为 $parkList
+          ])
     </form>
+
+    {{-- 削除フォーム --}}
+    <form id="form_delete" action="{{ route('contract_allowable_cities_delete') }}" method="POST" style="display:none;">
+        @csrf
+        <input type="hidden" name="pk" value="{{ $record->contract_allowable_city_id }}">
+    </form>
+
   </div>
 </section>
-@endsection
+@endsection

resources/views/admin/contract_allowable_cities/info.blade.php

@@ -1,36 +0,0 @@
-@extends('layouts.app')
-@section('title', '[東京都|〇〇駐輪場] 契約許容市区マスタ（詳細）')
-
-@section('content')
-<!-- Content Header -->
-<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>
-            </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"><a href="{{ route('contract_allowable_cities') }}">契約許容市区マスタ</a></li>
-                    <li class="breadcrumb-item active">詳細</li>
-                </ol>
-            </div>
-        </div>
-    </div>
-</div>
-
-<!-- Readonly Info View -->
-<div class="form-row">
-    @php
-        $isEdit = false;
-        $isInfo = true;
-    @endphp
-    @include('admin.contract_allowable_cities._form')
-</div>
-
-<!-- Buttons -->
-<div class="mt-4">
-    <a href="{{ route('contract_allowable_cities') }}" class="btn btn-secondary">戻る</a>
-</div>
-@endsection

resources/views/admin/contract_allowable_cities/list.blade.php

@@ -2,6 +2,22 @@
 @section('title', '[東京都|〇〇駐輪場] 契約許容市区マスタ')
 
 @section('content')
+
+@if ($errors->any())
+    <div class="alert alert-danger">
+        <ul class="mb-0">
+            @foreach ($errors->all() as $error)
+                <li>{{ $error }}</li>
+            @endforeach
+        </ul>
+    </div>
+@endif
+@if (session('success'))
+    <div class="alert alert-success">
+        {{ session('success') }}
+    </div>
+@endif
+
 <!-- Content Header -->
 <div class="content-header">
     <div class="container-fluid">
@@ -91,9 +107,9 @@
                 <form method="post" action="{{ route('contract_allowable_cities_delete') }}" id="form_delete">
                     @csrf
                     <table class="table table-bordered dataTable text-nowrap">
-                        <thead>
+                        <thead class="bg-light">
                             <tr>
-                                <th style="width:140px;" class="text-left">
+                                 <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=='contract_allowable_city_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="contract_allowable_city_id"><span>契約許容市区ID</span></th>

resources/views/admin/jurisdiction_parkings/_form.blade.php

@@ -1,79 +1,97 @@
-@if($isEdit || $isInfo)
+<div class="card">
-    <!-- 管轄駐輪場ID -->
+    <div class="card-body">
-    <div class="form-group col-3">
+        <!-- バリデーションエラー表示 -->
-        <label>{{ __('validation.attributes.jurisdiction_parking_id') }}</label>
+        @if ($errors->any())
-    </div>
+            <div class="form-group col-12">
-    <div class="form-group col-9">
+                <div class="alert alert-danger">
-        <input type="text" class="form-control form-control-lg" readonly
+                    <ul>
-               value="{{ $record->jurisdiction_parking_id ?? '' }}">
+                        @foreach ($errors->all() as $error)
-    </div>
+                            <li>{{ $error }}</li>
-@endif
+                        @endforeach
+                    </ul>
+                </div>
+            </div>
+        @endif
 
-<!-- 管轄名 -->
+        @if($isEdit)
-<div class="form-group col-3">
+            <div class="row align-items-center mb-3">
-    <label @if(!$isInfo) class="required" @endif>{{ __('validation.attributes.jurisdiction_parking_name') }}</label>
+                <!-- 管轄駐輪場ID -->
-</div>
+                <div class="form-group col-2">
-<div class="form-group col-9">
+                    <label>{{ __('validation.attributes.jurisdiction_parking_id') }}</label>
-    <input type="text" class="form-control form-control-lg"
+                </div>
-           name="jurisdiction_parking_name"
+                <div class="form-group col-10">
-           value="{{ old('jurisdiction_parking_name', $record->jurisdiction_parking_name ?? '') }}"
+                    <input type="text" class="form-control form-control-lg" readonly
-           placeholder="{{ __('validation.attributes.jurisdiction_parking_name') }}"
+                        value="{{ $record->jurisdiction_parking_id ?? '' }}">
-           @if($isInfo) readonly @endif>
+                </div>
-</div>
+            </div>
+        @endif
 
-<!-- オペレータ -->
+        <!-- 管轄名 -->
-<div class="form-group col-3">
+        <div class="row align-items-center mb-3">
-    <label @if(!$isInfo) class="required" @endif>{{ __('validation.attributes.ope_name') }}</label>
+            <div class="form-group col-2">
-</div>
+                <label class="required">{{ __('validation.attributes.jurisdiction_parking_name') }}</label>
-<div class="form-group col-9">
+            </div>
-    <select class="form-control form-control-lg" name="ope_id" @if($isInfo) disabled @endif>
+            <div class="form-group col-10">
-        <option value="">{{ __('validation.attributes.ope_name') }}</option>
+                <input type="text" class="form-control form-control-lg"
-        @foreach($opes as $key => $item)
+                    name="jurisdiction_parking_name"
-            <option value="{{ $key }}" @if($key == ($record->ope_id ?? '')) selected @endif>{{ $item }}</option>
+                    value="{{ old('jurisdiction_parking_name', $record->jurisdiction_parking_name ?? '') }}"
-        @endforeach
+                    placeholder="{{ __('validation.attributes.jurisdiction_parking_name') }}"
-    </select>
+                    maxlength="20" 
-</div>
+                    required
+                >
+            </div>
+        </div>
 
-<!-- 駐輪場 -->
+        <!-- オペレータ -->
-<div class="form-group col-3">
+        <div class="row align-items-center mb-3">
-    <label @if(!$isInfo) class="required" @endif>{{ __('validation.attributes.park_name') }}</label>
+            <div class="form-group col-2">
+                <label class="required">{{ __('オペレーター(エリアマネージャ)') }}</label>
+            </div>
+            <div class="form-group col-10">
+                <select class="form-control form-control-lg" name="ope_id">
+                    <option value="">{{ __('validation.attributes.ope_name') }}</option>
+                    @foreach($opes as $key => $item)
+                        <option value="{{ $key }}" @if($key == ($record->ope_id ?? '')) selected @endif>{{ $item }}</option>
+                    @endforeach
+                </select>
+            </div>
+        </div>
+
+        <!-- 駐輪場 -->
+        <div class="row align-items-center mb-3">
+            <div class="form-group col-2">
+                <label class="required">{{ __('validation.attributes.park_name') }}</label>
+            </div>
+            <div class="form-group col-10">
+                <select class="form-control form-control-lg" name="park_id">
+                    <option value="">{{ __('validation.attributes.park_name') }}</option>
+                    @foreach($parks as $key => $item)
+                        <option value="{{ $key }}" @if($key == ($record->park_id ?? '')) selected @endif>{{ $item }}</option>
+                    @endforeach
+                </select>
+            </div>
+        </div>
+
+        {{-- ▼ 下部ボタン --}}
+        <div class="col-3"></div>
+        <div class="form-group col-9 d-flex align-items-center gap-2 mt-4">
+            {{-- 登録ボタン --}}
+            @if($isEdit)
+                <button type="submit" id="register_edit" class="btn btn-lg btn-success mr-2">
+                    {{ __('登録') }}
+                </button>
+            @else
+                <button type="submit" id="register" class="btn btn-lg btn-success mr-2 register">
+                    {{ __('登録') }}
+                </button>
+            @endif
+
+            {{-- 削除ボタン（編集時のみ表示） --}}
+            @if($isEdit && !empty($record->jurisdiction_parking_id))
+                <button type="button" id="delete_edit" class="btn btn-lg btn-danger">
+                    {{ __('削除') }}
+                </button>
+            @endif
+        </div>
+    </div>
 </div>
-<div class="form-group col-9">
-    <select class="form-control form-control-lg" name="park_id" @if($isInfo) disabled @endif>
-        <option value="">{{ __('validation.attributes.park_name') }}</option>
-        @foreach($parks as $key => $item)
-            <option value="{{ $key }}" @if($key == ($record->park_id ?? '')) selected @endif>{{ $item }}</option>
-        @endforeach
-    </select>
-</div>
-
-<!-- 更新オペレータ -->
-@if($isInfo)
-    <div class="form-group col-3">
-        <label>{{ __('validation.attributes.operator_id') }}</label>
-    </div>
-    <div class="form-group col-9">
-        <input type="text" class="form-control form-control-lg" readonly
-               value="{{ $record->operator_id ?? '' }}">
-    </div>
-@endif
-
-<!-- 登録日時 -->
-@if($isInfo)
-    <div class="form-group col-3">
-        <label>{{ __('validation.attributes.created_at') }}</label>
-    </div>
-    <div class="form-group col-9">
-        <input type="text" class="form-control form-control-lg" readonly
-               value="{{ $record->created_at ?? '' }}">
-    </div>
-
-    <!-- 更新日時 -->
-    <div class="form-group col-3">
-        <label>{{ __('validation.attributes.updated_at') }}</label>
-    </div>
-    <div class="form-group col-9">
-        <input type="text" class="form-control form-control-lg" readonly
-               value="{{ $record->updated_at ?? '' }}">
-    </div>
-@endif

resources/views/admin/jurisdiction_parkings/add.blade.php

@@ -21,47 +21,11 @@
 
 <section class="content">
   <div class="container-fluid">
-    <form action="{{ route('jurisdiction_parkings_add') }}" method="POST">
+    {{-- 新規登録フォーム --}}
-      @csrf
+    <form id="form_add" action="{{ route('jurisdiction_parkings_add') }}" method="POST">
-      <div class="card p-4">
+        @csrf
-        <div class="row mb-3">
+        @include('admin.jurisdiction_parkings._form', ['isEdit' => false, 'record' => null])
-          <label class="col-md-2 col-form-label">管轄名<span class="text-danger">*</span></label>
-          <div class="col-md-10">
-            <input type="text" name="jurisdiction_parking_name" class="form-control" value="{{ old('jurisdiction_parking_name') }}" placeholder="管轄名を入力">
-          </div>
-        </div>
-
-        <div class="row mb-3">
-          <label class="col-md-2 col-form-label">オペレーターID</label>
-          <div class="col-md-10">
-            <select name="operator_id" class="form-control">
-              <option value="">選択してください</option>
-              @foreach($operators as $id => $name)
-                <option value="{{ $id }}" {{ old('operator_id') == $id ? 'selected' : '' }}>{{ $name }}</option>
-              @endforeach
-            </select>
-          </div>
-        </div>
-
-        <div class="row mb-3">
-          <label class="col-md-2 col-form-label">駐輪場ID</label>
-          <div class="col-md-10">
-            <select name="park_id" class="form-control">
-              <option value="">選択してください</option>
-              @foreach($parks as $id => $name)
-                <option value="{{ $id }}" {{ old('park_id') == $id ? 'selected' : '' }}>{{ $name }}</option>
-              @endforeach
-            </select>
-          </div>
-        </div>
-
-        {{-- 下部登録ボタン --}}
-        <div class="mb-3">
-          <button type="submit" class="btn btn-success btn-lg mt-3" onclick="return confirm('登録してよろしいですか？')">登録</button>
-        </div>
-
-      </div>
     </form>
   </div>
 </section>
-@endsection
+@endsection

resources/views/admin/jurisdiction_parkings/edit.blade.php

@@ -11,7 +11,7 @@
       <div class="col-sm-6">
         <ol class="breadcrumb float-sm-right text-sm">
           <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
-          <li class="breadcrumb-item"><a href="{{ route('jurisdiction_parkings') }}">管轄駐輪場マスタ</a></li>
+          <li class="breadcrumb-item"><a href="{{ route('jurisdiction_parkings') }}">管轄駐輪場</a></li>
           <li class="breadcrumb-item active">編集</li>
         </ol>
       </div>
@@ -21,59 +21,21 @@
 
 <section class="content">
   <div class="container-fluid">
-    <form method="post" action="{{ route('jurisdiction_parkings_edit', ['id' => $record->jurisdiction_parking_id]) }}">
+    {{-- 編集フォーム --}}
-      @csrf
+    <form id="form_edit" action="{{ route('jurisdiction_parkings_edit', ['id' => $record->jurisdiction_parking_id]) }}" method="POST">
-      <div class="card p-4">
+        @csrf
-        {{-- 管轄駐輪場ID（表示のみ） --}}
+        @include('admin.jurisdiction_parkings._form', [
-        <div class="row mb-3">
+            'isEdit' => true,
-          <label class="col-md-2 col-form-label">管轄駐輪場ID</label>
+            'record' => $record,
-          <div class="col-md-10">
+            'opes'   => $opes,
-            <input type="text" class="form-control" value="{{ $record->jurisdiction_parking_id }}" readonly>
+            'parks'  => $parks
-          </div>
+        ])
-        </div>
+    </form>
 
-        {{-- 管轄名 --}}
+    <form id="form_delete" action="{{ route('jurisdiction_parkings_delete') }}" method="POST" style="display:none;">
-        <div class="row mb-3">
+        @csrf
-          <label class="col-md-2 col-form-label">管轄名 <span class="text-danger">*</span></label>
+        <input type="hidden" name="pk" value="{{ $record->jurisdiction_parking_id }}">
-          <div class="col-md-10">
-            <input type="text" name="jurisdiction_parking_name" class="form-control" value="{{ old('jurisdiction_parking_name', $record->jurisdiction_parking_name) }}">
-          </div>
-        </div>
-
-        {{-- オペレータ --}}
-        <div class="row mb-3">
-          <label class="col-md-2 col-form-label">オペレーター（エリアマネージャ）</label>
-          <div class="col-md-10">
-            <select name="ope_id" class="form-control">
-              <option value="">選択してください</option>
-              @foreach($opes as $id => $name)
-                <option value="{{ $id }}" {{ $record->ope_id == $id ? 'selected' : '' }}>{{ $name }}</option>
-              @endforeach
-            </select>
-          </div>
-        </div>
-
-        {{-- 駐輪場 --}}
-        <div class="row mb-3">
-          <label class="col-md-2 col-form-label">駐輪場</label>
-          <div class="col-md-10">
-            <select name="park_id" class="form-control">
-              <option value="">選択してください</option>
-              @foreach($parks as $id => $name)
-                <option value="{{ $id }}" {{ $record->park_id == $id ? 'selected' : '' }}>{{ $name }}</option>
-              @endforeach
-            </select>
-          </div>
-        </div>
-
-        {{-- ボタンエリア --}}
-        <div class="text-left mt-4">
-          {{-- 下部登録ボタン --}}
-          <button type="submit" class="btn btn-success px-5">登録</button>
-          <a href="{{ route('jurisdiction_parkings') }}" class="btn btn-secondary px-5">戻る</a>
-        </div>
-      </div>
     </form>
   </div>
 </section>
-@endsection
+@endsection

resources/views/admin/jurisdiction_parkings/info.blade.php

@@ -1,41 +0,0 @@
-@extends('layouts.app')
-@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>
-            </div>
-            <div class="col-lg-6">
-                <ol class="breadcrumb float-sm-right text-sm">
-                    <li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li>
-                    <li class="breadcrumb-item"><a href="{{ route('jurisdiction_parkings') }}">[東京都|〇〇駐輪場]</a></li>
-                    <li class="breadcrumb-item active">管轄駐輪場 詳細</li>
-                </ol>
-            </div>
-        </div>
-    </div>
-</div>
-
-<section class="content">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="card">
-                    @include('admin.jurisdiction_parkings._form', [
-                        'record' => $record,
-                        'isEdit' => 0,
-                        'isInfo' => 1
-                    ])
-                </div>
-            </div>
-        </div>
-
-        <div class="mt-3">
-            <a href="{{ route('jurisdiction_parkings') }}" class="btn btn-sm btn-secondary">{{ __('戻る') }}</a>
-        </div>
-    </div>
-</section>
-@endsection

resources/views/admin/jurisdiction_parkings/list.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title', '[東京都|〇〇駐輪場] 管轄駐輪場マスタ')
+@section('title', '管轄駐輪場')
 
 @section('content')
 <!-- Content Header -->
@@ -7,13 +7,13 @@
     <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"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> -->
-                    <li class="breadcrumb-item active">管轄駐輪場マスタ</li>
+                    <li class="breadcrumb-item active">管轄駐輪場</li>
                 </ol>
             </div>
         </div>
@@ -68,7 +68,7 @@
                 <form action="{{ route('jurisdiction_parkings_delete') }}" method="POST" id="form_delete">
                     @csrf
                     <table class="table table-bordered dataTable text-nowrap">
-                        <thead>
+                        <thead class="thead-light">
                             <tr>
                                 {{-- ★ チェック + 編集 用の1列 --}}
                                 <th style="width:140px;" class="text-left">

resources/views/admin/print_areas/_form.blade.php

@@ -17,66 +17,78 @@
   </div>
 @endif
 
-<div class="card p-4">
+<div class="card">
-
+  <div class="card-body">
-  <div class="row mb-3">
+    {{-- バリデーションエラー表示 --}}
-    @if($isInfo || $isEdit)
+    @if ($errors->any())
-      <label class="col-md-2 col-form-label">{{ __('validation.attributes.print_area_id') }}</label>
+        <div class="alert alert-danger">
-      <div class="col-md-10">
+            <ul class="mb-0">
-        <input type="text" class="form-control" value="{{ $record->print_area_id ?? '' }}" readonly>
+                @foreach ($errors->all() as $error)
-      </div>
+                    <li>{{ $error }}</li>
+                @endforeach
+            </ul>
+        </div>
     @endif
-  </div>
 
-  <div class="row mb-3">
+    {{-- 管轄印刷エリアID（編集時のみ表示） --}}
-    <label class="col-md-2 col-form-label">
+    <div class="row mb-3">
-      {{ __('validation.attributes.print_area_name') }}
-      @if(!$isInfo)<span class="text-danger">*</span>@endif
-    </label>
-    <div class="col-md-10">
-      <input type="text" name="print_area_name" class="form-control"
-             value="{{ old('print_area_name', $record->print_area_name ?? '') }}"
-             placeholder="{{ __('validation.attributes.print_area_name') }}"
-             @if($isInfo) readonly @endif>
-    </div>
-  </div>
-
-  <div class="row mb-3">
-    <label class="col-md-2 col-form-label">
-      {{ __('validation.attributes.park_name') }}
-      @if(!$isInfo)<span class="text-danger">*</span>@endif
-    </label>
-    <div class="col-md-10">
-      <select name="park_id" class="form-control" @if($isInfo) disabled @endif>
-        <option value="">{{ __('validation.attributes.park_name') }}</option>
-        @foreach($parks as $key => $val)
-          <option value="{{ $key }}" @if(($record->park_id ?? '') == $key) selected @endif>{{ $val }}</option>
-        @endforeach
-      </select>
-    </div>
-  </div>
-
-  {{-- 下部登録ボタン --}}
-  <div class="text-left mt-4">
-    @if($isInfo)
-      {{-- 詳細モード（info）では、編集ボタンを表示 --}}
-      <a href="{{ route('print_areas_add') }}" class="btn btn-lg btn-success">{{ __('登録') }}</a>
-      <a href="{{ route('print_areas_edit', ['id' => $record->print_area_id]) }}" class="btn btn-danger px-5">{{ __('編集') }}</a>
-    @else
-      {{-- 登録 or 更新 --}}
-      <button type="submit" class="btn btn-lg btn-success">
-        {{ $isEdit ? '登録' : '登録' }}
-      </button>
-
-      {{-- 削除ボタン --}}
       @if($isEdit)
-        <a href="{{ route('print_areas_delete', ['id' => $record->print_area_id]) }}"
+        <label class="col-md-2 col-form-label">{{ __('validation.attributes.print_area_id') }}</label>
-          class="btn btn-lg btn-danger ml-3"
+        <div class="col-md-10">
-          onclick="return confirm('削除してよろしいですか？')">
+          <input type="text" class="form-control" value="{{ $record->print_area_id ?? '' }}" readonly>
-          削除
+        </div>
-        </a>
       @endif
-    @endif
+    </div>
-  </div>
 
+    {{-- 管轄印刷エリア名 --}}
+    <div class="row mb-3">
+      <label class="col-md-2 col-form-label">
+        {{ __('validation.attributes.print_area_name') }}
+        <span class="text-danger">*</span>
+      </label>
+      <div class="col-md-10">
+        <input type="text" name="print_area_name" class="form-control"
+              value="{{ old('print_area_name', $record->print_area_name ?? '') }}"
+              placeholder="{{ __('validation.attributes.print_area_name') }}">
+      </div>
+    </div>
+
+    {{-- 駐輪場 --}}
+    <div class="row mb-3">
+      <label class="col-md-2 col-form-label">
+        {{ __('validation.attributes.park_name') }}
+        <span class="text-danger">*</span>
+      </label>
+      <div class="col-md-10">
+        <select name="park_id" class="form-control">
+          <option value="">{{ __('validation.attributes.park_name') }}</option>
+          @foreach($parks as $key => $val)
+            <option value="{{ $key }}" @if(($record->park_id ?? '') == $key) selected @endif>{{ $val }}</option>
+          @endforeach
+        </select>
+      </div>
+    </div>
+
+    {{-- ▼ 下部ボタン --}}
+    <div class="col-3"></div>
+    <div class="form-group col-9 d-flex align-items-center gap-2 mt-4">
+      {{-- 登録ボタン --}}
+      @if($isEdit)
+        <button type="submit" id="register_edit" class="btn btn-lg btn-success mr-2">
+          {{ __('登録') }}
+        </button>
+      @else
+        <button type="submit" id="register" class="btn btn-lg btn-success mr-2 register">
+          {{ __('登録') }}
+        </button>
+      @endif
+      
+      {{-- 削除ボタン（編集時のみ表示） --}}
+      @if($isEdit && !empty($record->print_area_id))
+        <button type="button" id="delete_edit" class="btn btn-lg btn-danger">
+          {{ __('削除') }}
+        </button>
+      @endif
+    </div>
+  </div>        
 </div>

resources/views/admin/print_areas/add.blade.php

@@ -24,10 +24,8 @@
   
     <form action="{{ route('print_areas_add') }}" method="POST" id="form_main">
       @csrf
-      @include('admin.print_areas._form', ['isEdit' => 0, 'isInfo' => 0])
+      @include('admin.print_areas._form', ['isEdit' => false])
-
+    </form>    
-    </form>
-    
   </div>
 </section>
 

resources/views/admin/print_areas/edit.blade.php

@@ -1,15 +1,14 @@
 @extends('layouts.app')
-@section('title', '[東京都|〇〇駐輪場] シール印刷範囲 編集')
+@section('title', '編集')
 
 @section('content')
-<!-- Content Header -->
 <div class="content-header">
   <div class="container-fluid">
     <div class="row mb-2">
-      <div class="col-lg-6">
+      <div class="col-sm-6">
         <h1 class="m-0 text-dark">編集</h1>
       </div>
-      <div class="col-lg-6">
+      <div class="col-sm-6">
         <ol class="breadcrumb float-sm-right text-sm">
           <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
           <li class="breadcrumb-item"><a href="{{ route('print_areas') }}">シール印刷範囲マスタ</a></li>
@@ -22,15 +21,20 @@
 
 <section class="content">
   <div class="container-fluid">
-    <form method="POST" action="{{ route('print_areas_edit', ['id' => $record->print_area_id]) }}">
+    {{-- 編集フォーム --}}
-      @csrf
+    <form id="form_edit" action="{{ route('print_areas_edit', ['id' => $record->print_area_id]) }}" method="POST">
+        @csrf
+        @include('admin.print_areas._form', [
+            'record' => $record,
+            'parks'  => $parks,
+            'isEdit' => true
+        ])
+    </form>
 
-      @include('admin.print_areas._form', [
+    {{-- 削除フォーム --}}
-        'record' => $record,
+    <form id="form_delete" action="{{ route('print_areas_delete') }}" method="POST" style="display:none;">
-        'parks' => $parks,
+        @csrf
-        'isEdit' => 1,
+        <input type="hidden" name="pk" value="{{ $record->print_area_id }}">
-        'isInfo' => 0
-      ])
     </form>
   </div>
 </section>

resources/views/admin/print_areas/info.blade.php

@@ -1,30 +0,0 @@
-@extends('layouts.app')
-@section('title', '詳細表示')
-
-@section('content')
-<div class="content-header">
-  <div class="container-fluid">
-    <div class="row mb-2">
-      <div class="col-sm-6">
-        <h1 class="m-0 text-dark">シール印刷範囲マスタ - 詳細表示</h1>
-      </div>
-      <div class="col-sm-6">
-        <ol class="breadcrumb float-sm-right text-sm">
-          <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
-          <li class="breadcrumb-item"><a href="{{ route('print_areas') }}">シール印刷範囲マスタ</a></li>
-          <li class="breadcrumb-item active">詳細表示</li>
-        </ol>
-      </div>
-    </div>
-  </div>
-</div>
-
-<section class="content">
-  <div class="container-fluid">
-    <form method="POST" action="{{ route('print_areas_info', ['id' => $record->print_area_id]) }}">
-      @csrf
-      @include('admin.print_areas._form', ['isEdit' => 0, 'isInfo' => 1])
-    </form>
-  </div>
-</section>
-@endsection

resources/views/admin/print_areas/list.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title', '[東京都|〇〇駐輪場] シール印刷範囲マスタ')
+@section('title', 'シール印刷範囲マスタ')
 
 @section('content')
 <!-- Content Header -->
@@ -58,10 +58,10 @@
                 <form action="{{ route('print_areas_delete') }}" method="POST" id="form_delete">
                     @csrf
                     <table class="table table-bordered dataTable text-nowrap">
-                        <thead>
+                        <thead class="thead-light">
                             <tr>
                                 {{-- チェック + 編集ボタン --}}
-                                <th style="width:140px;" class="text-left">
+                                <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=='print_area_id') ? ($sort_type=='asc'?'sorting_asc':'sorting_desc') : '' }}" sort="print_area_id"><span>印刷範囲ID</span></th>

resources/views/admin/terms/_form.blade.php

@@ -42,7 +42,7 @@
                     <select name="city_id" class="form-control form-control-lg">
                         <option value="">{{ __('都市を選択') }}</option>
                         @foreach($cities as $id => $city_name)
-                            <option value="{{ $id }}" {{ old('city_id', $term->city_id ?? '') == $id ? 'selected' : '' }}>
+                            <option value="{{ $id }}" {{ (string)old('city_id', $term->city_id ?? '') === (string)$id ? 'selected' : '' }}>
                                 {{ $city_name }}
                             </option>
                         @endforeach
@@ -55,15 +55,17 @@
                 <label>{{ __('使用中') }}</label>
             </div>
             <div class="form-group col-9 pt-2">
-                <div class="form-check form-check-inline">
+                <div class="row">
-                    <input class="form-check-input" type="radio" name="use_flag" value="1"
+                    <div class="col-2 offset-1 form-check">
-                           {{ ($term->use_flag ?? '') == 1 ? 'checked' : '' }}>
+                        <input class="form-check-input" type="radio" name="use_flag" value="1"
-                    <label class="form-check-label">{{ __('使用中') }}</label>
+                               {{ ($term->use_flag ?? '') == 1 ? 'checked' : '' }}>
-                </div>
+                        <label class="form-check-label">{{ __('使用中') }}</label>
-                <div class="form-check form-check-inline">
+                    </div>
-                    <input class="form-check-input" type="radio" name="use_flag" value="0"
+                    <div class="col-4 form-check">
-                           {{ ($term->use_flag ?? '') == 0 ? 'checked' : '' }}>
+                        <input class="form-check-input" type="radio" name="use_flag" value="0"
-                    <label class="form-check-label">{{ __('過去のバージョン') }}</label>
+                               {{ ($term->use_flag ?? '') == 0 ? 'checked' : '' }}>
+                        <label class="form-check-label">{{ __('過去のバージョン') }}</label>
+                    </div>
                 </div>
             </div>
 
@@ -115,16 +117,14 @@
 
         
             {{-- ▼ 下部ボタン --}}
-            <div class="form-group col-12 d-flex gap-2 mt-4">
+            <div class="col-3"></div>
-                
+            <div class="form-group col-9 d-flex align-items-center gap-2 mt-4">
                 {{-- 登録ボタン --}}
                 @if($isEdit)
-                    {{-- 編集画面用 --}}
                     <button type="button" id="register_edit" class="btn btn-lg btn-success mr-2">
                         {{ __('登録') }}
                     </button>
                 @else
-                    {{-- 新規画面用 --}}
                     <button type="button" id="register" class="btn btn-lg btn-success mr-2 register">
                         {{ __('登録') }}
                     </button>
@@ -137,8 +137,6 @@
                     </button>
                 @endif
             </div>
-
-
         </div>
     </div>
 </div>

resources/views/admin/terms/add.blade.php

@@ -11,7 +11,7 @@
       <div class="col-sm-6">
         <ol class="breadcrumb float-sm-right text-sm">
           <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
-          <li class="breadcrumb-item"><a href="{{ route('terms') }}">利用契約マスタ</a></li>
+          <li class="breadcrumb-item"><a href="{{ route('terms') }}">利用規約マスタ</a></li>
           <li class="breadcrumb-item active">新規登録</li>
         </ol>
       </div>

resources/views/admin/terms/edit.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title', '利用契約 編集')
+@section('title', '編集')
 
 @section('content')
 <div class="content-header">
@@ -11,7 +11,7 @@
       <div class="col-sm-6">
         <ol class="breadcrumb float-sm-right text-sm">
           <li class="breadcrumb-item"><a href="{{ route('home') }}">ホーム</a></li>
-          <li class="breadcrumb-item"><a href="{{ route('terms') }}">利用契約マスタ</a></li>
+          <li class="breadcrumb-item"><a href="{{ route('terms') }}">利用規約マスタ</a></li>
           <li class="breadcrumb-item active">編集</li>
         </ol>
       </div>
@@ -31,9 +31,7 @@
         @csrf
         <input type="hidden" name="pk" value="{{ $term->terms_id }}">
     </form>
-
+    
-
-
   </div>
 </section>
 

resources/views/admin/terms/info.blade.php

@@ -1,36 +0,0 @@
-@extends('layouts.app')
-@section('title', '[東京都|〇〇駐輪場] 利用契約マスタ - 詳細')
-
-@section('content')
-<!-- Content Header -->
-<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>
-      </div>
-      <div class="col-lg-6">
-        <ol class="breadcrumb float-sm-right text-sm">
-          <li class="breadcrumb-item"><a href="{{ route('home') }}">XX様info(ホーム)</a></li>
-          <li class="breadcrumb-item"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li>
-          <li class="breadcrumb-item"><a href="{{ route('terms') }}">利用契約マスタ</a></li>
-          <li class="breadcrumb-item active">詳細</li>
-        </ol>
-      </div>
-    </div>
-  </div>
-</div>
-
-<section class="content">
-  <div class="container-fluid">
-    <form>
-      @include('admin.terms._form', [
-        'term' => $term,
-        'cities' => $cities,
-        'isEdit' => false,
-        'isInfo' => true
-      ])
-    </form>
-  </div>
-</section>
-@endsection

resources/views/admin/terms/list.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts.app')
-@section('title', '利用契約マスタ')
+@section('title', '利用規約マスタ')
 
 @section('content')
 <!-- Content Header -->
@@ -7,13 +7,13 @@
     <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"><a href="javascript:void(0);">[東京都|〇〇駐輪場]</a></li> -->
-                    <li class="breadcrumb-item active">利用契約マスタ</li>
+                    <li class="breadcrumb-item active">利用規約マスタ</li>
                 </ol>
             </div>
         </div>

resources/views/layouts/app.blade.php

@@ -507,7 +507,7 @@
                                 </li>
                                 <li class="nav-item"><a href="{{ route('terms') }}" class="nav-link @if($current === 'terms') active @endif">
                                     <i class="fa fa-circle-o nav-icon"></i>
-                                    <p>{{ __("利用契約マスタ") }}</p></a>
+                                    <p>{{ __("利用規約マスタ") }}</p></a>
                                 </li>
                                 <li class="nav-item"><a href="{{ route('jurisdiction_parkings') }}" class="nav-link @if($current === 'jurisdiction_parkings') active @endif">
                                     <i class="fa fa-circle-o nav-icon"></i>