mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-09-13 00:24:42 +08:00
Make stock column work properly with different orders [SCI-6677] (#3974)
This commit is contained in:
parent
a32dd54a6e
commit
addd4a9522
1 changed files with 12 additions and 14 deletions
|
@ -75,22 +75,20 @@ var MyModuleRepositories = (function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
customColumns.each((i, column) => {
|
customColumns.each((i, column) => {
|
||||||
if (!$(column).hasClass('item-stock')) {
|
|
||||||
columns.push({
|
columns.push({
|
||||||
visible: true,
|
visible: true,
|
||||||
searchable: true,
|
searchable: true,
|
||||||
data: String(columns.length),
|
data: column.dataset.type === 'RepositoryStockValue' ? 'stock' : String(columns.length),
|
||||||
defaultContent: $.fn.dataTable.render['default' + column.dataset.type](column.id)
|
defaultContent: $.fn.dataTable.render['default' + column.dataset.type](column.id)
|
||||||
});
|
});
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if ($(tableContainer).data('stock-management')) {
|
if ($(tableContainer).data('stock-consumption-column')) {
|
||||||
columns = columns.concat(
|
columns.push({
|
||||||
stockManagementColumns(
|
visible: true,
|
||||||
$(tableContainer).data('stock-consumption-column')
|
searchable: false,
|
||||||
)
|
data: 'consumedStock'
|
||||||
);
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return columns;
|
return columns;
|
||||||
|
|
Loading…
Add table
Reference in a new issue