汇总对比，奖罚金、其他、临时占地，统计父项

app/public/js/spss_gather_stage_extra.js

@@ -69,7 +69,7 @@ $(document).ready(() => {
         bonus: {
             cols: [
                 {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 320, formatter: '@', cellType: 'tree'},
-                // {title: '汇总', colSpan: '1', rowSpan: '1', field: 'filter_str', hAlign: 1, width: 100, formatter: '@'},
+                {title: '汇总', colSpan: '1', rowSpan: '1', field: 'filter_str', hAlign: 1, width: 100, formatter: '@'},
                 {title: '类型', colSpan: '1', rowSpan: '1', field: 'b_type', hAlign: 1, width: 80, formatter: '@'},
                 {title: '金额', colSpan: '1', rowSpan: '1', field: 'tp', hAlign: 2, width: 80},
                 {title: '时间', colSpan: '1', rowSpan: '1', field: 'real_time', hAlign: 1, width: 100, formatter: 'yyyy-MM-dd'},
@@ -157,10 +157,10 @@ $(document).ready(() => {
         seData: 'cur',
         jgcl: [],
         yjcl: [],
-        bonus: createNewPathTree('gather', {id: 'tree_id', pid: 'tree_pid', order: 'order', level: 'level', rootId: -1, fullPath: 'full_path'}),
-        other: createNewPathTree('gather', {id: 'tree_id', pid: 'tree_pid', order: 'order', level: 'level', rootId: -1, fullPath: 'full_path'}),
+        bonus: createNewPathTree('gather', {id: 'tree_id', pid: 'tree_pid', order: 'order', level: 'level', rootId: -1, fullPath: 'full_path', calcFields: ['tp']}),
+        other: createNewPathTree('gather', {id: 'tree_id', pid: 'tree_pid', order: 'order', level: 'level', rootId: -1, fullPath: 'full_path', calcFields: ['tp', 'end_tp']}),
         safeProd: [],
-        tempLand: createNewPathTree('gather', {id: 'tree_id', pid: 'tree_pid', order: 'order', level: 'level', rootId: -1, fullPath: 'full_path'}),
+        tempLand: createNewPathTree('gather', {id: 'tree_id', pid: 'tree_pid', order: 'order', level: 'level', rootId: -1, fullPath: 'full_path', calcFields: ['total_price', 'tp', 'end_tp']}),
         gatherJgcl(tenders) {
             this.jgcl = [];
             for (const [i, t] of tenders.entries()) {
@@ -225,12 +225,13 @@ $(document).ready(() => {
         gatherBonus(tenders) {
             this.bonus.clearDatas();
             for (const [i, t] of tenders.entries()) {
-                const tenderNode = this.bonus.addNode({ tid: t.id, name: t.name, filter_str: t.filter });
+                const tenderNode = this.bonus.addNode({ tid: t.id, name: t.name, filter_str: t.stage_filter });
                 for (const b of t.bonus) {
                     this.bonus.addNode(b, tenderNode);
                 }
             }
             this.bonus.sortTreeNode(true);
+            treeCalc.calculateAll(this.bonus);
         },
         gatherOther(tenders) {
             this.other.clearDatas();
@@ -241,6 +242,7 @@ $(document).ready(() => {
                 }
             }
             this.other.sortTreeNode(true);
+            treeCalc.calculateAll(this.other);
         },
         gatherSafeProd(tenders) {
             this.safeProd = [];
@@ -273,7 +275,7 @@ $(document).ready(() => {
         gatherTempLand(tenders) {
             this.tempLand.clearDatas();
             for (const [i, t] of tenders.entries()) {
-                const tenderNode = this.tempLand.addNode({ tid: t.id, name: t.name, filter_str: t.filter });
+                const tenderNode = this.tempLand.addNode({ tid: t.id, name: t.name, filter_str: t.stage_filter });
                 for (const tl of t.tempLand) {
                     this.tempLand.addNode(tl, tenderNode);
                 }
@@ -302,6 +304,7 @@ $(document).ready(() => {
                 // }
             }
             this.tempLand.sortTreeNode(true);
+            treeCalc.calculateAll(this.tempLand);
         },
         gatherStageExtraData(tenders) {
             this.tenderCount = tenders.length;