bugs

web/building_saas/main/js/models/calc_program.js

@@ -294,6 +294,7 @@ let calcTools = {
     machineDetailFee: function (treeNode, gljArr, masterTypeFilter, detailType, isTender) {
         if (!gljArr) return 0;
         let result = 0;
+        let nodeQ = calcTools.uiNodeQty(treeNode) ? calcTools.uiNodeQty(treeNode) : 0;
         for (let glj of gljArr) {
             if (baseMachineMasterTypes.includes(glj.type)){
                 // 机型不符
@@ -318,7 +319,7 @@ let calcTools = {
                         mdSum = (mdSum).toDecimal(decimalObj.glj.unitPriceHasMix);
                     }
                 }
-                result = (result + (gljQ * mdSum).toDecimal(decimalObj.process)).toDecimal(decimalObj.process)
+                result = (result + (nodeQ * gljQ * mdSum).toDecimal(decimalObj.process)).toDecimal(decimalObj.process)
             }
         }
         result = (result).toDecimal(decimalObj.ration.totalPrice);
@@ -879,6 +880,12 @@ let rationCalcBases = {
     '商品砼费': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.COMMERCIAL_CONCRETE, gljType.COMMERCIAL_MORTAR], priceTypes.ptMarketPrice, isTender);
     },
+    '定额外购砼构件费': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.PURCHASE_COMPONENT], priceTypes.ptBasePrice, isTender);
+    },
+    '定额绿化苗木费': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.GREEN_SEEDLING], priceTypes.ptBasePrice, isTender);
+    },
     '设备购置费': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
     },

web/building_saas/main/js/models/main_consts.js

@@ -291,8 +291,8 @@ let cpFeeTypes = [
     {type: 'force', name: '规费'},
     {type: 'profit', name: '利润'},
     {type: 'tax', name: '税金'},
-    {type: 'rationCommon', name: '定额建安费'},
-    {type: 'common', name: '建安费'}
+    {type: 'common', name: '建安费'},
+    {type: 'rationCommon', name: '定额建安费'}
     // {type: 'fee1', name: '费用1'},
     // {type: 'fee2', name: '费用2'}
 ];