chenshilong 7 роки тому
батько
коміт
2abdde8e32

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

@@ -374,7 +374,7 @@ let assistCalcer = {
                 sumU = sumU + (me.uiGLJQuantity(obj.quantity) * me.uiGLJPrice(obj.marketPrice)).toDecimal(decimalObj.process);
                 sumU = sumU.toDecimal(decimalObj.process);
 
-                let q = (me.uiGLJQuantity(obj.quantity) * me.uiQuantity(treeNode)).toDecimal(decimalObj.process);
+                let q = (me.uiGLJQuantity(obj.quantity) * me.uiQuantity(treeNode)).toDecimal(decimalObj.glj.quantity);
                 sumT = sumT + (q * me.uiGLJPrice(obj.marketPrice)).toDecimal(decimalObj.process);
                 sumT = sumT.toDecimal(decimalObj.process);
             };

+ 2 - 0
web/building_saas/main/js/views/main_tree_col.js

@@ -51,6 +51,8 @@ let MainTreeCol = {
     readOnly: {
         // Vincent, 2018-01-09
         subType: function (node) {
+            if (nodeTools.isVolumePrice(node)) return false;
+
             if(MainTreeCol.readOnly.bills(node)){
                 return true;
             }

+ 4 - 4
web/building_saas/main/js/views/project_view.js

@@ -467,12 +467,12 @@ var projectObj = {
                     }
 
                     // 综合单价、综合合价,小数部分应补0对齐。  CSLAAAAA
-                    if (col.data.field.hasSubStr("common")){
-                        if (col.data.field.hasSubStr("totalFee"))
+                    // if (col.data.field.hasSubStr("common")){
+                        if (col.data.field.hasSubStr(".totalFee"))
                             col.data.formatter = MainTreeCol.getNumberFormatter(decimalObj.ration.totalPrice, true)
-                        else if (col.data.field.hasSubStr("unitFee"))
+                        else if (col.data.field.hasSubStr(".unitFee"))
                             col.data.formatter = MainTreeCol.getNumberFormatter(decimalObj.ration.unitPrice, true)
-                    }
+                    // }
 
                 });