造价对比，计算调整

app/lib/budget_final.js

@@ -302,13 +302,13 @@ class BudgetFinal {
         this.final = final;
         this.finalTree.checkField = budget.final_type.split('_');
 
-        await this._loadGai(budget);
-        await this._loadGu(budget);
-        await this._loadYu(budget);
-        await this._loadZb(budget);
         for (const t of final.tender) {
             await this._loadTender(t);
         }
+        await this._loadZb(budget);
+        await this._loadYu(budget);
+        await this._loadGu(budget);
+        await this._loadGai(budget);
         this._afterLoad();
         return this.getFinalData();
     }

app/public/js/budget_compare.js

@@ -212,24 +212,17 @@ $(document).ready(() => {
                 rootId: -1,
             });
             const setting = { id: 'tree_id', pid: 'tree_pid', order: 'order', level: 'level', rootId: -1, calcFields: ['total_price'] };
-            const guTree = createNewPathTree('ledger', setting);
-            guTree.loadDatas(result.gu);
-            treeCalc.calculateAll(guTree);
-            compareTree.loadTree(guTree, function (cur, source) {
-                cur.base = true;
-                cur.gu_dgn_qty1 = ZhCalc.add(cur.gu_dgn_qty1, source.dgn_qty1);
-                cur.gu_dgn_qty2 = ZhCalc.add(cur.gu_dgn_qty2, source.dgn_qty2);
-                cur.gu_tp = ZhCalc.add(cur.gu_tp, source.total_price);
-            });
-            const gaiTree = createNewPathTree('ledger', setting);
-            gaiTree.loadDatas(result.gai);
-            treeCalc.calculateAll(gaiTree);
-            compareTree.loadTree(gaiTree, function (cur, source) {
+
+            const zbTree = createNewPathTree('ledger', setting);
+            zbTree.loadDatas(result.zb);
+            treeCalc.calculateAll(zbTree);
+            compareTree.loadTree(zbTree, function (cur, source) {
                 cur.base = true;
-                cur.gai_dgn_qty1 = ZhCalc.add(cur.gai_dgn_qty1, source.dgn_qty1);
-                cur.gai_dgn_qty2 = ZhCalc.add(cur.gai_dgn_qty2, source.dgn_qty2);
-                cur.gai_tp = ZhCalc.add(cur.gai_tp, source.total_price);
+                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);
             });
+
             const yuTree = createNewPathTree('ledger', setting);
             yuTree.loadDatas(result.yu);
             treeCalc.calculateAll(yuTree);
@@ -239,15 +232,27 @@ $(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) {
+
+            const gaiTree = createNewPathTree('ledger', setting);
+            gaiTree.loadDatas(result.gai);
+            treeCalc.calculateAll(gaiTree);
+            compareTree.loadTree(gaiTree, 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);
+                cur.gai_dgn_qty1 = ZhCalc.add(cur.gai_dgn_qty1, source.dgn_qty1);
+                cur.gai_dgn_qty2 = ZhCalc.add(cur.gai_dgn_qty2, source.dgn_qty2);
+                cur.gai_tp = ZhCalc.add(cur.gai_tp, source.total_price);
+            });
+
+            const guTree = createNewPathTree('ledger', setting);
+            guTree.loadDatas(result.gu);
+            treeCalc.calculateAll(guTree);
+            compareTree.loadTree(guTree, function (cur, source) {
+                cur.base = true;
+                cur.gu_dgn_qty1 = ZhCalc.add(cur.gu_dgn_qty1, source.dgn_qty1);
+                cur.gu_dgn_qty2 = ZhCalc.add(cur.gu_dgn_qty2, source.dgn_qty2);
+                cur.gu_tp = ZhCalc.add(cur.gu_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