From 13c085b6b6423d9a49c6c844aebe24ddf8df5688 Mon Sep 17 00:00:00 2001 From: tore Date: Mon, 21 Sep 2026 15:10:47 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=D1=81=D0=B8=D0=BD=D1=82=D0=B0=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=D1=81=20script.js=20(vfCell,=20filtered,=20unitBan?= =?UTF-8?q?ner)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/script.js b/script.js index 20f4687..2add5a0 100644 --- a/script.js +++ b/script.js @@ -248,7 +248,7 @@ function viewCheck() { } function kpi(label, value, hint) { return '
' + label + '' + value + '' + hint + '
'; } function unitBanner() { - var fixed = S.unitFixed.length === 1; + var fixed = S.unitFixed.indexOf(1) !== -1; return fixed ? '
Единицы ООО Б исправлены: выручка переведена из тысяч в миллионы тенге.
' : '
Расхождение единиц: ООО Б. В файле выручка в тысячах тенге, в шаблоне — в миллионах. Клик по ячейке выручки — исправить вручную.
'; @@ -259,6 +259,7 @@ function totalRow() { } function renderSumTable() { var box = $("sumTable"); if (!box) return; + var filtered = CO.filter(function (c, i) { return chk.company === "all" || chk.company === String(i); }); var rows = CO.map(function (c, i) { var show = chk.company === "all" || chk.company === String(i); if (!show) return ""; @@ -273,12 +274,11 @@ function renderSumTable() { var vfCell = c.name === "ООО Б" ? '' + fmt(c.vp) + ' / ' + fmt(c.vf) + ' (' + pct(dR) + '%) ' + (unitFix ? 'исправлено' : '×1 000') + '' : cell(c.vp, c.vf, dR); - return '' + esc(c.name) + '' + vf + + return '' + esc(c.name) + '' + vfCell + cell(c.ep, c.ef, dE) + cell(c.cap, c.caf, dC) + cell(c.dp, c.df, dD) + cell(c.cp, c.cf, dK) + '' + fmt(c.hp) + ' / ' + fmt(c.hf) + ''; }).join(""); - var filtered = CO.filter(function (c, i) { return chk.company === "all" || chk.company === String(i)); - var totalN = chk.company === "all" ? CO.length : 1; + var totalN = filtered.length; var tsum = filtered.map(function (c) { return { vp: c.vp, vf: c.vf, ep: c.ep, ef: c.ef, cap: c.cap, caf: c.caf, dp: c.dp, df: c.df, cp: c.cp, cf: c.cf, hp: c.hp, hf: c.hf }; }).reduce(function (a, b) { for (var k in a) a[k] += b[k]; return a; }, { vp: 0, vf: 0, ep: 0, ef: 0, cap: 0, caf: 0, dp: 0, df: 0, cp: 0, cf: 0, hp: 0, hf: 0 }); @@ -379,7 +379,10 @@ function viewResult() { '' + ''; } -function analysisTextShort(c) { return c.analysis; } +function analysisTextShort(c) { + var t = c.analysis; + return t.length > 200 ? t.slice(0, 197).replace(/\s+\S*$/, "") + "…" : t; +} /* ================= действия ================= */ function setUnitFix(i, fixed) {