Merge branch 'dev' into budget

public/web/gljUtil.js

@@ -368,7 +368,7 @@ let gljUtil = {
             let pglj = calcTools.getProjectGLJ(glj);
             glj.tenderQuantity = this.getRationGLJTenderQuantity(glj, ration, gd, scMathUtil,pglj);
 
-            return scMathUtil.roundToString(quantity * glj.quantity, gd);
+            return scMathUtil.roundForObj(quantity * glj.quantity, gd)+'';
         }
     },
     getEngineerCostData:function(property,bills,fixedFlag,scMathUtil){

web/building_saas/main/js/views/glj_view.js

@@ -754,7 +754,7 @@ var gljOprObj = {
     calcMixRationTotalQuantity(mList,pTotal){ //计算组成物的总消耗量
         for (let subG of mList) {
             subG.rationItemQuantity = scMathUtil.roundForObj(subG.rationItemQuantity, getDecimal("glj.quantity"));
-            subG.totalQuantity = scMathUtil.roundToString(subG.rationItemQuantity * pTotal, getDecimal("glj.quantity"));
+            subG.totalQuantity = scMathUtil.roundForObj(subG.rationItemQuantity * pTotal, getDecimal("glj.quantity"))+'';
         }
     },
     addMixRatioToShow: function () {