|
@@ -33,6 +33,9 @@ $(document).ready(() => {
|
|
|
{title: '施工图预算|数量1/数量2', colSpan: '3|1', rowSpan: '1|1', field: 'yu_dgn_qty', hAlign: 2, width: 80, bc_type: 'number'},
|
|
|
{title: '|经济指标', colSpan: '|1', rowSpan: '|1', field: 'yu_dgn_price', hAlign: 2, width: 80, type: 'Number', bc_type: 'number'},
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'yu_tp', hAlign: 2, width: 80, type: 'Number', bc_type: 'number'},
|
|
|
+ {title: '招标预算|数量1/数量2', colSpan: '3|1', rowSpan: '1|1', field: 'zb_dgn_qty', hAlign: 2, width: 80, bc_type: 'number'},
|
|
|
+ {title: '|经济指标', colSpan: '|1', rowSpan: '|1', field: 'zb_dgn_price', hAlign: 2, width: 80, type: 'Number', bc_type: 'number'},
|
|
|
+ {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'zb_tp', hAlign: 2, width: 80, type: 'Number', bc_type: 'number'},
|
|
|
{title: '台账|数量1/数量2', colSpan: '3|1', rowSpan: '1|1', field: 'dgn_qty', hAlign: 2, width: 80, bc_type: 'number', visible: false},
|
|
|
{title: '|经济指标', colSpan: '|1', rowSpan: '|1', field: 'dgn_price', hAlign: 2, width: 80, type: 'Number', bc_type: 'number', visible: false},
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'total_price', hAlign: 2, width: 80, type: 'Number', bc_type: 'number', visible: false},
|
|
@@ -163,6 +166,15 @@ $(document).ready(() => {
|
|
|
cur.yu_dgn_qty2 = ZhCalc.add(cur.yu_dgn_qty2, source.dgn_qty2);
|
|
|
cur.yu_tp = ZhCalc.add(cur.yu_tp, source.total_price);
|
|
|
});
|
|
|
+ const zbTree = createNewPathTree('ledger', setting);
|
|
|
+ zbTree.loadDatas(result.zb);
|
|
|
+ treeCalc.calculateAll(zbTree);
|
|
|
+ compareTree.loadTree(zbTree, function (cur, source) {
|
|
|
+ cur.base = true;
|
|
|
+ cur.zb_dgn_qty1 = ZhCalc.add(cur.zb_dgn_qty1, source.dgn_qty1);
|
|
|
+ cur.zb_dgn_qty2 = ZhCalc.add(cur.zb_dgn_qty2, source.dgn_qty2);
|
|
|
+ cur.zb_tp = ZhCalc.add(cur.zb_tp, source.total_price);
|
|
|
+ });
|
|
|
compareTree.afterLoad(node => {
|
|
|
node.gu_dgn_price = ZhCalc.div(node.gu_tp, node.gu_dgn_qty1, 2);
|
|
|
node.gu_dgn_qty = node.gu_dgn_qty1
|
|
@@ -176,6 +188,10 @@ $(document).ready(() => {
|
|
|
node.yu_dgn_qty = node.yu_dgn_qty1
|
|
|
? (node.yu_dgn_qty2 ? node.yu_dgn_qty1 + '/' + node.yu_dgn_qty2 : node.yu_dgn_qty1)
|
|
|
: (node.yu_dgn_qty2 ? '/' + node.yu_dgn_qty2 : '');
|
|
|
+ node.zb_dgn_price = ZhCalc.div(node.zb_tp, node.zb_dgn_qty1, 2);
|
|
|
+ node.zb_dgn_qty = node.zb_dgn_qty1
|
|
|
+ ? (node.zb_dgn_qty2 ? node.zb_dgn_qty1 + '/' + node.zb_dgn_qty2 : node.zb_dgn_qty1)
|
|
|
+ : (node.zb_dgn_qty2 ? '/' + node.zb_dgn_qty2 : '');
|
|
|
});
|
|
|
compareTree.resortChildrenByCustom(function (x, y) {
|
|
|
const iCode = compareCode(x.code, y.code);
|