From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 17 Jun 2025 11:30:33 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/feature_zozirova_erp-360_autoplannogramma_build... 
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=cccadac2350c94e7800d8a32d4343c8dc316385c;p=erp24_rep%2Fyii-erp24%2F.git

Merge remote-tracking branch 'origin/feature_zozirova_erp-360_autoplannogramma_build' into feature_zozirova_erp-360_autoplannogramma_build

# Conflicts:
#	erp24/controllers/AutoPlannogrammaController.php
#	erp24/web/js/autoplannogramma/autoplannogramma.js
---

cccadac2350c94e7800d8a32d4343c8dc316385c
diff --cc erp24/web/js/autoplannogramma/autoplannogramma.js
index 481b2851,53264c6c..6f990e8d
--- a/erp24/web/js/autoplannogramma/autoplannogramma.js
+++ b/erp24/web/js/autoplannogramma/autoplannogramma.js
@@@ -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');
  });