]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
Merge remote-tracking branch 'origin/feature_zozirova_erp-360_autoplannogramma_build...
authorVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Tue, 17 Jun 2025 11:30:33 +0000 (14:30 +0300)
committerVladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Tue, 17 Jun 2025 11:30:33 +0000 (14:30 +0300)
# Conflicts:
# erp24/controllers/AutoPlannogrammaController.php
# erp24/web/js/autoplannogramma/autoplannogramma.js

1  2 
erp24/controllers/AutoPlannogrammaController.php
erp24/web/js/autoplannogramma/autoplannogramma.js

index 481b2851874ad829e76dfe66eeeaffdd49bdaa0e,53264c6ccb8d497dbc7672ac69b6c3a878f8ab00..6f990e8d42f300f4c61d48db84113db181a8ff37
@@@ -180,11 -194,15 +194,16 @@@ $('.category .list-group-item').on('cli
                  $span.text(`${subName} (нет данных)`);
              }
          });
-     });
-     $('.loader-overlay').addClass('d-none');
+         $('.loader-overlay').addClass('d-none');
+     })
+         .fail(() => {
+             alert('Ошибка при загрузке подкатегорий');
+             $('.loader-overlay').addClass('d-none');
+         });
  });
  
 +
  $('#autoplannogramma').on('input', '.input', function () {
      $(this).closest('td').find('path').attr('fill', 'red');
  });