|
|
@@ -379,7 +379,7 @@ module.exports = app => {
|
|
|
rootId: -1,
|
|
|
keys: ['id', 'tender_id', 'ledger_id'],
|
|
|
stageId: 'id',
|
|
|
- calcFields: ['deal_tp', 'total_price', 'contract_tp', 'qc_tp', 'gather_tp'],
|
|
|
+ calcFields: ['deal_tp', 'total_price', 'contract_tp', 'qc_tp', 'gather_tp', 'pre_contract_tp', 'pre_qc_tp', 'pre_gather_tp', 'end_contract_tp', 'end_qc_tp', 'end_gather_tp'],
|
|
|
calc: function (node) {
|
|
|
if (node.children && node.children.length === 0) {
|
|
|
node.pre_gather_qty = helper.add(node.pre_contract_qty, node.pre_qc_qty);
|
|
|
@@ -456,7 +456,7 @@ module.exports = app => {
|
|
|
pos.loadDatas(posData);
|
|
|
pos.calculateAll();
|
|
|
this.resultTree.loadGatherTree(billsTree, function (gatherNode, sourceNode) {
|
|
|
- gatherUtils.gatherZone(tender, gatherNode, sourceNode, completeData.prefix, helper);
|
|
|
+ gatherUtils.gatherStage(tender, gatherNode, sourceNode, completeData.prefix, helper);
|
|
|
}, function (gatherNode, sourceNode) {
|
|
|
const posRange = pos.getLedgerPos(sourceNode.id);
|
|
|
if (!posRange || posRange.length === 0) return;
|
