Преглед на файлове

fix: 重庆2018增加土石方相关基数,取费专业获取变更

vian преди 3 години
родител
ревизия
98b15e6319
променени са 1 файла, в които са добавени 12 реда и са изтрити 6 реда
  1. 12 6
      web/building_saas/main/js/models/calc_base.js

+ 12 - 6
web/building_saas/main/js/models/calc_base.js

@@ -449,13 +449,16 @@ let baseFigureTemplate = {
         return rst;
     },
     'FBFXRGTSFDERGF': function (tender) {
-        return cbTools.getFeeWithTypeByFlag(fixedFlag.SUB_ENGINERRING, 42, 'labour', tender);
+        const programID = projectObj.project.calcProgram.compiledTemplateMaps['人工土石方工程'];
+        return cbTools.getFeeWithTypeByFlag(fixedFlag.SUB_ENGINERRING, programID, 'labour', tender);
     },
     'FBFXJXBPTSFDERGF': function (tender) {
-        return cbTools.getFeeWithTypeByFlag(fixedFlag.SUB_ENGINERRING, 18, 'labour', tender);
+        const programID = projectObj.project.calcProgram.compiledTemplateMaps['机械(爆破)土石方工程'];
+        return cbTools.getFeeWithTypeByFlag(fixedFlag.SUB_ENGINERRING, programID, 'labour', tender);
     },
     'FBFXJXBPTSFDEJXF': function (tender) {
-        return cbTools.getFeeWithTypeByFlag(fixedFlag.SUB_ENGINERRING, 18, 'machine', tender);
+        const programID = projectObj.project.calcProgram.compiledTemplateMaps['机械(爆破)土石方工程'];
+        return cbTools.getFeeWithTypeByFlag(fixedFlag.SUB_ENGINERRING, programID, 'machine', tender);
     },
     'FBFXDERGFTSFCW': function (tender) {
         return (this['FBFXDEJJRGF'](tender) - this['FBFXRGTSFDERGF'](tender) - this['FBFXJXBPTSFDERGF'](tender)).toDecimal(decimalObj.bills.totalPrice);
@@ -551,13 +554,16 @@ let baseFigureTemplate = {
         return rst;
     },
     JSCSXMRGTSFDERGF: function (tender) {
-        return cbTools.getFeeWithTypeByFlag(fixedFlag.CONSTRUCTION_TECH, 42, 'labour', tender);
+        const programID = projectObj.project.calcProgram.compiledTemplateMaps['人工土石方工程'];
+        return cbTools.getFeeWithTypeByFlag(fixedFlag.CONSTRUCTION_TECH, programID, 'labour', tender);
     },
     JSCSXMJXBPTSFDERGF: function (tender) {
-        return cbTools.getFeeWithTypeByFlag(fixedFlag.CONSTRUCTION_TECH, 18, 'labour', tender);
+        const programID = projectObj.project.calcProgram.compiledTemplateMaps['机械(爆破)土石方工程'];
+        return cbTools.getFeeWithTypeByFlag(fixedFlag.CONSTRUCTION_TECH, programID, 'labour', tender);
     },
     JSCSXMJXBPTSFDEJXF: function (tender) {
-        return cbTools.getFeeWithTypeByFlag(fixedFlag.CONSTRUCTION_TECH, 18, 'machine', tender);
+        const programID = projectObj.project.calcProgram.compiledTemplateMaps['机械(爆破)土石方工程'];
+        return cbTools.getFeeWithTypeByFlag(fixedFlag.CONSTRUCTION_TECH, programID, 'machine', tender);
     },
     JSCSXMDERGFTSFCW: function (tender) {
         return (this['JSCSXMDEJJRGF'](tender) - this['JSCSXMRGTSFDERGF'](tender) - this['JSCSXMJXBPTSFDERGF'](tender)).toDecimal(decimalObj.bills.totalPrice);