Browse Source

重庆市场价主材费

chenshilong 6 years ago
parent
commit
711f67dd27
1 changed files with 2 additions and 2 deletions
  1. 2 2
      web/building_saas/main/js/models/calc_program.js

+ 2 - 2
web/building_saas/main/js/models/calc_program.js

@@ -565,7 +565,7 @@ let calcTools = {
     marketPriceToBase: function (treeNode, baseName, isTender) {
     marketPriceToBase: function (treeNode, baseName, isTender) {
         if (treeNode.data.type != rationType.volumePrice && treeNode.data.type != rationType.gljRation) return;
         if (treeNode.data.type != rationType.volumePrice && treeNode.data.type != rationType.gljRation) return;
         let result = 0, me = this;
         let result = 0, me = this;
-        
+
         let rcj = (treeNode.data.subType === gljType.LABOUR && calcTools.inBase(baseName, 'RGF')) ||
         let rcj = (treeNode.data.subType === gljType.LABOUR && calcTools.inBase(baseName, 'RGF')) ||
             (baseMaterialTypes.includes(treeNode.data.subType) && calcTools.inBase(baseName, 'CLF')) ||
             (baseMaterialTypes.includes(treeNode.data.subType) && calcTools.inBase(baseName, 'CLF')) ||
             (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'JXF'));
             (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'JXF'));
@@ -935,7 +935,7 @@ let rationCalcBasesNameKinds = {
     QTCLF:      ['定额其他材料费'],
     QTCLF:      ['定额其他材料费'],
     JXF:        ['定额基价机械费', '定额机械费', '定额施工机具使用费'],
     JXF:        ['定额基价机械费', '定额机械费', '定额施工机具使用费'],
     JSRGF:      ['定额基价机上人工费'],
     JSRGF:      ['定额基价机上人工费'],
-    ZCF:        ['主材费'],
+    ZCF:        ['主材费', '市场价主材费'],
     SBF:        ['设备费'],
     SBF:        ['设备费'],
     RGGR:       ['人工工日'],
     RGGR:       ['人工工日'],
     ZGCLF:      ['暂估材料费'],
     ZGCLF:      ['暂估材料费'],