大屏调试修改

app/view/datacollect/index_cost.ejs

@@ -661,24 +661,36 @@
                     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) {
+                const realTree = createNewPathTree('ledger', setting);
+                realTree.loadDatas(result.real);
+                treeCalc.calculateAll(realTree);
+                compareTree.loadTree(realTree, 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);
+                    cur.real_dgn_qty1 = ZhCalc.add(cur.real_dgn_qty1, source.dgn_qty1);
+                    cur.real_dgn_qty2 = ZhCalc.add(cur.real_dgn_qty2, source.dgn_qty2);
+                    cur.real_tp = ZhCalc.add(cur.real_tp, source.total_price);
                 });
-                const gaiTree = createNewPathTree('ledger', setting);
-                gaiTree.loadDatas(result.gai);
-                treeCalc.calculateAll(gaiTree);
-                compareTree.loadTree(gaiTree, function (cur, source) {
+
+                const ctrlTree = createNewPathTree('ledger', setting);
+                ctrlTree.loadDatas(result.ctrl);
+                treeCalc.calculateAll(ctrlTree);
+                compareTree.loadTree(ctrlTree, 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.ctrl_dgn_qty1 = ZhCalc.add(cur.ctrl_dgn_qty1, source.dgn_qty1);
+                    cur.ctrl_dgn_qty2 = ZhCalc.add(cur.ctrl_dgn_qty2, source.dgn_qty2);
+                    cur.ctrl_tp = ZhCalc.add(cur.ctrl_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);
+                });
+
                 const yuTree = createNewPathTree('ledger', setting);
                 yuTree.loadDatas(result.yu);
                 treeCalc.calculateAll(yuTree);
@@ -688,6 +700,26 @@
                     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 gaiTree = createNewPathTree('ledger', setting);
+                gaiTree.loadDatas(result.gai);
+                treeCalc.calculateAll(gaiTree);
+                compareTree.loadTree(gaiTree, 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);
+                });
+
+                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
@@ -701,6 +733,18 @@
                     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 : '');
+                    node.ctrl_dgn_price = ZhCalc.div(node.ctrl_tp, node.ctrl_dgn_qty1, 2);
+                    node.ctrl_dgn_qty = node.ctrl_dgn_qty1
+                        ? (node.ctrl_dgn_qty2 ? node.ctrl_dgn_qty1 + '/' + node.ctrl_dgn_qty2 : node.ctrl_dgn_qty1)
+                        : (node.ctrl_dgn_qty2 ? '/' + node.ctrl_dgn_qty2 : '');
+                    node.real_dgn_price = ZhCalc.div(node.real_tp, node.real_dgn_qty1, 2);
+                    node.real_dgn_qty = node.real_dgn_qty1
+                        ? (node.real_dgn_qty2 ? node.real_dgn_qty1 + '/' + node.real_dgn_qty2 : node.real_dgn_qty1)
+                        : (node.real_dgn_qty2 ? '/' + node.real_dgn_qty2 : '');
                 });
                 compareTree.resortChildrenByCustom(function (x, y) {
                     const iCode = compareCode(x.code, y.code);

app/view/datacollect/index_tz.ejs

@@ -717,24 +717,37 @@
                     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) {
+
+                const realTree = createNewPathTree('ledger', setting);
+                realTree.loadDatas(result.real);
+                treeCalc.calculateAll(realTree);
+                compareTree.loadTree(realTree, 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);
+                    cur.real_dgn_qty1 = ZhCalc.add(cur.real_dgn_qty1, source.dgn_qty1);
+                    cur.real_dgn_qty2 = ZhCalc.add(cur.real_dgn_qty2, source.dgn_qty2);
+                    cur.real_tp = ZhCalc.add(cur.real_tp, source.total_price);
                 });
-                const gaiTree = createNewPathTree('ledger', setting);
-                gaiTree.loadDatas(result.gai);
-                treeCalc.calculateAll(gaiTree);
-                compareTree.loadTree(gaiTree, function (cur, source) {
+
+                const ctrlTree = createNewPathTree('ledger', setting);
+                ctrlTree.loadDatas(result.ctrl);
+                treeCalc.calculateAll(ctrlTree);
+                compareTree.loadTree(ctrlTree, 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.ctrl_dgn_qty1 = ZhCalc.add(cur.ctrl_dgn_qty1, source.dgn_qty1);
+                    cur.ctrl_dgn_qty2 = ZhCalc.add(cur.ctrl_dgn_qty2, source.dgn_qty2);
+                    cur.ctrl_tp = ZhCalc.add(cur.ctrl_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);
+                });
+
                 const yuTree = createNewPathTree('ledger', setting);
                 yuTree.loadDatas(result.yu);
                 treeCalc.calculateAll(yuTree);
@@ -744,6 +757,26 @@
                     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 gaiTree = createNewPathTree('ledger', setting);
+                gaiTree.loadDatas(result.gai);
+                treeCalc.calculateAll(gaiTree);
+                compareTree.loadTree(gaiTree, 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);
+                });
+
+                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
@@ -757,6 +790,18 @@
                     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 : '');
+                    node.ctrl_dgn_price = ZhCalc.div(node.ctrl_tp, node.ctrl_dgn_qty1, 2);
+                    node.ctrl_dgn_qty = node.ctrl_dgn_qty1
+                        ? (node.ctrl_dgn_qty2 ? node.ctrl_dgn_qty1 + '/' + node.ctrl_dgn_qty2 : node.ctrl_dgn_qty1)
+                        : (node.ctrl_dgn_qty2 ? '/' + node.ctrl_dgn_qty2 : '');
+                    node.real_dgn_price = ZhCalc.div(node.real_tp, node.real_dgn_qty1, 2);
+                    node.real_dgn_qty = node.real_dgn_qty1
+                        ? (node.real_dgn_qty2 ? node.real_dgn_qty1 + '/' + node.real_dgn_qty2 : node.real_dgn_qty1)
+                        : (node.real_dgn_qty2 ? '/' + node.real_dgn_qty2 : '');
                 });
                 compareTree.resortChildrenByCustom(function (x, y) {
                     const iCode = compareCode(x.code, y.code);