|
@@ -15,18 +15,13 @@ class MafOrderController extends Controller
|
|
|
'header' => [
|
|
'header' => [
|
|
|
'id' => 'ID',
|
|
'id' => 'ID',
|
|
|
'order_number' => '№ заказа',
|
|
'order_number' => '№ заказа',
|
|
|
- 'user-name' => 'Менеджер',
|
|
|
|
|
|
|
+ 'user_id' => 'Менеджер',
|
|
|
'product-article' => 'Артикул',
|
|
'product-article' => 'Артикул',
|
|
|
'product-nomenclature_number' => 'Номер номенклатуры',
|
|
'product-nomenclature_number' => 'Номер номенклатуры',
|
|
|
'product-common_name' => 'МАФ',
|
|
'product-common_name' => 'МАФ',
|
|
|
'quantity' => 'Заказано',
|
|
'quantity' => 'Заказано',
|
|
|
'in_stock' => 'Остаток',
|
|
'in_stock' => 'Остаток',
|
|
|
'created_at' => 'Дата создания',
|
|
'created_at' => 'Дата создания',
|
|
|
-//
|
|
|
|
|
-// 'product-name_tz' => 'Наименование ТЗ',
|
|
|
|
|
-// 'product-type_tz' => 'Тип по ТЗ',
|
|
|
|
|
-// 'product-type' => 'Тип',
|
|
|
|
|
-// 'product-manufacturer_name' => 'Наименование производителя',
|
|
|
|
|
|
|
|
|
|
],
|
|
],
|
|
|
'searchFields' => [
|
|
'searchFields' => [
|
|
@@ -41,6 +36,8 @@ class MafOrderController extends Controller
|
|
|
$model = new MafOrder;
|
|
$model = new MafOrder;
|
|
|
|
|
|
|
|
$this->createDateFilters($model, 'created_at');
|
|
$this->createDateFilters($model, 'created_at');
|
|
|
|
|
+ $this->createFilters($model, 'user_id', 'quantity');
|
|
|
|
|
+ $this->createRangeFilters($model, 'in_stock', 'quantity');
|
|
|
|
|
|
|
|
$q = $model::query();
|
|
$q = $model::query();
|
|
|
|
|
|