造价对比，估概预设计数量、经济指标计算

app/lib/budget_final.js

@@ -213,7 +213,7 @@ class BudgetFinal {
                 tree_id: x.id, tree_pid: x.pid, order: x.order, level: x.level, full_path: x.full_path, is_leaf: x.is_leaf,
                 code: x.code, name: x.name, unit: x.unit,
                 gu_dgn_qty1: x.gu_dgn_qty1 || 0, gu_dgn_qty2: x.gu_dgn_qty2 || 0, gu_tp: x.gu_tp || 0,
-                gai_dgn_qty1: x.gai_dgn_qty1 || 0, gai_dgn_qty2: x.gu_dgn_qty2 || 0, gai_tp: x.gu_tp || 0,
+                gai_dgn_qty1: x.gai_dgn_qty1 || 0, gai_dgn_qty2: x.gai_dgn_qty2 || 0, gai_tp: x.gai_tp || 0,
                 yu_dgn_qty1: x.yu_dgn_qty1 || 0, yu_dgn_qty2: x.yu_dgn_qty2 || 0, yu_tp: x.yu_tp || 0,
 
                 dgn_qty1: x.dgn_qty1 || 0, dgn_qty2: x.dgn_qty2 || 0, total_price: x.total_price || 0,

app/public/js/budget_compare.js

@@ -130,8 +130,24 @@ $(document).ready(() => {
                 order: 'order',
                 level: 'level',
                 rootId: -1,
+                calcFields: [],
+                calcFun: function (node) {
+                    node.gu_dgn_price = ZhCalc.div(node.gu_tp, node.gu_dgn_qty1, 2);
+                    node.gu_dgn_qty = node.gu_dgn_qty1
+                        ? (node.gu_dgn_qty2 ? node.gu_dgn_qty1 + '/' + node.gu_dgn_qty2 : node.gu_dgn_qty1)
+                        : (node.gu_dgn_qty2 ? '/' + node.gu_dgn_qty2 : '');
+                    node.gai_dgn_price = ZhCalc.div(node.gai_tp, node.gai_dgn_qty1, 2);
+                    node.gai_dgn_qty = node.gai_dgn_qty1
+                        ? (node.gai_dgn_qty2 ? node.gai_dgn_qty1 + '/' + node.gai_dgn_qty2 : node.gai_dgn_qty1)
+                        : (node.gai_dgn_qty2 ? '/' + node.gai_dgn_qty2 : '');
+                    node.yu_dgn_price = ZhCalc.div(node.yu_tp, node.yu_dgn_qty1, 2);
+                    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 : '');
+                }
             });
             finalTree.loadDatas(result.final);
+            treeCalc.calculateAll(finalTree);
             SpreadJsObj.loadSheetData(compareSheet, SpreadJsObj.DataType.Tree, finalTree);
             if (sfSelect) sfSelect.reloadSelect(this.finalInfo.tender);
         }