设备费不算

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

@@ -468,13 +468,16 @@ let calcTools = {
         let rcj = (treeNode.data.subType === gljType.LABOUR && calcTools.inBase(baseName, 'RGF')) ||
             (baseMaterialTypes.includes(treeNode.data.subType) && calcTools.inBase(baseName, 'CLF')) ||
             (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'JXF')) ||
+            (treeNode.data.subType === gljType.EQUIPMENT && calcTools.inBase(baseName, 'SBF')) ||
+
             (treeNode.data.subType === gljType.LABOUR && calcTools.inBase(baseName, 'SC_RGF')) ||
             (baseMaterialTypes.includes(treeNode.data.subType) && calcTools.inBase(baseName, 'SC_CLF')) ||
-            (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'SC_JXF'));
+            (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'SC_JXF')) ||
+            (treeNode.data.subType === gljType.EQUIPMENT && calcTools.inBase(baseName, 'SC_SBF'));
 
         if (rcj ||
-            (treeNode.data.subType === gljType.MAIN_MATERIAL && calcTools.inBase(baseName, 'ZCF')) ||
-            (treeNode.data.subType === gljType.EQUIPMENT && calcTools.inBase(baseName, 'SBF'))) {
+            (treeNode.data.subType === gljType.MAIN_MATERIAL && calcTools.inBase(baseName, 'ZCF'))
+            ) {
             if (treeNode.data.type == rationType.volumePrice){
                 let nodeQ = calcTools.uiNodeQty(treeNode) ? calcTools.uiNodeQty(treeNode) : 0;
                 result = treeNode.data.marketUnitFee ? (parseFloat(treeNode.data.marketUnitFee) * nodeQ).toDecimal(decimalObj.ration.unitPrice) : 0
@@ -828,7 +831,7 @@ let rationCalcBasesNameKinds = {
     JXF:        ['定额基价机械费', '定额机械费', '定额施工机具使用费', '定额施工机械使用费'],
     JSRGF:      ['定额基价机上人工费', '定额施工机械人工费'],
     ZCF:        ['主材费', '市场价主材费'],
-    SBF:        ['设备费', '市场价设备费'],
+    SBF:        ['定额设备费'],
     RGGR:       ['人工工日'],
     ZGCLF:      ['暂估材料费'],
 
@@ -837,6 +840,7 @@ let rationCalcBasesNameKinds = {
     SC_CLF:     ['材料费'],
     SC_JXF:     ['机械费', '施工机具使用费', '施工机械使用费'],
     SC_JSRGF:   ['施工机械人工费'],
+    SC_SBF:     ['设备费', '市场价设备费', '设备购置费'],
 
     JC_RGF:     ['人工费价差'],
     JC_CLF:     ['材料费价差'],
@@ -877,8 +881,8 @@ let rationCalcBases = {
     '施工机械人工费': function (node, isTender) {
         return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.MACHINE_LABOUR, isTender);
     },
-    '商品砼费': function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.COMMERCIAL_CONCRETE, gljType.COMMERCIAL_MORTAR], priceTypes.ptMarketPrice, isTender);
+    '定额商品砼费': function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.COMMERCIAL_CONCRETE, gljType.COMMERCIAL_MORTAR], priceTypes.ptBasePrice, isTender);
     },
     '定额外购砼构件费': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.PURCHASE_COMPONENT], priceTypes.ptBasePrice, isTender);