[ERP-381] layout

diff --git a/erp24/views/bouquet/_product_edit.php b/erp24/views/bouquet/_product_edit.php
index 6134b8bddd04934516a9df189ab4224a7e3d3d29..cb80d5589837bf20e6b6784f7ce58f1e11761523 100644 (file)
--- a/erp24/views/bouquet/_product_edit.php
+++ b/erp24/views/bouquet/_product_edit.php
@@ -22,11 +22,11 @@ $this->registerCSS('.cost-value {max-width: 75px}');
 
 <div class="row">
     <div class="col-md-6 position-relative">
-        <h4>Нижегородская обл.</h4>
         <div class="pt-2 position-relative content-wrapper">
             <div class="loader-overlay d-none">
                 <div class="spinner-border text-primary" role="status"></div>
             </div>
+            <strong style="display: inline-block; font-size: 1.1rem;" class="mb-2">Нижегородская обл.</strong><br>
             <p class="mb-1"><strong>Себестоимость:</strong> <span class="selfcost-value"><?= round($selfCost ?? 0) ?></span> ₽</p>
             <p class="mb-1"><strong>Наценка:</strong> +30% / +<span class="markup-value"><?= round(0.3 * ($selfCost ?? 0)) ?></span>₽</p>
             <p class="mb-0"><strong>Цена:</strong> <input type="number" name="cost-value[52]" class="cost-value region52" value="<?= round($cost[52]) ?>"
@@ -38,11 +38,11 @@ $this->registerCSS('.cost-value {max-width: 75px}');
 
 <div class="row mt-5">
     <div class="col-md-6 position-relative">
-        <h4>Московская обл.</h4>
         <div class="pt-2 position-relative content-wrapper">
             <div class="loader-overlay d-none">
                 <div class="spinner-border text-primary" role="status"></div>
             </div>
+            <strong style="display: inline-block; font-size: 1.1rem;" class="mb-2">Московская обл.</strong><br>
             <p class="mb-1"><strong>Себестоимость:</strong> <span class="selfcost-value"><?= round($selfCost ?? 0) ?></span> ₽</p>
             <p class="mb-1"><strong>Наценка:</strong> +30% / +<span class="markup-value"><?= round(0.3 * ($selfCost ?? 0)) ?></span>₽</p>
             <p class="mb-0"><strong>Цена:</strong> <input type="number" name="cost-value[77]" class="cost-value region77" value="<?= round($cost[77]) ?>"

diff --git a/erp24/views/bouquet/index.php b/erp24/views/bouquet/index.php
index 79d634d1bdceb1759dc181469964999e8561b48f..69afdbcb48c770cb6617df938c91bb0181a1927c 100644 (file)
--- a/erp24/views/bouquet/index.php
+++ b/erp24/views/bouquet/index.php
@@ -109,17 +109,21 @@ $this->title = 'Содержание матрицы';
                                      style='height: 160px; padding: 10px; overflow-y: auto; overflow-x: hidden; max-width: 100%; word-wrap: break-word;'>
                                     {$compositionHtml}
                                 </div>
-                                <strong>Нижегородская обл.</strong>
-                                <div class='self-cost pt-3 mb-2' style='display: flex; gap: 10px;'>
+                                <div class='self-cost pt-3'>
+                                    <div><strong>Нижегородская обл.</strong></div>
+                                    <div>
                                     Себестоимость: " . round($model->getSelfCost()) . "₽<br>
                                     Наценка: +30% / +" . round(0.3 * $model->getSelfCost()) . "₽<br>
                                     Цена: " . round($model->getBouquetCost(52)) . "₽. +" . round($model->getBouquetCostMarkup(52), 2) . "%<br>
+                                    </div>
                                 </div>
-                                <strong>Московская обл.</strong>
-                                <div class='self-cost pt-3' style='display: flex; gap: 10px;'>
+                                <div class='self-cost pt-3'>
+                                    <div><strong>Московская обл.</strong></div>
+                                    <div>
                                     Себестоимость: " . round($model->getSelfCost()) . "₽<br>
                                     Наценка: +30% / +" . round(0.3 * $model->getSelfCost()) . "₽<br>
                                     Цена: " . round($model->getBouquetCost(77)) . "₽. +" . round($model->getBouquetCostMarkup(77), 2) . "%<br>
+                                    </div>
                                 </div>
                             </div>