chenshilong 7 anni fa
parent
commit
bd91ec29c2

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

@@ -863,6 +863,7 @@ class CalcProgram {
     // 计算本节点(默认同时递归计算所有父节点,可选)
     calculate(treeNode, calcParents = true){
         let me = this;
+        if (treeNode.sourceType === me.project.ration_glj.getSourceType()) return;     // 仅用作树节点显示的工料机不能参与计算。
         let isRation = treeNode.sourceType === me.project.Ration.getSourceType();
         let isBill = treeNode.sourceType === me.project.Bills.getSourceType();
 

+ 1 - 3
web/building_saas/main/js/views/main_tree_col.js

@@ -168,9 +168,7 @@ let MainTreeCol = {
         // CSL, 2017-11-28
         subType: function (node) {
             if (node.data.type == rationType.volumePrice || node.data.type == rationType.gljRation || node.sourceType === projectObj.project.ration_glj.getSourceType()) {
-                let VPType = sheetCommonObj.getDynamicCombo();;
-                ;
-
+                let VPType = sheetCommonObj.getDynamicCombo();
                 if (node.data.type == rationType.volumePrice)
                     VPType.itemHeight(5).items(["人工", "材料", "机械", "主材", "设备"])
                 else if (node.data.type == rationType.gljRation || node.sourceType === projectObj.project.ration_glj.getSourceType())