diff --git a/resources/views/admin/seals/list.blade.php b/resources/views/admin/seals/list.blade.php index b50b4c9..721985c 100644 --- a/resources/views/admin/seals/list.blade.php +++ b/resources/views/admin/seals/list.blade.php @@ -17,7 +17,7 @@
-
+
@@ -79,64 +79,42 @@
-
- + +
+
- - - - - - + @foreach($list as $item) - + @@ -145,10 +123,30 @@ @endforeach
- - シール発行履歴ID - @if($sort === 'seal_issueid') - - @endif - + + シール発行履歴ID - - シール発行駐輪場 - @if($sort === 'park_id') - - @endif - + + シール発行駐輪場 - - 定期契約ID - @if($sort === 'contract_id') - - @endif - + + 定期契約ID 車種区分ID - - 発行日 - @if($sort === 'seal_day') - - @endif - + + 発行日 - - 発行回数 - @if($sort === 'contract_seal_issue') - - @endif - + + 発行回数 理由
{{ $item->seal_issueid }} {{ $item->park_name ?? $item->park_id }} - {{-- @if($item->contract_id) - {{ $item->contract_id }} - @endif --}} - {{ $item->contract_id }} {{ $item->psection_name ?? $item->psection_id }} {{ $item->seal_day }} {{ $item->contract_seal_issue }}
-
-
- {{ $list->appends(request()->except('page'))->links('pagination') }} -
+
+
+@push('scripts') + +@endpush +
+ {{ $list->appends(request()->except('page'))->links('pagination') }}
diff --git a/resources/views/admin/tag_issue/list.blade.php b/resources/views/admin/tag_issue/list.blade.php index ba817b0..a5aae6a 100644 --- a/resources/views/admin/tag_issue/list.blade.php +++ b/resources/views/admin/tag_issue/list.blade.php @@ -140,72 +140,38 @@
-
- - - - - - - - - - - - - - - - - - - @foreach($users as $user) +
+
+
- - キューID - @if(request('sort') === 'que_id') - - @endif - - - - タグシリアル - @if(request('sort') === 'user_tag_serial') - - @endif - - - - タグシリアル64進 - @if(request('sort') === 'user_tag_serial_64') - - @endif - - - - タグ発送ステータス - @if(request('sort') === 'user_tag_issue') - - @endif - - - - 利用者名 - @if(request('sort') === 'user_name') - - @endif - - 携帯電話番号自宅電話番号居住所:郵便番号居住所:都道府県居住所:市区郡居住所:住所
+ - - @php - $que = \App\Models\OperatorQue::where('user_id', $user->user_id)->first(); - @endphp - - - - + + + + + + + + + + + + + + + + @foreach($users as $user) + + + @php + $que = \App\Models\OperatorQue::where('user_id', $user->user_id)->first(); + @endphp + + + + - - - - - - - - @endforeach - -
- - {{ $que ? $que->que_id : '' }}{{ $user->user_tag_serial }}{{ $user->user_tag_serial_64 }}{{ $user->user_tag_issue }}キューIDタグシリアルタグシリアル64進タグ発送ステータス利用者名携帯電話番号自宅電話番号居住所:郵便番号居住所:都道府県居住所:市区郡居住所:住所
+ + {{ $que ? $que->que_id : '' }}{{ $user->user_tag_serial }}{{ $user->user_tag_serial_64 }}{{ $user->user_tag_issue }} @if(!empty($user->user_seq)) @@ -215,16 +181,17 @@ {{ $user->user_name }} @endif {{ $user->user_mobile }}{{ $user->user_homephone }}{{ $user->user_regident_zip }}{{ $user->user_regident_pre }}{{ $user->user_regident_city }}{{ $user->user_regident_add }}
+ {{ $user->user_mobile }} + {{ $user->user_homephone }} + {{ $user->user_regident_zip }} + {{ $user->user_regident_pre }} + {{ $user->user_regident_city }} + {{ $user->user_regident_add }} + + @endforeach + + +
{{ $users->appends(request()->except('page'))->links('pagination') }} @@ -276,4 +243,24 @@
+ @endsection \ No newline at end of file