Ver código fonte

added name order field

Alexander Musikhin 7 meses atrás
pai
commit
3017c9d91b

+ 2 - 0
app/Http/Controllers/OrderController.php

@@ -23,6 +23,7 @@ class OrderController extends Controller
         'id'        => 'orders',
         'header'    => [
             'id'                        => 'ID',
+            'name'                      => 'Название',
             'user_id'                   => 'Менеджер',
             'district_id'               => 'Округ',
             'area_id'                   => 'Район',
@@ -39,6 +40,7 @@ class OrderController extends Controller
             'ready_to_mount'            => 'Все МАФы на складе',
         ],
         'searchFields' => [
+            'name',
             'comment',
             'object_address',
             'tg_group_name',

+ 1 - 0
app/Http/Requests/Order/StoreOrderRequest.php

@@ -23,6 +23,7 @@ class StoreOrderRequest extends FormRequest
     {
         return [
             'id'                => 'nullable|exists:orders,id',
+            'name'              => 'required|string',
             'user_id'           => 'required|exists:users,id',
             'district_id'       => 'required|exists:districts,id',
             'area_id'           => 'required|exists:areas,id',

+ 1 - 0
app/Models/Order.php

@@ -68,6 +68,7 @@ class Order extends Model
 
     protected $fillable = [
         'year',
+        'name',
         'user_id',
         'district_id',
         'area_id',

+ 1 - 0
database/migrations/2025_03_24_153700_create_orders_table.php

@@ -14,6 +14,7 @@ return new class extends Migration
         Schema::create('orders', function (Blueprint $table) {
             $table->id();
             $table->unsignedInteger('year');
+            $table->string('name');
             $table->foreignId('user_id')->constrained('users')->restrictOnDelete();                 // менеджер
             $table->foreignId('district_id')->constrained('districts')->restrictOnDelete();         // округ
             $table->foreignId('area_id')->constrained('areas')->restrictOnDelete();                 // район

+ 2 - 0
resources/views/orders/edit.blade.php

@@ -22,6 +22,8 @@
 
                 @include('partials.input', ['name' => 'object_address', 'title' => 'Адрес объекта', 'value' => $order->object_address ?? old('object_address'), 'required' => true])
 
+                @include('partials.input', ['name' => 'name', 'title' => 'Название', 'value' => $order->name ?? old('name'), 'required' => true])
+
                 @include('partials.select', ['name' => 'object_type_id', 'title' => 'Тип объекта', 'options' => $objectTypes, 'value' => $order->object_type_id ?? old('object_type_id'), 'required' => true, 'first_empty' => true])
 
                 @include('partials.textarea', ['name' => 'comment', 'title' => 'Комментарий', 'value' => $order->comment ?? old('comment')])

+ 1 - 0
resources/views/orders/show.blade.php

@@ -22,6 +22,7 @@
         <div class="row">
             <div class="col-xl-3">
                 <h4>Общая информация об объекте</h4>
+                <div>Название: {{ $order->name }}</div>
                 <div>ID площадки: {{ $order->id }}</div>
                 <div>
                     Адрес: {{ $order->common_name }}

+ 1 - 1
resources/views/partials/textarea.blade.php

@@ -4,7 +4,7 @@
         @isset($required) <sup>*</sup> @endisset
     </label>
     <div class="col-md-8">
-        <textarea type="{{ $type ?? 'text' }}" name="{{ $name }}" id="{{ $name }}" @if($size) rows="{{ $size }}" @endif
+        <textarea type="{{ $type ?? 'text' }}" name="{{ $name }}" id="{{ $name }}" @isset($size) rows="{{ $size }}" @endisset
                class="form-control @error($name) is-invalid @enderror" @disabled($disabled ?? null) @required($required ?? null)
         >{{ old($name, $value ?? '') }}</textarea>
         @error($name)