Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

web/building_saas/main/js/models/calc_base.js

@@ -548,7 +548,7 @@ let cbTools = {
     const allSubNodes = [];
     projectObj.project.mainTree.getAllSubNode(fixedNode, allSubNodes);
     let equipmentNodes = allSubNodes.filter((node) => node.data.type === rationType.gljRation && node.data.subType === gljType.EQUIPMENT);
-    if (!isLowVer("3000703")) equipmentNodes = cleanDirtyData(equipmentNodes); // 旧项目，为保证数据不变，将错就错，不过滤脏数据。
+    if (!isLowVer(historyVer1)) equipmentNodes = cleanDirtyData(equipmentNodes); // 旧项目，为保证数据不变，将错就错，不过滤脏数据。
     const subFeeField = tender ? "tenderTotalFee" : "totalFee";
     let totalEquipmentFee = 0;
     for (const node of equipmentNodes) {
@@ -837,7 +837,7 @@ let baseFigureTemplate = {
     // {定额建安费(不含定额设备购置费)} 汇总非设备类型的定额的定额建安费
     DEJAFBHDESBGZF: function (tender) {
       debugger;
-      if (isLowVer("3000703")) {
+      if (isLowVer(historyVer1)) {
         const feeField = "rationCommon";
         const subFeeField = tender ? "tenderTotalFee" : "totalFee";
         let rations = projectObj.project.Ration.datas.filter((ration) => !(ration.type === rationType.gljRation && ration.subType === gljType.EQUIPMENT));

web/building_saas/main/js/models/calc_data_tool.js

@@ -1,3 +1,5 @@
+var historyVer1 = '3000703';
+
 function isLowVer(ver) {
   var fileVer = projectObj.project.projectInfo.fileVer;
   return fileVer <= ver;

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

@@ -2090,9 +2090,9 @@ class CalcProgram {
 
       // 数量、金额时，同步定额建安费。（3000703及以下版本，漏掉了根节点固定ID为19的判断。新版本补上。因影响计算结果，版本分隔）
       var need = false;
-      if (isLowVer("3000703") && calcTools.isInheritFrom(treeNode, 1)) need = true;
+      if (isLowVer(historyVer1) && calcTools.isInheritFrom(treeNode, 1)) need = true;
       if (
-        !isLowVer("3000703") &&
+        !isLowVer(historyVer1) &&
         (calcTools.isInheritFrom(treeNode, fixedFlag.CONSTRUCTION_INSTALL_FEE) || calcTools.isInheritFrom(treeNode, fixedFlag.ONE_SEVEN_BILLS))
       )
         need = true;

web/over_write/js/hunan_2022.js

@@ -268,8 +268,7 @@ if (typeof baseFigureTemplate !== "undefined") {
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
-      const rst = calculateUtil.getProgressiveFee(baseFee, "信息化费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
-      return Math.max(rst, 100000);
+      return calculateUtil.getProgressiveFee(baseFee, "信息化费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
     },
     // 施工场地建设费 算法：以{定额养护工程费}为基数，采用累进办法计算
     SGCDJSF(tender) {