|
|
@@ -29,8 +29,8 @@ $(document).ready(() => {
|
|
|
{title: '单价', colSpan: '1', rowSpan: '3', field: 'unit_price', hAlign: 2, width: 60, type: 'Number'},
|
|
|
],
|
|
|
extraCols: [
|
|
|
- {title: '标段1|第1期|数量', colSpan: '2|2|1', rowSpan: '1|1|1', field: 'gather_qty_1', hAlign: 2, width: 80, type: 'Number', formatTitle: '%s|%f|数量', formatField: 'gather_qty_%d'},
|
|
|
- {title: '||金额', colSpan: '|1', rowSpan: '|1', field: 'gather_tp_1', hAlign: 2, width: 80, type: 'Number', formatField: 'gather_tp_%d'},
|
|
|
+ {title: '标段1|第1期|数量', colSpan: '2|2|1', rowSpan: '1|1|1', field: 'show_qty_1', hAlign: 2, width: 80, type: 'Number', formatTitle: '%s|%f|数量', formatField: 'show_qty_%d'},
|
|
|
+ {title: '||金额', colSpan: '|1', rowSpan: '|1', field: 'show_tp_1', hAlign: 2, width: 80, type: 'Number', formatField: 'show_tp_%d'},
|
|
|
],
|
|
|
endCols: [
|
|
|
{title: '合计||数量', colSpan: '2||1', rowSpan: '2||1', field: 'sum_qty', hAlign: 2, width: 80, type: 'Number'},
|
|
|
@@ -147,14 +147,14 @@ $(document).ready(() => {
|
|
|
const field = $('[name=compare-data]:checked').val();
|
|
|
for (const node of billsTree.nodes) {
|
|
|
for (let i = 1; i <= billsTree.count; i++) {
|
|
|
- node['gather_qty_' + i] = node[field + '_qty_' + i];
|
|
|
- node['gather_tp_' + i] = node[field + '_tp_' + i];
|
|
|
+ node['show_qty_' + i] = node[field + '_qty_' + i];
|
|
|
+ node['show_tp_' + i] = node[field + '_tp_' + i];
|
|
|
}
|
|
|
node.sum_qty = node['sum_' + field + '_qty'];
|
|
|
node.sum_tp = node['sum_' + field + '_tp'];
|
|
|
for (const p of node.pos) {
|
|
|
for (let i = 1; i < billsTree.count; i++) {
|
|
|
- p['gather_qty_' + i] = p[field + '_qty_' + i];
|
|
|
+ p['show_qty_' + i] = p[field + '_qty_' + i];
|
|
|
}
|
|
|
p.sum_qty = p['sum_' + field + '_qty'];
|
|
|
}
|
