Alexander Musikhin 23 часов назад
Родитель
Сommit
2cb78c2c0d
2 измененных файлов с 8 добавлено и 8 удалено
  1. 3 3
      resources/views/layouts/menu.blade.php
  2. 5 5
      resources/views/orders/show.blade.php

+ 3 - 3
resources/views/layouts/menu.blade.php

@@ -27,8 +27,8 @@
                                 href="{{ route('maf_order.index', session('gp_maf_order')) }}">Заказы МАФ</a></li>
     @endif
     @if(auth()->user()?->role === \App\Models\Role::ASSISTANT_HEAD)
-        {{-- <li class="nav-item"><a class="nav-link @if($active == 'contractors') active @endif"
-                                href="{{ route('contractors.index', session('gp_contractors')) }}">Подрядчики</a></li> --}}
+        <li class="nav-item"><a class="nav-link @if($active == 'contractors') active @endif"
+                                href="{{ route('contractors.index', session('gp_contractors')) }}">Подрядчики</a></li>
     @endif
     @if(auth()->user()?->role === \App\Models\Role::ADMIN)
         <li class="nav-item dropdown">
@@ -37,7 +37,7 @@
                 Администрирование
             </a>
             <ul class="dropdown-menu dropdown-menu-end">
-                {{-- <li class="dropdown-item"><a class="nav-link" href="{{ route('contractors.index', session('gp_contractors')) }}">Подрядчики</a></li> --}}
+                <li class="dropdown-item"><a class="nav-link" href="{{ route('contractors.index', session('gp_contractors')) }}">Подрядчики</a></li>
                 <li class="dropdown-item"><a class="nav-link" href="{{ route('contract.index', session('gp_contracts')) }}">Договоры</a></li>
                 <li class="dropdown-item"><a class="nav-link" href="{{ route('user.index', session('gp_users')) }}">Пользователи</a></li>
                 <li class="dropdown-item"><a class="nav-link" href="{{ route('admin.settings.index') }}">Настройки</a></li>

+ 5 - 5
resources/views/orders/show.blade.php

@@ -341,7 +341,7 @@
                                 <a href="#" class="btn btn-primary btn-sm mb-1" id="ttnBtn">ТН</a>
                             @endif
                             @if(hasRole('admin,assistant_head'))
-                                {{-- <a href="#" class="btn btn-primary btn-sm mb-1" id="contractorSpecificationBtn">Спецификация</a> --}}
+                                <a href="#" class="btn btn-primary btn-sm mb-1" id="contractorSpecificationBtn">Спецификация</a>
                             @endif
                                 <br class="d-md-none">
 
@@ -618,14 +618,14 @@
                 }
             });
 
-            {{-- $('#contractorSpecificationBtn').on('click', function () {
+            $('#contractorSpecificationBtn').on('click', function () {
                 if ($('input.check-maf:checkbox:checked').length > 0) {
                     let modal = new bootstrap.Modal(document.getElementById("contractorSpecificationModal"), {});
                     modal.show();
                 } else {
                     customAlert('Выберите хотя бы один МАФ');
                 }
-            }); --}}
+            });
 
             $('#work_start_date').on('change', function () {
                 if (!$(this).val()) {
@@ -637,7 +637,7 @@
                 $('#work_end_date').val(date.toISOString().slice(0, 10));
             });
 
-            {{-- $('#createContractorSpecification').on('click', function () {
+            $('#createContractorSpecification').on('click', function () {
                 const form = document.getElementById('contractorSpecificationForm');
                 if (!form.reportValidity()) {
                     return;
@@ -657,7 +657,7 @@
                 } else {
                     customAlert('Выберите хотя бы один МАФ');
                 }
-            }); --}}
+            });
         @endif
 
         $('.update-once').on('focus', function () {