top bills node filter

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -51,14 +51,19 @@ const exposed_prj_glj_properties = [
     {Name: "工料机_数量", Title: "", Key: "quantity", Order: "ascend"}
 ];
 const exposed_properties_arr = [exposed_bills_properties, exposed_ration_properties, exposed_prj_glj_properties];
-const fixed_bills = [
+const fixed_top_bills_nodes = [
     {Name: "分部分项工程", Title: "", Value: 1},
     {Name: "措施项目", Title: "", Value: 2},
+    {Name: "其他项目", Title: "", Value: 7},
+    {Name: "规费", Title: "", Value: 15},
+    {Name: "税金", Title: "", Value: 18},
+    {Name: "工程造价", Title: "", Value: 19}
+];
+const fixed_other_bills_types = [
     {Name: "施工技术措施项目", Title: "", Value: 3},
     {Name: "安全文明施工按实计算费用", Title: "", Value: 4},
     {Name: "施工组织措施专项费用", Title: "", Value: 5},
     {Name: "安全文明施工专项费用", Title: "", Value: 6},
-    {Name: "其他项目", Title: "", Value: 7},
     {Name: "暂列金额", Title: "", Value: 8},
     {Name: "暂估价", Title: "", Value: 9},
     {Name: "材料（工程设备）暂估价", Title: "", Value: 10},
@@ -66,11 +71,8 @@ const fixed_bills = [
     {Name: "计日工", Title: "", Value: 12},
     {Name: "总承包服务费", Title: "", Value: 13},
     {Name: "索赔与现场签证", Title: "", Value: 14},
-    {Name: "规费", Title: "", Value: 15},
     {Name: "社会保险费及住房公积金", Title: "", Value: 16},
-    {Name: "工程排污费", Title: "", Value: 17},
-    {Name: "税金", Title: "", Value: 18},
-    {Name: "工程造价", Title: "", Value: 19}
+    {Name: "工程排污费", Title: "", Value: 17}
 ];
 const IDMark_Switch = "_switch",
     IDMark_Icon = "_ico",
@@ -433,11 +435,16 @@ let preHandleSortObj = {
                     //tree
                     //tree排序是我们特有的数据结构方式，与数据结构有关，非common用
                     $("#div_sort_tree")[0].style.display = "";
-                    me.topBillsTreeObj = $.fn.zTree.init($("#bills_top_nodes"), sortingTreeSetting, fixed_bills);
+                    me.topBillsTreeObj = $.fn.zTree.init($("#bills_top_nodes"), sortingTreeSetting, fixed_top_bills_nodes);
                     let topBillnodes = me.topBillsTreeObj.getNodes();
                     if (preHandleObj.currentNode[JV.PROP_FILTER_TOP_BILLS_NODES]) {
                         for (let topBillsNodeId of preHandleObj.currentNode[JV.PROP_FILTER_TOP_BILLS_NODES]) {
-                            me.topBillsTreeObj.checkNode(topBillnodes[topBillsNodeId - 1], true, false, false);
+                            for (let topBillsNode of topBillnodes) {
+                                if (topBillsNode.Value === topBillsNodeId) {
+                                    me.topBillsTreeObj.checkNode(topBillsNode, true, false, false);
+                                    break;
+                                }
+                            }
                         }
                     } else {
                         preHandleObj.currentNode[JV.PROP_FILTER_TOP_BILLS_NODES] = [];
@@ -542,7 +549,7 @@ let preHandleSortObj = {
             me.currentNode[JV.PROP_SORT_KEYS] = [];
         } else if (dom.selectedIndex === 1) {
             $("#div_sort_tree")[0].style.display = "";
-            preHandleSortObj.normalTreeObj = $.fn.zTree.init($("#bills_top_nodes"), sortingTreeSetting, fixed_bills);
+            preHandleSortObj.normalTreeObj = $.fn.zTree.init($("#bills_top_nodes"), sortingTreeSetting, fixed_top_bills_nodes);
         }
         me.currentNode[JV.PROP_SORT_TYPE] = dom.value;
     },