From 518551158bc2fd4ea27adfcd103037405c6c8130 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 17 Jun 2025 10:56:26 +0300 Subject: [PATCH] =?utf8?q?ERP-360=20=D0=A1=D0=B1=D0=BE=D1=80=D0=BA=D0=B0?= =?utf8?q?=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B=20=D0=B0?= =?utf8?q?=D0=B2=D1=82=D0=BE=D0=BF=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../js/autoplannogramma/autoplannogramma.js | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/erp24/web/js/autoplannogramma/autoplannogramma.js b/erp24/web/js/autoplannogramma/autoplannogramma.js index 725ae3dd..25a22b28 100644 --- a/erp24/web/js/autoplannogramma/autoplannogramma.js +++ b/erp24/web/js/autoplannogramma/autoplannogramma.js @@ -57,7 +57,7 @@ $('.subcategory .list-group-item').on('click', function (e) { const subcategory = $link.data('subcategory'); const $row = $link.closest('tr'); const filters = getFilterData(); - filters['month'] = getMonthByWeek(filters['week'], filters['year'], true) + filters['month'] = getMonthByWeek(filters['week'], filters['year'], true); filters.category = category; filters.subcategory = subcategory; @@ -70,6 +70,23 @@ $('.subcategory .list-group-item').on('click', function (e) { alert('Нет планограммы для выбранного периода'); } + // Функция генерации текста для title + function generateTitleString(titleObj) { + if (!titleObj || typeof titleObj !== 'object') return ''; + let parts = []; + + for (const [type, groups] of Object.entries(titleObj)) { + if (typeof groups !== 'object') continue; + let groupParts = []; + for (const [group, value] of Object.entries(groups)) { + groupParts.push(`${group}: ${value}`); + } + parts.push(`${type} — ${groupParts.join(', ')}`); + } + + return parts.join(' | '); + } + response.forEach(item => { const tr = $(''); @@ -87,7 +104,8 @@ $('.subcategory .list-group-item').on('click', function (e) { val.store_id, { quantity: val.quantity, - id: val.id + id: val.id, + title: val.title || {} } ])); @@ -100,7 +118,8 @@ $('.subcategory .list-group-item').on('click', function (e) { const isVisible = $(`table tbody tr:first td:eq(${index})`).is(':visible'); if (!isVisible) return; - const val = valuesMap[storeId] || {quantity: '', id: ''}; + const val = valuesMap[storeId] || {quantity: '', id: '', title: {}}; + const tooltipTitle = $('
').text(generateTitleString(val.title)).html(); // экранирование const td = $(` @@ -110,9 +129,9 @@ $('.subcategory .list-group-item').on('click', function (e) { data-id="${val.id}" data-guid="${item.product_id}" data-store_id="${storeId}" + title="${tooltipTitle}" data-bs-toggle="tooltip" data-bs-placement="top" - data-original-value="${val.quantity}" - > + data-original-value="${val.quantity}">