|
|
@@ -12,6 +12,7 @@ use App\Models\Order;
|
|
|
use App\Models\Reclamation;
|
|
|
use App\Models\ReclamationDetail;
|
|
|
use App\Models\ReclamationStatus;
|
|
|
+use App\Models\ReclamationView;
|
|
|
use App\Models\Role;
|
|
|
use App\Models\User;
|
|
|
use App\Services\FileService;
|
|
|
@@ -27,16 +28,16 @@ class ReclamationController extends Controller
|
|
|
'id' => 'reclamations',
|
|
|
'header' => [
|
|
|
'id' => 'ID',
|
|
|
- 'user_id' => 'Менеджер',
|
|
|
- 'status_id' => 'Статус',
|
|
|
- 'order-district_id' => 'Округ',
|
|
|
- 'order-area_id' => 'Район',
|
|
|
- 'order-object_address' => 'Адрес объекта',
|
|
|
+ 'user_name' => 'Менеджер',
|
|
|
+ 'status_name' => 'Статус',
|
|
|
+ 'district_name' => 'Округ',
|
|
|
+ 'area_name' => 'Район',
|
|
|
+ 'object_address' => 'Адрес объекта',
|
|
|
'create_date' => 'Дата создания',
|
|
|
'finish_date' => 'Дата завершения',
|
|
|
'start_work_date' => 'Дата начала работ',
|
|
|
'work_days' => 'Срок работ, дней',
|
|
|
- 'brigadier_id' => 'Бригадир',
|
|
|
+ 'brigadier_name' => 'Бригадир',
|
|
|
'reason' => 'Причина',
|
|
|
'guarantee' => 'Гарантии',
|
|
|
'whats_done' => 'Что сделано',
|
|
|
@@ -60,9 +61,9 @@ class ReclamationController extends Controller
|
|
|
public function index(Request $request)
|
|
|
{
|
|
|
session(['gp_reclamations' => $request->all()]);
|
|
|
- $model = new Reclamation();
|
|
|
+ $model = new ReclamationView();
|
|
|
// fill filters
|
|
|
- $this->createFilters($model, 'user_id', 'status_id');
|
|
|
+ $this->createFilters($model, 'user_name', 'status_name');
|
|
|
$this->createDateFilters($model, 'create_date', 'finish_date');
|
|
|
|
|
|
$q = $model::query();
|