[ERP-283] добавлены заготовки для фильтров

diff --git a/erp24/controllers/CategoryPlanController.php b/erp24/controllers/CategoryPlanController.php
index dbea90b99728519b1bf3cfc255149b02100c9533..012410c3c77c2066a2e8a75db02f974c489246c8 100644 (file)
--- a/erp24/controllers/CategoryPlanController.php
+++ b/erp24/controllers/CategoryPlanController.php
@@ -20,8 +20,17 @@ class CategoryPlanController extends Controller {
             'year' => date('Y'),
             'month' => date('m'),
             'store_id' => null,
+            'city_id' => null,
+            'region_id' => null,
+            'raion_id' => null,
+            'store_type_id' => null,
+            'territory_manager_id' => null,
+            'kshf_id' => null,
         ], [
-            [['year', 'month', 'store_id'], 'safe']
+            [[
+                'year', 'month', 'store_id', 'city_id', 'region_id', 'raion_id', 'store_type_id',
+                'territory_manager_id', 'kshf_id'
+            ], 'safe']
         ]);
 
         $model->load(Yii::$app->request->get());

diff --git a/erp24/views/category-plan/index.php b/erp24/views/category-plan/index.php
index a86f2dff24574d5c3524314b21849277573e4750..fb775fe69378e439e285265ae3abd80cf48233ce 100644 (file)
--- a/erp24/views/category-plan/index.php
+++ b/erp24/views/category-plan/index.php
@@ -29,37 +29,121 @@ $this->registerJsFile('/js/category-plan/index.js', ['position' => \yii\web\View
     ]) ?>
 
     <div class="row">
-        <div class="col-2">
-            <?= $form->field($model, 'year')->dropDownList($years, ['onchange' => 'this.form.submit();'])->label(false) ?>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-2">
-            <?= $form->field($model, 'month')->dropDownList(HtmlHelper::getMonthNames(), ['onchange' => 'this.form.submit();'])->label(false) ?>
-        </div>
-    </div>
+        <div class="col-6">
+            <div class="row">
+                <div class="col-4">
+                    <?= $form->field($model, 'year')->dropDownList($years, ['onchange' => 'this.form.submit();'])->label(false) ?>
+                </div>
+                <div class="col-4">
+                    <?= $form->field($model, 'city_id')->widget(Select2::class, [
+                        'data' => [0 => 'Москва', 1 => 'Нижний Новгород'],
+                        'language' => 'ru',
+                        'options' => ['placeholder' => 'Города...'],
+                        'pluginOptions' => [
+                            'allowClear' => true,
+                        ]
+                    ])->label(false) ?>
+                </div>
+                <div class="col-4">
+                    <?= $form->field($model, 'store_type_id')->widget(Select2::class, [
+                        'data' => [0 => 'оффлайн', 1 => 'онлайн'],
+                        'language' => 'ru',
+                        'options' => ['placeholder' => 'Тип магазина...'],
+                        'pluginOptions' => [
+                            'allowClear' => true,
+                        ]
+                    ])->label(false) ?>
+                </div>
+            </div>
+            <?php
+            //            widget(Select2::class, [
+            //                'data' => $stores,
+            //                'language' => 'ru',
+            //                'options' => ['placeholder' => 'Магазин...'],
+            //                'pluginOptions' => [
+            //                    'allowClear' => true
+            //                ],
+            //                'pluginEvents' => [
+            //                    'change' => 'function(e) {
+            //                        $("#filter-form").get(0).submit();
+            //                    }'
+            //                ]
+            //            ])->label(false)
+            ?>
+            <div class="row mt-1">
+                <div class="col-4">
+                    <?= $form->field($model, 'month')->dropDownList(HtmlHelper::getMonthNames(), ['onchange' => 'this.form.submit();'])->label(false) ?>
+                </div>
+                <div class="col-4">
+                    <?= $form->field($model, 'region_id')->widget(Select2::class, [
+                        'data' => [0 => 'Московская обл.', 1 => 'Нижегородская обл.'],
+                        'language' => 'ru',
+                        'options' => ['placeholder' => 'Регион...'],
+                        'pluginOptions' => [
+                            'allowClear' => true,
+                        ]
+                    ])->label(false) ?>
+                </div>
+                <div class="col-4">
+                    <?= $form->field($model, 'territory_manager_id')->widget(Select2::class, [
+                        'data' => [0 => 'Маша', 1 => 'Миша'],
+                        'language' => 'ru',
+                        'options' => ['placeholder' => 'Тер. Управляющий...'],
+                        'pluginOptions' => [
+                            'allowClear' => true,
+                        ]
+                    ])->label(false) ?>
+                </div>
+            </div>
 
-    <div class="row">
-        <div class="col-2">
-            <?= $form->field($model, 'store_id')->widget(Select2::class, [
-                'data' => $stores,
-                'language' => 'ru',
-                'options' => ['placeholder' => 'Магазин...'],
-                'pluginOptions' => [
-                    'allowClear' => true
-                ],
-                'pluginEvents' => [
-                    'change' => 'function(e) {
-                        $("#filter-form").get(0).submit();
-                    }'
-                ]
-            ])->label(false) ?>
+            <div class="row mt-2">
+                <div class="col-4">
+                </div>
+                <div class="col-4">
+                    <?= $form->field($model, 'raion_id')->widget(Select2::class, [
+                        'data' => [0 => 'Автозаводский', 1 => 'Канавинский'],
+                        'language' => 'ru',
+                        'options' => ['placeholder' => 'Район...'],
+                        'pluginOptions' => [
+                            'allowClear' => true,
+                        ]
+                    ])->label(false) ?>
+                </div>
+                <div class="col-4">
+                    <?= $form->field($model, 'kshf_id')->widget(Select2::class, [
+                        'data' => [0 => 'Маша', 1 => 'Миша'],
+                        'language' => 'ru',
+                        'options' => ['placeholder' => 'кШФ...'],
+                        'pluginOptions' => [
+                            'allowClear' => true,
+                        ]
+                    ])->label(false) ?>
+                </div>
+            </div>
+        </div>
+        <div class="col-4">
+            <div class="row">
+                <div class="col-12">
+                    <?= $form->field($model, 'store_id')->dropDownList($stores, [
+                        'multiple' => false,
+                        'size' => 6,
+                        'class' => 'form-control',
+                        'id' => 'selected-store',
+                        'onchange' => 'this.form.submit()',
+                        'style'=> 'overflow-y: scroll, height: auto; max-height: 200px;  overflow-x: hidden;',
+                    ])->label(false) ?>
+                </div>
+            </div>
         </div>
     </div>
-
     <?php ActiveForm::end() ?>
 
     <?php if (isset($model->store_id)): ?>
+        <div class="row">
+            <div class="col-4">
+                <h1><?= $stores[$model->store_id]?></h1>
+            </div>
+        </div>
         <div class="table-responsive" style="max-width: 1285px;">
             <table id="categoryPlan">
                 <?php