Преглед изворни кода

全费用模板税前工程造价计算了null节点问题

zhongzewei пре 7 година
родитељ
комит
b52416d8ee

+ 1 - 1
public/web/tree_sheet/tree_sheet_helper.js

@@ -475,7 +475,7 @@ var TREE_SHEET_HELPER = {
                         .css("border", "1px #C0C0C0 solid")
                         .css("box-shadow", "1px 2px 5px rgba(0,0,0,0.4)")
                         .css("font", "9pt Arial")
-                        .css("background", "white")
+                        .css("background", "White")
                         .css("padding", 5)
                         .attr("id", 'autoTip');
                     $(div).hide();

+ 3 - 0
web/building_saas/main/js/models/calc_program.js

@@ -1998,6 +1998,9 @@ class CalcProgram {
         const totalFeeType = tender ? 'common.tenderTotalFee' : 'common.totalFee';
         function calcNodes(nodes) {
             for (let node of nodes) {
+                if(!node){
+                    continue;
+                }
                 if (!excludeNodes.includes(node)){
                     if (node.source && node.source.children && node.source.children.length > 0) {
                         calcNodes(node.children);