From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 10 Sep 2025 06:32:32 +0000 (+0300)
Subject: Оформление
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=f84ee93d315561df6d3c938b7a8492acc1b01a5f;p=erp24_rep%2Fyii-erp24%2F.git

Оформление
---

diff --git a/erp24/views/matrix-bouquet-actuality/index.php b/erp24/views/matrix-bouquet-actuality/index.php
index a15aee1e..935dc7a9 100644
--- a/erp24/views/matrix-bouquet-actuality/index.php
+++ b/erp24/views/matrix-bouquet-actuality/index.php
@@ -14,7 +14,7 @@ use yii_app\records\Products1cNomenclatureActuality;
 /* @var $subgroups array */
 
 
-$this->title = 'Актуализация букетов';
+$this->title = 'Каталог букетов';
 $this->params['breadcrumbs'][] = $this->title;
 $this->registerJsFile('/js/products1cNomenclatureActuality/index.js', ['position' => View::POS_END]);
 // Список месяцев-годов для выпадающих списков
@@ -62,11 +62,11 @@ foreach ($subgroups as $sg) {
     <div class="row">
 
         <!-- 1-я колонка: основные фильтры -->
-        <div class="col-6 ">
-            <div class="mb-2 fw-bold">Номенклатура</div>
+        <div class="col-4 ">
+            <div class="mb-2 fw-bold">Фильтр</div>
             <div class="row mb-3">
                 <div class="col">
-                    <div class="d-flex justify-content-between">
+                    <div class="d-flex justify-content-start">
                         <?= $formFilter->field($filter, 'group_id', ['options' => ['class' => 'w-90']])->dropDownList(
                             $groups,
                             ['prompt' => 'Категория', 'id' => 'filter-category']
@@ -82,7 +82,7 @@ foreach ($subgroups as $sg) {
             </div>
             <div class="row mb-3">
                 <div class="col">
-                    <div class="d-flex justify-content-between">
+                    <div class="d-flex justify-content-start">
                         <?= $formFilter->field($filter, 'subgroup_id', ['options' => ['class' => 'w-90']])
                             ->dropDownList(
                             $subgroupItems,
@@ -100,18 +100,14 @@ foreach ($subgroups as $sg) {
                     </div>
                 </div>
 
-                <div class="col"></div>
-            </div>
-            <div class="row">
-
 
-                <div class="col"></div>
             </div>
+
         </div>
 
         <!-- 2-я колонка: даты актуальности -->
         <div class="col-3  ps-4" style="border-left: #ccc solid 1px">
-            <div class="mb-2 fw-bold">Актуальность ассортимента</div>
+            <div class="mb-2 fw-bold">Актуальность</div>
             <div class="mb-3">
                 <div class="d-flex justify-content-between">
                     <?= $formFilter->field($filter, 'date_from', ['options' => ['class' => 'w-100']])
@@ -144,26 +140,27 @@ foreach ($subgroups as $sg) {
                     </div>
                 </div>
             </div>
+
+        </div>
+
+        <!-- 3-я колонка: поставщик/плантация + кнопка Применить -->
+        <div class="col-3 ps-4" style="border-left: #ccc solid 1px">
+            <div class="mb-2 fw-bold">Статус</div>
             <div class="mb-3">
                 <?= $formFilter->field($filter, 'onlyActive')->checkbox([
-                    'label' => 'Только активные',
+                    'label' => 'Активные',
                     'uncheck' => 0,
                     'checked' => (bool)$filter->onlyActive,
                     'id' => 'onlyActiveCheckbox'
                 ])->label(false) ?>
 
                 <?= $formFilter->field($filter, 'onlyInactive')->checkbox([
-                    'label' => 'Только неактивные',
+                    'label' => 'Неактивные',
                     'uncheck' => 0,
                     'checked' => (bool)$filter->onlyInactive,
                     'id' => 'onlyInactiveCheckbox'
                 ])->label(false) ?>
             </div>
-        </div>
-
-        <!-- 3-я колонка: поставщик/плантация + кнопка Применить -->
-        <div class="col-2 ps-4" style="border-left: #ccc solid 1px">
-            <div class="mb-2 fw-bold">Поставщики</div>
             <div class="mb-3">
                 <?= $formFilter->field($filter, 'is_archive')->checkbox([
                     'label' => 'Архивные',
@@ -173,13 +170,10 @@ foreach ($subgroups as $sg) {
                 ])->label(false) ?>
 
             </div>
-            <div class="mb-4">
-
 
-            </div>
 
         </div>
-        <div class="col-1 ps-4 d-flex justify-content-end align-items-end" >
+        <div class="col-2 ps-4 d-flex justify-content-end align-items-end" >
 
             <?= Html::submitButton('Применить', ['class' => 'btn btn-primary w-100']) ?>
 
@@ -236,7 +230,7 @@ foreach ($subgroups as $sg) {
                     $clearBtn = $actuality ? '<div class="ms-2 d-flex justify-content-center align-items-center  clear-interval-btn" data-id="' . $actuality->id . '" >
                         <i class="fa fa-times"></i>
                     </div>' : '';
-                    $inputs = '<div class="d-flex justify-content-center align-items-center">';
+                    $inputs = '<div class="d-flex justify-content-start align-items-center">';
                     $inputs .= Html::hiddenInput("actuality[$i][bouquet_id]", $product->id);
                     $inputs .= Html::hiddenInput("actuality[$i][guid]", $product->guid);
                     if ($actuality) {
@@ -281,7 +275,7 @@ foreach ($subgroups as $sg) {
                         'data-guid' => $product->id,
                         'data-name' => $product->name,
                     ]);
-                    return '<div class="d-flex justify-content-between">' . $btnArchOn . $btnArchOff . '</div>';
+                    return '<div class="d-flex justify-content-start">' . $btnArchOn . $btnArchOff . '</div>';
                 }
             ],