Добавлены колонки: Уник.номер, Номер лота, СПП-элемент
This commit is contained in:
parent
af0a9d5914
commit
6b5b3a51f3
@ -121,6 +121,9 @@
|
|||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
<th onclick="sort('uniqueObjectId')">Уник. номер ↕</th>
|
||||||
|
<th onclick="sort('lotNumber')">Номер лота ↕</th>
|
||||||
|
<th onclick="sort('sppElement')">СПП-элемент ↕</th>
|
||||||
<th onclick="sort('serviceName')">Наименование ↕</th>
|
<th onclick="sort('serviceName')">Наименование ↕</th>
|
||||||
<th onclick="sort('department')">Подразделение ↕</th>
|
<th onclick="sort('department')">Подразделение ↕</th>
|
||||||
<th onclick="sort('budgetType')">Тип бюджета ↕</th>
|
<th onclick="sort('budgetType')">Тип бюджета ↕</th>
|
||||||
@ -184,7 +187,7 @@
|
|||||||
renderTable();
|
renderTable();
|
||||||
updatePagination();
|
updatePagination();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
document.getElementById('tableBody').innerHTML = '<tr><td colspan="9" class="loading">Ошибка загрузки данных: ' + error.message + '</td></tr>';
|
document.getElementById('tableBody').innerHTML = '<tr><td colspan="12" class="loading">Ошибка загрузки данных: ' + error.message + '</td></tr>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -230,6 +233,9 @@
|
|||||||
|
|
||||||
tbody.innerHTML = pageData.map(function(r) {
|
tbody.innerHTML = pageData.map(function(r) {
|
||||||
return '<tr>' +
|
return '<tr>' +
|
||||||
|
'<td>' + (r.uniqueObjectId || '-') + '</td>' +
|
||||||
|
'<td>' + (r.lotNumber || '-') + '</td>' +
|
||||||
|
'<td>' + (r.sppElement || '-') + '</td>' +
|
||||||
'<td>' + (r.serviceName || '-') + '</td>' +
|
'<td>' + (r.serviceName || '-') + '</td>' +
|
||||||
'<td>' + (r.department || '-') + '</td>' +
|
'<td>' + (r.department || '-') + '</td>' +
|
||||||
'<td>' + (r.budgetType || '-') + '</td>' +
|
'<td>' + (r.budgetType || '-') + '</td>' +
|
||||||
|
|||||||
@ -35,6 +35,8 @@ function parseExcelData() {
|
|||||||
const budgetSumIdx = findColumn(['Сумма с уч.корр']);
|
const budgetSumIdx = findColumn(['Сумма с уч.корр']);
|
||||||
const executedSumIdx = findColumn(['Сумма поставки,тг']);
|
const executedSumIdx = findColumn(['Сумма поставки,тг']);
|
||||||
const sppElementIdx = findColumn(['СПП-элемент']);
|
const sppElementIdx = findColumn(['СПП-элемент']);
|
||||||
|
const uniqueObjectIdIdx = findColumn(['Уникальный номер объекта']);
|
||||||
|
const lotNumberIdx = findColumn(['Номер лота']);
|
||||||
const departmentIdx = findColumn(['Завод', 'МВЗ', 'Текст МВЗ']);
|
const departmentIdx = findColumn(['Завод', 'МВЗ', 'Текст МВЗ']);
|
||||||
const procurementMethodIdx = findColumn(['Способ закупки']);
|
const procurementMethodIdx = findColumn(['Способ закупки']);
|
||||||
const procurementTypeIdx = findColumn(['Вид закупа']);
|
const procurementTypeIdx = findColumn(['Вид закупа']);
|
||||||
@ -47,6 +49,8 @@ function parseExcelData() {
|
|||||||
const budgetSum = parseFloat(String(row[budgetSumIdx] || 0).replace(/\s/g, '')) || 0;
|
const budgetSum = parseFloat(String(row[budgetSumIdx] || 0).replace(/\s/g, '')) || 0;
|
||||||
const executedSum = parseFloat(String(row[executedSumIdx] || 0).replace(/\s/g, '')) || 0;
|
const executedSum = parseFloat(String(row[executedSumIdx] || 0).replace(/\s/g, '')) || 0;
|
||||||
const sppElement = String(row[sppElementIdx] || '').trim();
|
const sppElement = String(row[sppElementIdx] || '').trim();
|
||||||
|
const uniqueObjectId = String(row[uniqueObjectIdIdx] || '').trim();
|
||||||
|
const lotNumber = String(row[lotNumberIdx] || '').trim();
|
||||||
const procurementMethod = String(row[procurementMethodIdx] || '').trim();
|
const procurementMethod = String(row[procurementMethodIdx] || '').trim();
|
||||||
const procurementType = String(row[procurementTypeIdx] || '').trim();
|
const procurementType = String(row[procurementTypeIdx] || '').trim();
|
||||||
|
|
||||||
@ -67,10 +71,12 @@ function parseExcelData() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const item = {
|
const item = {
|
||||||
|
uniqueObjectId: uniqueObjectId,
|
||||||
|
lotNumber: lotNumber,
|
||||||
|
sppElement: sppElement,
|
||||||
serviceName: String(row[serviceNameIdx] || '').trim(),
|
serviceName: String(row[serviceNameIdx] || '').trim(),
|
||||||
department: String(row[departmentIdx] || '').trim(),
|
department: String(row[departmentIdx] || '').trim(),
|
||||||
budgetType: budgetType,
|
budgetType: budgetType,
|
||||||
sppElement: sppElement,
|
|
||||||
procurementMethod: procurementMethod,
|
procurementMethod: procurementMethod,
|
||||||
procurementType: procurementType,
|
procurementType: procurementType,
|
||||||
budgetSum: budgetSum,
|
budgetSum: budgetSum,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user