Forráskód Böngészése

fix: 重庆18累进基数兼容旧项目(旧项目没累进数据)

vian 4 éve
szülő
commit
f5ba4dc52b

+ 3 - 0
web/building_saas/main/js/views/project_view.js

@@ -933,6 +933,9 @@ var projectObj = {
                 if (typeof overwriteRationCalcBases === 'function')
                     overwriteRationCalcBases(that.project.property.taxType);
                 //that.project.calcProgram.compileAllTemps();
+                if (typeof dynamicLoadCalcBase !== 'undefiend') {
+                    dynamicLoadCalcBase();
+                }
                 that.project.calcBase.init(that.project);
                 // that.project.calcFields = JSON.parse(JSON.stringify(cpFeeTypes));
                 // that.project.initCalcFields();

+ 36 - 15
web/over_write/js/chongqing_2018.js

@@ -312,29 +312,50 @@ if(typeof baseFigureMap !== 'undefined'){
         '税前工程造价': {base: 'SQGCZJ', class: 'SQGCZJ',
             cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE],   //循环计算相关固定行,由于计算排除了本身,不用判断措施项目
             multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]},//相关固定行
-        '市政道路工程安全文明施工费': {base: 'SZDLGCAQWMSGF', class: 'CSXM',
+    };
+}
+
+function dynamicLoadCalcBase() {
+    // 兼容旧数据,旧单位工程可能不存在累进区间
+    if (projectObj && projectObj.project.property.progressiveInterval) {
+        baseFigureMap['市政道路工程安全文明施工费'] = {
+            base: 'SZDLGCAQWMSGF', class: 'CSXM',
             cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE],   // 以税前工程造价作为累进基数,因此配置沿用{税前工程造价}
-            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]},
-        '市政桥梁工程安全文明施工费': {base: 'SZQLGCAQWMSGF', class: 'CSXM',
+            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]
+        };
+        baseFigureMap['市政桥梁工程安全文明施工费'] = {
+            base: 'SZQLGCAQWMSGF', class: 'CSXM',
             cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE],   // 以税前工程造价作为累进基数,因此配置沿用{税前工程造价}
-            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]},
-        '市政隧道工程安全文明施工费': {base: 'SZSDGCAQWMSGF', class: 'CSXM',
+            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]
+        };
+        baseFigureMap['市政隧道工程安全文明施工费'] = {
+            base: 'SZSDGCAQWMSGF', class: 'CSXM',
             cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE],   // 以税前工程造价作为累进基数,因此配置沿用{税前工程造价}
-            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]},
-        '城轨盾构工程安全文明施工费': {base: 'CGDGGCAQWMSGF', class: 'CSXM',
+            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]
+        };
+        baseFigureMap['城轨盾构工程安全文明施工费'] = {
+            base: 'CGDGGCAQWMSGF', class: 'CSXM',
             cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE],   // 以税前工程造价作为累进基数,因此配置沿用{税前工程造价}
-            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]},
-        '城轨高架桥工程安全文明施工费': {base: 'CGGJQGCAQWMSGF', class: 'CSXM',
+            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]
+        };
+        baseFigureMap['城轨高架桥工程安全文明施工费'] = {
+            base: 'CGGJQGCAQWMSGF', class: 'CSXM',
             cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE],   // 以税前工程造价作为累进基数,因此配置沿用{税前工程造价}
-            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]},
-        '城轨地下工程安全文明施工费': {base: 'CGDXGCAQWMSGF', class: 'CSXM',
+            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]
+        };
+        baseFigureMap['城轨地下工程安全文明施工费'] = {
+            base: 'CGDXGCAQWMSGF', class: 'CSXM',
             cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE],   // 以税前工程造价作为累进基数,因此配置沿用{税前工程造价}
-            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]},
-        '城轨轨道工程安全文明施工费': {base: 'CGGDGCAQWMSGF', class: 'CSXM',
+            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]
+        };
+        baseFigureMap['城轨轨道工程安全文明施工费'] = {
+            base: 'CGGDGCAQWMSGF', class: 'CSXM',
             cycleCalcRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.OTHER, fixedFlag.CHARGE],   // 以税前工程造价作为累进基数,因此配置沿用{税前工程造价}
-            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]},
-    };
+            multiRef: [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE, fixedFlag.OTHER, fixedFlag.CHARGE]
+        };
+    }
 }
+
 if(typeof baseFigureTemplate !== 'undefined'){
     baseFigureTemplate['ZZS'] =  function (tender) {//增值税
         let feeField = 'common',