From 95f3364718deafcc52bf85ccd07e7c1ebff21f38 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 3 Sep 2024 12:36:25 +0300
Subject: [PATCH] =?utf8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?utf8?q?=D0=BF=D0=BE=D0=BB=D0=B5=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0?=
 =?utf8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE=D1=82=D1=80=D1=83=D0=B4?=
 =?utf8?q?=D0=BD=D0=B8=D0=BA=D0=B0=20=D0=B2=20=D0=BF=D0=BE=D0=B8=D1=81?=
 =?utf8?q?=D0=BA=D0=BE=D0=B2=D0=BE=D0=B9=20=D1=84=D0=BE=D1=80=D0=BC=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/views/cabinet/_search_form.php | 14 ++++++++++++++
 erp24/views/cabinet/index.php        | 22 +++++-----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/erp24/views/cabinet/_search_form.php b/erp24/views/cabinet/_search_form.php
index 141e971b..5bd9441f 100755
--- a/erp24/views/cabinet/_search_form.php
+++ b/erp24/views/cabinet/_search_form.php
@@ -26,6 +26,20 @@ $searchForm = \yii\widgets\ActiveForm::begin([
         }
         ?>
     </table>
+
+    <div class="d-flex align-items-center justify-content-center gap-2">
+        <div class="mb-3">Сотрудник:</div>
+        <div style="display:inline-block">
+            <?= $searchForm->field($daysSearchForm, 'employee_id')->widget(\kartik\select2\Select2::class, [
+                'data' => ArrayHelper::map($adminFlorist, 'id', 'name_full'),
+                'language' => 'ru',
+                'options' => ['placeholder' => 'Сотрудник...'],
+                'pluginOptions' => [
+                    'allowClear' => true
+                ],
+            ])->label(false) ?>
+        </div>
+    </div>
     <div class="row mb-3">
         <div class="col-lg-2">
             <?= $searchForm->field($daysSearchForm, 'dateFrom', [
diff --git a/erp24/views/cabinet/index.php b/erp24/views/cabinet/index.php
index 5ae8ed89..afec97ca 100755
--- a/erp24/views/cabinet/index.php
+++ b/erp24/views/cabinet/index.php
@@ -76,23 +76,11 @@ $this->registerJsFile('/js/dashboard/index.js', ['position' => \yii\web\View::PO
         'validationUrl' => 'validate',
         'options' => ['enctype' => 'multipart/form-data']
     ]); ?>
-    <!--<table>
-        <?/*= Html::dropDownList('employee_id', $employeeSelect['id'] ?? '',
-            ArrayHelper::map($adminFlorist, 'id', 'name_full')) */?>
-    </table>-->
-    <div class="d-flex align-items-center justify-content-center gap-2">
-        <div class="mb-3">Сотрудник:</div>
-        <div style="display:inline-block">
-            <?= $searchForm->field($daysSearchForm, 'employee_id')->widget(\kartik\select2\Select2::class, [
-                'data' => ArrayHelper::map($adminFlorist, 'id', 'name_full'),
-                'language' => 'ru',
-                'options' => ['placeholder' => 'Сотрудник...'],
-                'pluginOptions' => [
-                    'allowClear' => true
-                ],
-            ])->label(false) ?>
-        </div>
-    </div>
+    <table>
+        <?= Html::dropDownList('employee_id', $employeeSelect['id'] ?? '',
+            ArrayHelper::map($adminFlorist, 'id', 'name_full')) ?>
+    </table>
+
 
     <div class="row mb-3">
         <div class="col-lg-2">
-- 
2.39.5