Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

public/treeUtil.js

@@ -122,7 +122,7 @@ let tree_Data_Helper = {
                     }
                 }
             }
-            if (parseInt(data[psi][P_ID]) !== EMPTY_ID_VAL) {
+            if (parseInt(data[psi][P_ID]) !== EMPTY_ID_VAL && tmpNodes[prefix + data[psi][P_ID]] !== undefined) {
                 tmpNodes[prefix + data[psi][P_ID]][SUB_ID].push(data[psi][NODE_ID]);
             }
         }

web/building_saas/report/html/rpt_print.html

@@ -13,7 +13,21 @@
         page-break-before: auto;
         page-break-after: auto;
     }
-    @page {size: A4 portrait;}
+    @page {
+        size: A4 portrait;
+        margin-top: 0cm;
+        margin-bottom: 0cm;
+        margin-left: 0mm;
+        margin-right: 0mm
+    }
+    @media print {
+        body {
+            margin-top: 0mm;
+            margin-bottom: 0mm;
+            margin-left: 0mm;
+            margin-right: 0mm
+        }
+    }
     body {page: page}
     div {page: page}
 </style>