zhangweicheng 6 лет назад
Родитель
Сommit
1b0b0c163f

+ 2 - 1
modules/pm/models/project_property_template.js

@@ -11,7 +11,8 @@ const defaultDecimal = {
     quantity_detail: 4,
     material:5,//三材系数
     process: 6,
-    marketPriceProcess:2
+    marketPriceProcess: 2,
+    temProcess:6
 };
 const displaySetting = {
     autoHeight:true,

+ 1 - 1
public/web/gljUtil.js

@@ -291,7 +291,7 @@ let gljUtil = {
                         priceData.marketPrice = ext[tem.id].marketPrice;
                   }
                   let temP = scMathUtil.roundForObj(tem_marketPrice * priceCoe, price_decimal) * scMathUtil.roundForObj(ratio.consumption, quantity_decimal);
-                  temP = scMathUtil.roundForObj(temP, decimalObj.process);//取两次防止中间过程使用两位导致 4舍5入后少0.01的情况
+                  if(decimalObj.temProcess) temP = scMathUtil.roundForObj(temP, decimalObj.temProcess);//取两次防止中间过程使用两位导致 4舍5入后少0.01的情况
                   temP = scMathUtil.roundForObj(temP,process_decimal);
                   p = scMathUtil.roundForObj(temP + p,process_decimal);
                 }

+ 2 - 1
web/building_saas/main/js/views/project_property_decimal_view.js

@@ -13,7 +13,8 @@ let defaultDecimal = {
         feeRate: {editable: true, data: 3},
         quantity_detail: {editable: false, data: 4},
         process: {editable: false, data: 6},
-        marketPriceProcess:{editable: false, data: 2}
+        marketPriceProcess: { editable: false, data: 2 },
+        temProcess:{editable: false, data: 6}
     }
 };