Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

web/building_saas/main/js/views/material_calc_view.js

@@ -425,7 +425,9 @@ materialCalcObj = {
                 return me.showDatas();
             }
             if(dataCode != 'supplyLocation'){
-                value = value?scMathUtil.roundForObj(value,getDecimal("glj.unitPrice"))+'':'0'//4舍五入加默认为0
+               let decimal = getDecimal("glj.unitPrice");
+               if(dataCode == "grossWeightCoe_n")  decimal = 6;
+                value = value?scMathUtil.roundForObj(value,decimal)+'':'0'//4舍五入加默认为0
             }
             if(recode[dataCode] == value) continue;
             doc[dataCode] = value;

web/over_write/js/anhui_2019.js

@@ -20,9 +20,9 @@ function overwriteRationCalcBases() {
     rationCalcBases['施工机械人工费'] = function (node, isTender) {
         return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.MACHINE_LABOUR, isTender);
     };
-    /* rationCalcBases['设备购置费'] = function (node, isTender) {
+    rationCalcBases['设备购置费'] = function (node, isTender) {
          return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
-     };*/
+     };
 
     rationCalcBases['定额人工费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptBasePrice, isTender);
@@ -35,11 +35,11 @@ function overwriteRationCalcBases() {
     };
     /*    rationCalcBases['定额商品砼费'] = function (node, isTender) {
             return calcTools.rationBaseFee(node, [gljType.COMMERCIAL_CONCRETE, gljType.COMMERCIAL_MORTAR], priceTypes.ptBasePrice, isTender);
-        };
-        rationCalcBases['定额设备费'] = function (node, isTender) {
-            return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptBasePrice, isTender);
-        };
-        rationCalcBases['定额外购砼构件费'] = function (node, isTender) {
+        };*/
+    rationCalcBases['定额设备费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptBasePrice, isTender);
+    };
+        /*rationCalcBases['定额外购砼构件费'] = function (node, isTender) {
             return calcTools.rationBaseFee(node, [gljType.PURCHASE_COMPONENT], priceTypes.ptBasePrice, isTender);
         };
         rationCalcBases['定额绿化苗木费'] = function (node, isTender) {