|
@@ -470,6 +470,7 @@ class StageIm {
|
|
|
_generateBwBillsImData (node) {
|
|
|
if (!node.gather_tp && !node.contract_tp && !node.qc_tp) return;
|
|
|
|
|
|
+ const tp_decimal = this.ctx.tender.info.decimal.tp;
|
|
|
const nodeIndex = gsTree.getNodeIndex(node);
|
|
|
const peg = this._getPegNode(node);
|
|
|
const nodeImData = [], posterity = gsTree.getPosterity(node);
|
|
@@ -493,19 +494,16 @@ class StageIm {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- const jl = ZhCalc.mul(pp.gather_qty p.unit_price, decimal.tp);
|
|
|
- const contract_jl = ZhCalc.mul(pp.contract_qty, p.unit_price, decimal.tp);
|
|
|
- const qc_jl = ZhCalc.mul(pp.qc_qty, p.unit_price, decimal.tp);
|
|
|
- im.jl = ZhCalc.add(im.jl, jl);
|
|
|
- im.contract_jl = ZhCalc.add(im.contract_jl, contract_jl);
|
|
|
- im.qc_jl = ZhCalc.add(im.qc_jl, qc_jl);
|
|
|
+ im.jl = ZhCalc.add(im.jl, ZhCalc.mul(pp.gather_qty, p.unit_price, tp_decimal));
|
|
|
+ im.contract_jl = ZhCalc.add(im.contract_jl, ZhCalc.mul(pp.contract_qty, p.unit_price, tp_decimal));
|
|
|
+ im.qc_jl = ZhCalc.add(im.qc_jl, ZhCalc.mul(pp.qc_qty, p.unit_price, tp_decimal));
|
|
|
if (pp.drawing_code) im.drawing_code.push(pp.drawing_code);
|
|
|
if (pp.position) im.position.push(pp.position);
|
|
|
|
|
|
im.gclBills.push({
|
|
|
bid: p.id,
|
|
|
b_code: p.b_code, name: p.name, unit: p.unit,
|
|
|
- jl: jl, contract_jl: contract_jl, qc_jl: qc_jl
|
|
|
+ jl: pp.gather_qty, contract_jl: pp.contract_qty, qc_jl: pp.qc_qty
|
|
|
});
|
|
|
}
|
|
|
} else {
|