|
|
@@ -92,9 +92,9 @@
|
|
|
<td style="background: {{ $schedule->brigadier->color }}"
|
|
|
class="align-middle code-{{ $schedule->id }}">{{ $schedule->address_code }}</td>
|
|
|
<td style="background: {{ $schedule->brigadier->color }}"
|
|
|
- class="align-middle">{{ $schedule->district->shortname }}</td>
|
|
|
+ class="align-middle">{{ $schedule?->district?->shortname }}</td>
|
|
|
<td style="background: {{ $schedule->brigadier->color }}"
|
|
|
- class="align-middle">{{ $schedule->area->name }}</td>
|
|
|
+ class="align-middle">{{ $schedule?->area?->name }}</td>
|
|
|
<td style="background: {{ $schedule->brigadier->color }}" class="align-middle">
|
|
|
@if($schedule->order_id)
|
|
|
<a href="{{ route('order.show', $schedule->order_id) }}">{{ $schedule->object_address }}</a>
|
|
|
@@ -158,12 +158,12 @@
|
|
|
<div>
|
|
|
@include('partials.input', ['name' => 'installation_date', 'title' => 'Дата монтажа', 'type' => 'date'])
|
|
|
@include('partials.input', ['name' => 'address_code', 'title' => 'Код адреса'])
|
|
|
- @include('partials.select', ['name' => 'district_id', 'title' => 'Округ', 'options' => $districts, 'first_empty' => true, 'required' => true])
|
|
|
- @include('partials.select', ['name' => 'area_id', 'title' => 'Район', 'options' => $areas, 'required' => true, 'first_empty' => true])
|
|
|
- @include('partials.input', ['name' => 'object_address', 'title' => 'Адрес'])
|
|
|
- @include('partials.input', ['name' => 'object_type', 'title' => 'Тип объекта'])
|
|
|
- @include('partials.textarea', ['name' => 'mafs', 'title' => 'МАФы'])
|
|
|
- @include('partials.input', ['name' => 'mafs_count', 'title' => 'Кол-во МАФ'])
|
|
|
+ @include('partials.select', ['name' => 'district_id', 'title' => 'Округ', 'options' => $districts, 'first_empty' => true])
|
|
|
+ @include('partials.select', ['name' => 'area_id', 'title' => 'Район', 'options' => $areas, 'first_empty' => true])
|
|
|
+ @include('partials.input', ['name' => 'object_address', 'title' => 'Адрес', 'required' => true])
|
|
|
+ @include('partials.input', ['name' => 'object_type', 'title' => 'Тип объекта', 'required' => true])
|
|
|
+ @include('partials.textarea', ['name' => 'mafs', 'title' => 'МАФы', 'required' => true])
|
|
|
+ @include('partials.input', ['name' => 'mafs_count', 'title' => 'Кол-во МАФ', 'type' => 'number', 'required' => true])
|
|
|
@include('partials.select', ['name' => 'brigadier_id', 'title' => 'Бригадир', 'options' => $brigadiers, 'required' => true, 'first_empty' => true])
|
|
|
@include('partials.textarea', ['name' => 'comment', 'title' => 'Комментарий'])
|
|
|
<div class="text-center">
|