重庆养护：右键插入设备不计算问题

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

@@ -513,15 +513,15 @@ 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.EQUIPMENT && calcTools.inBase(baseName, 'SBF')) ||
+            (treeNode.data.subType === gljType.MAIN_MATERIAL && calcTools.inBase(baseName, 'ZCF'));
 
             // (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.EQUIPMENT && calcTools.inBase(baseName, 'SC_SBF'));
 
-        if (rcj ||
-            (treeNode.data.subType === gljType.MAIN_MATERIAL && calcTools.inBase(baseName, 'ZCF'))) {
+        if (rcj) {
             let nodeQ = calcTools.uiNodeQty(treeNode) ? calcTools.uiNodeQty(treeNode) : 0;
             if (treeNode.data.type == rationType.volumePrice){
                 result = treeNode.data.marketUnitFee ? (parseFloat(treeNode.data.marketUnitFee) * nodeQ).toDecimal(decimalObj.ration.unitPrice) : 0
@@ -532,6 +532,7 @@ let calcTools = {
                     prc = gljOprObj.getMarketPrice(treeNode)
                 else
                     prc = gljOprObj.getBasePrice(treeNode);
+
                 result = (prc * nodeQ).toDecimal(decimalObj.ration.unitPrice);
             }
 
@@ -884,9 +885,9 @@ let rationCalcBasesNameKinds = {
     CLF:        ['材料费', '定额基价材料费', '定额材料费'],
     QTCLF:      ['定额其他材料费'],
     JXF:        ['机械费', '施工机具使用费', '施工机械使用费', '定额基价机械费', '定额机械费', '定额施工机具使用费', '定额施工机械使用费'],
-    JSRGF:      ['定额基价机上人工费', '定额施工机械人工费'],
+    JSRGF:      ['定额基价机上人工费', '定额施工机械人工费', '施工机械人工费'],
     ZCF:        ['主材费', '市场价主材费'],
-    SBF:        ['定额设备费'],
+    SBF:        ['设备费', '市场价设备费', '设备购置费','定额设备费'],
     RGGR:       ['人工工日'],
     // ZGCLF:      ['暂估材料费'],