fix: все CFML-ключи → lowercase в JS (v1.0.59)
This commit is contained in:
@@ -61,7 +61,7 @@
|
||||
<body>
|
||||
<div class="topbar">
|
||||
<img src="/nubes-logo.svg" alt="Nubes">
|
||||
<span class="title">Сверка договоров — LLM <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.0.58 — Lucee</span></span>
|
||||
<span class="title">Сверка договоров — LLM <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.0.59 — Lucee</span></span>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
@@ -214,8 +214,8 @@ fileInput.addEventListener('change', async function() {
|
||||
fileQueue[rowIdx].status = '↑ ' + pct + '%';
|
||||
renderTable();
|
||||
});
|
||||
if (resp && resp.CONTRACT_ID) contractId = resp.CONTRACT_ID;
|
||||
fileQueue[rowIdx].doc_id = resp.DOC_ID;
|
||||
if (resp && resp.contract_id) contractId = resp.contract_id;
|
||||
fileQueue[rowIdx].doc_id = resp.doc_id;
|
||||
fileQueue[rowIdx].status = '<span class="status-ok">✓</span>';
|
||||
fileQueue[rowIdx].uploaded = true;
|
||||
} catch(err) {
|
||||
@@ -252,8 +252,8 @@ function uploadFile(file, onProgress) {
|
||||
xhr.onload = function() {
|
||||
try {
|
||||
var r = JSON.parse(xhr.responseText);
|
||||
if (r.OK) resolve(r);
|
||||
else reject(new Error(r.ERROR || 'Неизвестная ошибка'));
|
||||
if (r.ok) resolve(r);
|
||||
else reject(new Error(r.error || 'Неизвестная ошибка'));
|
||||
} catch(e) { reject(new Error('Некорректный ответ')); }
|
||||
};
|
||||
xhr.onerror = function() { reject(new Error('Сеть')); };
|
||||
@@ -297,12 +297,12 @@ parseBtn.addEventListener('click', async function() {
|
||||
try {
|
||||
var resp = await fetch('/parser.cfm?doc_id=' + f.doc_id);
|
||||
var d = await resp.json();
|
||||
if (d.OK && d.STATUS === 'parsed') {
|
||||
if (d.ok && d.status === 'parsed') {
|
||||
f.parsed = true;
|
||||
f.parseInfo = d;
|
||||
f.status = '<span class="status-ok">✓ ' + d.ELEMENT_COUNT + ' эл.</span>';
|
||||
f.status = '<span class="status-ok">✓ ' + d.element_count + ' эл.</span>';
|
||||
} else {
|
||||
f.status = '<span class="status-err">✗ ' + (d.ERROR_COUNT > 0 ? (d.ERRORS && d.ERRORS[0] || 'ошибка') : 'ошибка') + '</span>';
|
||||
f.status = '<span class="status-err">✗ ' + (d.error_count > 0 ? (d.errors && d.errors[0] || 'ошибка') : 'ошибка') + '</span>';
|
||||
f.parseInfo = d;
|
||||
}
|
||||
} catch(e) {
|
||||
@@ -382,16 +382,16 @@ document.getElementById('llmBtn').addEventListener('click', async function() {
|
||||
try {
|
||||
var resp = await fetch('/api.cfm?action=query&sql=' + encodeURIComponent("SELECT id, type FROM supplements WHERE contract_id='" + contractId + "' ORDER BY created_at"));
|
||||
var data = await resp.json();
|
||||
if (data.OK && data.ROWS) {
|
||||
for (var i = 0; i < data.ROWS.length; i++) {
|
||||
if (data.ok && data.rows) {
|
||||
for (var i = 0; i < data.rows.length; i++) {
|
||||
try {
|
||||
var er = await fetch('/extractor.cfm?supplement_id=' + data.ROWS[i].id);
|
||||
var er = await fetch('/extractor.cfm?supplement_id=' + data.rows[i].id);
|
||||
var ed = await er.json();
|
||||
if (ed.OK) {
|
||||
var info = (ed.SKIPPED ? '⏭ ' : '✓ ') + (data.ROWS[i].type || '') + ': ' + ed.ROWS_SAVED + ' строк';
|
||||
diffBody.innerHTML += '<div style="font-size:12px;color:' + (ed.SKIPPED ? 'var(--muted)' : 'var(--green)') + ';">' + info + '</div>';
|
||||
if (ed.ok) {
|
||||
var info = (ed.skipped ? '⏭ ' : '✓ ') + (data.rows[i].type || '') + ': ' + ed.rows_saved + ' строк';
|
||||
diffBody.innerHTML += '<div style="font-size:12px;color:' + (ed.skipped ? 'var(--muted)' : 'var(--green)') + ';">' + info + '</div>';
|
||||
} else {
|
||||
diffBody.innerHTML += '<div style="font-size:12px;color:var(--destructive);">✗ ' + (ed.ERROR||'') + '</div>';
|
||||
diffBody.innerHTML += '<div style="font-size:12px;color:var(--destructive);">✗ ' + (ed.error||'') + '</div>';
|
||||
}
|
||||
} catch(e) {}
|
||||
}
|
||||
@@ -403,31 +403,31 @@ document.getElementById('llmBtn').addEventListener('click', async function() {
|
||||
try {
|
||||
var resp = await fetch('/differ.cfm?contract_id=' + contractId);
|
||||
var data = await resp.json();
|
||||
if (data.OK && data.ALL_CHANGES) {
|
||||
var all = data.ALL_CHANGES;
|
||||
if (data.ok && data.all_changes) {
|
||||
var all = data.all_changes;
|
||||
diffBody.innerHTML = '';
|
||||
all.forEach(function(ch) {
|
||||
var s = ch.SUMMARY || {};
|
||||
diffBody.innerHTML += '<div style="font-weight:600;margin-top:12px;">📄 Допник (' + ch.TYPE + ')</div>';
|
||||
diffBody.innerHTML += '<div style="font-size:12px;margin-left:8px;"><span style="color:var(--green);">+' + (s.ADDED||0) + '</span> <span style="color:#eab308;">~' + (s.CHANGED||0) + '</span> <span style="color:var(--destructive);">-' + (s.DELETED||0) + '</span></div>';
|
||||
diffStatus.textContent = 'изм:' + (s.CHANGED||0) + ' +' + (s.ADDED||0) + ' -' + (s.DELETED||0);
|
||||
var s = ch.summary || {};
|
||||
diffBody.innerHTML += '<div style="font-weight:600;margin-top:12px;">📄 Допник (' + ch.type + ')</div>';
|
||||
diffBody.innerHTML += '<div style="font-size:12px;margin-left:8px;"><span style="color:var(--green);">+' + (s.added||0) + '</span> <span style="color:#eab308;">~' + (s.changed||0) + '</span> <span style="color:var(--destructive);">-' + (s.deleted||0) + '</span></div>';
|
||||
diffStatus.textContent = 'изм:' + (s.changed||0) + ' +' + (s.added||0) + ' -' + (s.deleted||0);
|
||||
|
||||
var changes = ch.CHANGES || [];
|
||||
var changes = ch.changes || [];
|
||||
if (changes.length === 0) {
|
||||
diffBody.innerHTML += '<div style="color:var(--muted);font-size:12px;">Нет изменений</div>';
|
||||
} else {
|
||||
var tbl = '<div class="table-wrap" style="margin-top:4px;"><table><thead><tr><th>№</th><th>Услуга</th><th>Цена</th><th>Объём</th><th>Сумма</th><th>Начало</th></tr></thead><tbody>';
|
||||
changes.forEach(function(c) {
|
||||
var cls = c.CHANGE_TYPE === 'added' ? 'diff-added' : c.CHANGE_TYPE === 'deleted' ? 'diff-deleted' : c.CHANGE_TYPE === 'changed' ? 'diff-changed' : '';
|
||||
var vals = c.NEW_VALUES && Object.keys(c.NEW_VALUES).length > 0 ? c.NEW_VALUES : (c.OLD_VALUES || {});
|
||||
tbl += '<tr class="' + cls + '"><td>' + (c.ROW_NUM||'') + '</td><td>' + (vals.NAME||'') + '</td><td class="num-cell">' + _dc(c,'PRICE') + '</td><td class="num-cell">' + _dc(c,'QTY') + '</td><td class="num-cell">' + _dc(c,'SUM') + '</td><td>' + (vals.DATE_START||'') + '</td></tr>';
|
||||
var cls = c.change_type === 'added' ? 'diff-added' : c.change_type === 'deleted' ? 'diff-deleted' : c.change_type === 'changed' ? 'diff-changed' : '';
|
||||
var vals = c.new_values && Object.keys(c.new_values).length > 0 ? c.new_values : (c.old_values || {});
|
||||
tbl += '<tr class="' + cls + '"><td>' + (c.row_num||'') + '</td><td>' + (vals.name||'') + '</td><td class="num-cell">' + _dc(c,'price') + '</td><td class="num-cell">' + _dc(c,'qty') + '</td><td class="num-cell">' + _dc(c,'sum') + '</td><td>' + (vals.date_start||'') + '</td></tr>';
|
||||
});
|
||||
tbl += '</tbody></table></div>';
|
||||
diffBody.innerHTML += tbl;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
diffBody.innerHTML += '<div style="color:var(--destructive);">✗ ' + (data.ERROR||'') + '</div>';
|
||||
diffBody.innerHTML += '<div style="color:var(--destructive);">✗ ' + (data.error||'') + '</div>';
|
||||
}
|
||||
} catch(e) { diffBody.innerHTML += '<div style="color:var(--destructive);">✗ ' + e.message + '</div>'; }
|
||||
|
||||
@@ -440,12 +440,12 @@ document.getElementById('llmBtn').addEventListener('click', async function() {
|
||||
});
|
||||
|
||||
function _dc(c, field) {
|
||||
if (c.CHANGE_TYPE === 'changed' && c.OLD_VALUES && c.NEW_VALUES) {
|
||||
var ov = (c.OLD_VALUES||{})[field], nv = (c.NEW_VALUES||{})[field];
|
||||
if (c.change_type === 'changed' && c.old_values && c.new_values) {
|
||||
var ov = (c.old_values||{})[field], nv = (c.new_values||{})[field];
|
||||
if (ov !== nv && ov !== undefined)
|
||||
return '<span class="diff-field-old">' + (ov||'—') + '</span> → <span class="diff-field-new">' + (nv||'—') + '</span>';
|
||||
}
|
||||
var v = ((c.NEW_VALUES || c.OLD_VALUES || {})[field]);
|
||||
var v = ((c.new_values || c.old_values || {})[field]);
|
||||
return v != null ? v : '—';
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user