перенос js

diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php
index 5bda96d7b4d794e5b493dee060fbfddb0ad748d4..fbf95dfa454b3a890d0dcb7daf0883f37abeccdd 100644 (file)
--- a/erp24/api3/core/services/ReportService.php
+++ b/erp24/api3/core/services/ReportService.php
@@ -16,6 +16,7 @@ use yii_app\records\ExportImportTable;
 use yii_app\records\Products1c;
 use yii_app\records\ProductsClass;
 use yii_app\records\Sales;
+use yii_app\records\StoreStaffing;
 use yii_app\records\StoreVisitors;
 use yii_app\records\WriteOffs;
 use yii_app\records\WriteOffsErp;
@@ -30,7 +31,7 @@ class ReportService
      */
     private function getStoreStaffingSkillScore($storeId)
     {
-        $staffing = \yii_app\records\StoreStaffing::find()
+        $staffing = StoreStaffing::find()
             ->alias('ss')
             ->innerJoin('employee_position ep', 'ep.id = ss.employee_position_id')
             ->where(['ss.store_id' => $storeId])
@@ -167,6 +168,7 @@ class ReportService
         $admins = Admin::find()
             ->select(['id', 'employee_position_id', 'group_id'])
             ->where(['id' => $adminIds])
+            ->andWhere(['<>', 'group_id', AdminGroup::GROUP_FIRED])
             ->indexBy('id')
             ->asArray()
             ->all();

diff --git a/erp24/views/store-staffing/_form.php b/erp24/views/store-staffing/_form.php
index ff4be50178cc644a2db6286eadb810d9948a3dc4..96fd3b3be372083b13b51c0a05bc52c120ac3518 100644 (file)
--- a/erp24/views/store-staffing/_form.php
+++ b/erp24/views/store-staffing/_form.php
@@ -40,28 +40,7 @@ use yii_app\records\EmployeePosition;
 </div>
 
 <?php
-$this->registerJs(<<<JS
-    // При изменении должности обновляем грейд
-    document.getElementById('position-id').addEventListener('change', function() {
-        let positionId = this.value;
-
-        if (positionId) {
-            // Найдем информацию о должности через AJAX
-            fetch('index.php?r=store-staffing/get-position-posit&position_id=' + positionId)
-                .then(response => response.json())
-                .then(data => {
-                    document.getElementById('position-posit').textContent = data.posit || '-';
-                });
-        } else {
-            document.getElementById('position-posit').textContent = '-';
-        }
-    });
-
-    // Инициализируем при загрузке страницы
-    if (document.getElementById('position-id').value) {
-        document.getElementById('position-id').dispatchEvent(new Event('change'));
-    }
-JS
-);
+// Подключаем JavaScript файл для формы
+$this->registerJsFile('@web/js/store-staffing/form.js', ['depends' => [\yii\web\JqueryAsset::class]]);
 ?>
 

diff --git a/erp24/web/js/store-staffing/form.js b/erp24/web/js/store-staffing/form.js
index 5a587a85b2f09c575967ac6628ee3d4943847001..f12a700e67629efce02de4c47fdcffd21a9be884 100644 (file)
--- a/erp24/web/js/store-staffing/form.js
+++ b/erp24/web/js/store-staffing/form.js
@@ -32,3 +32,4 @@ $(document).ready(function() {
         $('#position-id').trigger('change');
     }
 });
+