ERP-360 Сборка страницы автопм

diff --git a/erp24/views/auto-plannogramma/index.php b/erp24/views/auto-plannogramma/index.php
index 797bfca4b911dd38db8fa4f92a6217aede43a6ba..abccadb6562a559b3bf04c7cd677979b063e50b1 100644 (file)
--- a/erp24/views/auto-plannogramma/index.php
+++ b/erp24/views/auto-plannogramma/index.php
@@ -174,7 +174,8 @@ $this->registerJsFile('/js/autoplannogramma/autoplannogramma.js', ['position' =>
             <thead>
             <tr class="head">
                 <th scope="col" class="info-column">
-                    <?= Html::label("Год: Неделя: ", null, ['class' => 'label-year-week']) ?><br>
+                    <?= Html::label("Год: ", null, ['class' => 'label-year']) ?><br>
+                    <?= Html::label("Неделя: ", null, ['class' => 'label-week']) ?><br>
                     <?= Html::label("Месяц", null, ['class' => 'label-month-range']) ?><br>
                     <?= Html::label("Тип п-ма:", null, ['class' => 'label-capacity-type']) ?><br>
                     <?= Html::label("Город:", null, ['class' => 'label-city']) ?><br>

diff --git a/erp24/web/js/autoplannogramma/autoplannogramma.js b/erp24/web/js/autoplannogramma/autoplannogramma.js
index 6f46f7e9093f2c5e3d09f261cbb349fd62baf200..cab6cf973ca3d01839b01d0f37beebdfabc19fd3 100644 (file)
--- a/erp24/web/js/autoplannogramma/autoplannogramma.js
+++ b/erp24/web/js/autoplannogramma/autoplannogramma.js
@@ -228,7 +228,8 @@ function getSelectedText(selector) {
 }
 
 function updateFilterLabels(data) {
-    $('.label-year-week').text(`год: ${data.year || ''} неделя: ${data.week || ''}`);
+    $('.label-year').text(`год: ${data.year || ''}`);
+    $('.label-week').text(`неделя: ${data.week || ''}`);
     $('.label-month-range').text(`Месяц: ${getMonthByWeek($('#week').val(), $('#year').val()) || ''}`);
     $('.month-label').text(`Месяц: ${getMonthByWeek($('#week').val(), $('#year').val()) || ''}`);
     $('.label-capacity-type').text('Тип п-ма: ' + getSelectedText('#polnogramma-type'));