Расчет во всплывашке

diff --git a/erp24/controllers/AutoPlannogrammaController.php b/erp24/controllers/AutoPlannogrammaController.php
index 449272a6d63664eae95d1ab255afab683bdb4cdd..fc7531f1cf17e3cae8b1f69163314d3ec2803ccb 100644 (file)
--- a/erp24/controllers/AutoPlannogrammaController.php
+++ b/erp24/controllers/AutoPlannogrammaController.php
@@ -157,6 +157,7 @@ class AutoPlannogrammaController extends BaseController
                 'id' => $model['plan_id'],
                 'quantity' => (int)$quantity,
                 'is_modify' => (int)$model['modify'] ? true : false,
+                'is_min' =>  $filters['capacity_type'] == 'min' ? true : false,
                 'store_id' => (int)$model['store_id'],
                 'title' => !empty($model['details']) ? json_decode($model['details'], true) : null,
             ];

diff --git a/erp24/views/auto-plannogramma/index.php b/erp24/views/auto-plannogramma/index.php
index d5c4204919faad89da07ce5ffa0d14418b033975..2ac5146815d143535dfdbc0d4281a71495acdb07 100644 (file)
--- a/erp24/views/auto-plannogramma/index.php
+++ b/erp24/views/auto-plannogramma/index.php
@@ -242,7 +242,7 @@ $this->registerJsFile('/js/autoplannogramma/autoplannogramma.js', ['position' =>
 <style>
     .table {
         width: max-content;
-        table-layout: fixed;
+        /*table-layout: fixed;*/
         border-collapse: collapse;
     }
 

diff --git a/erp24/web/js/autoplannogramma/autoplannogramma.js b/erp24/web/js/autoplannogramma/autoplannogramma.js
index 538c0396570d152f76bd59b809af5417812795f4..a699101fd6515621f12981928ea271a98c06c2d0 100644 (file)
--- a/erp24/web/js/autoplannogramma/autoplannogramma.js
+++ b/erp24/web/js/autoplannogramma/autoplannogramma.js
@@ -145,7 +145,8 @@ $('.subcategory .list-group-item').on('click', function (e) {
                         quantity: val.quantity || 0,
                         id: val.id || '',
                         title: val.title || {},
-                        is_modify: val.is_modify
+                        is_modify: val.is_modify,
+                        is_min: val.is_min
                     }
                 ]) || []);
                 console.log(valuesMap);
@@ -159,7 +160,7 @@ $('.subcategory .list-group-item').on('click', function (e) {
                     if (!isVisible) return;
 
                     const val = valuesMap.get(storeId) || {quantity: 0, id: '', title: {}};
-                    const tooltipTitle = generateTitleString(val.title);
+                    const tooltipTitle = generateTitleString(val.title, val.is_min, val.is_modify);
                     const encodedTooltip = $('<div>').text(tooltipTitle).html();
                     const modifyClass = val.is_modify ? 'corrected-input-bg' : 'auto-input-bg';
                     const td = $(`
@@ -261,6 +262,9 @@ $('#autoplannogramma').on('click', '.reject-btn', function () {
     const $input = $(this).closest('td').find('input.input');
     $input.val($input.data('original-value'));
     $(this).closest('td').find('path').attr('fill', 'grey');
+    $input.removeClass('corrected-input-bg');
+    $input.addClass('auto-input-bg');
+
 });
 
 function getFilterData() {
@@ -445,10 +449,11 @@ const safeParseJson = (str) => {
     }
 };
 
-const generateTitleString = (titleRaw) => {
+const generateTitleString = (titleRaw, isMin, isModify) => {
     const titleObj = typeof titleRaw === 'string' ? safeParseJson(titleRaw) : titleRaw;
     if (!titleObj || typeof titleObj !== 'object') return '';
-
+    if (isModify) {return 'Изменено пользователем';}
+    const modificator = isMin ? 0.3 : 1;
     const typeTitles = {
         offline: 'Оффлайн',
         online: 'Онлайн',
@@ -466,7 +471,7 @@ const generateTitleString = (titleRaw) => {
             }
 
             const quantity = typeof typeValue.quantity === 'number'
-                ? parseFloat(typeValue.quantity).toFixed(2)
+                ? parseFloat(typeValue.quantity * modificator).toFixed(2)
                 : '0.00';
 
             let result = `${title}: ${quantity}`;