树结构刷新调整

app/public/js/path_tree.js

@@ -352,9 +352,8 @@ const createNewPathTree = function (type, setting) {
                 }
             };
             this.nodes = [];
-            if (!isResort) {
-                this.children = this.getChildren();
-            } else {
+            this.children = this.getChildren();
+            if (isResort) {
                 this.sortByOrder(this.children);
             }
             addSortNodes(this.children);
@@ -813,8 +812,8 @@ const createNewPathTree = function (type, setting) {
                     for (const prop in data) {
                         if (data[prop] !== undefined && data[prop] !== node[prop]) {
                             if (prop === this.setting.pid) {
-                                loadedData.push(this.getItems(node[this.setting.pid]));
-                                loadedData.push(this.getItems(data[this.setting.pid]));
+                                if (node[this.setting.pid] !== this.setting.rootId) loadedData.push(this.getItems(node[this.setting.pid]));
+                                if (data[this.setting.pid] !== this.setting.rootId) loadedData.push(this.getItems(data[this.setting.pid]));
                             }
                             // if (prop === this.setting.order) {
                             //     loadedData = loadedData.concat(this.getPosterity(node));

app/service/cost_stage_ledger.js

@@ -439,7 +439,7 @@ module.exports = app => {
                     nData.pay_tp = row.pay_tp !== undefined ? helper.round(row.pay_tp || 0, decimal.tp) : oData.pay_tp || 0;
                     nData.cut_tp = row.cut_tp !== undefined ? helper.round(row.cut_tp || 0, decimal.tp) : oData.cut_tp || 0;
                     nData.yf_tp = helper.sub(nData.pay_tp, nData.cut_tp);
-                    if (od.yf_tp === od.sf_tp) nData.sf_tp = nData.yf_tp;
+                    if (oData.yf_tp === oData.sf_tp) nData.sf_tp = nData.yf_tp;
                 }
                 if (row.sf_tp !== undefined) nData.sf_tp = helper.round(row.sf_tp || 0, decimal.tp);
                 if (row.tax !== undefined || nData.sf_tp !== undefined || nData.yf_tp !== undefined) {