Преглед изворни кода

fix(client): 累进计算的几个参数增加条件返回金额限制。

chenshilong пре 3 година
родитељ
комит
0a47bece68
1 измењених фајлова са 8 додато и 4 уклоњено
  1. 8 4
      web/over_write/js/hunan_2022.js

+ 8 - 4
web/over_write/js/hunan_2022.js

@@ -250,14 +250,16 @@ if (typeof baseFigureTemplate !== "undefined") {
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
-      return calculateUtil.getProgressiveFee(baseFee, "工程监理费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
+      const rst = calculateUtil.getProgressiveFee(baseFee, "工程监理费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
+      return Math.max(rst, 50000);
     },
     GCJLFWSXSHJL(tender) {
       const baseFee = this['DEJZAZGCF'](tender);
       if (!tender) {
           calcBase.baseProgressiveFee = baseFee;
       }
-      return calculateUtil.getProgressiveFee(baseFee, '工程监理费(未实行社会监理)', projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
+      const rst = calculateUtil.getProgressiveFee(baseFee, '工程监理费(未实行社会监理)', projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
+      return Math.max(rst, 50000); 
     },
     // {信息化费} 算法:以{定额建筑安装工程费}为基数,采用累进办法计算。仅清单固定类别是“养护工程其他费”部分可显示。(计算结果去掉不足10000元时按10000元计取)
     YHXMXXHF(tender) {
@@ -265,7 +267,8 @@ if (typeof baseFigureTemplate !== "undefined") {
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
-      return calculateUtil.getProgressiveFee(baseFee, "信息化费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
+      const rst = calculateUtil.getProgressiveFee(baseFee, "信息化费", projectObj.project.property.progressiveInterval, decimalObj.bills.totalPrice, deficiency);
+      return Math.max(rst, 100000);
     },
     // 施工场地建设费 算法:以{定额养护工程费}为基数,采用累进办法计算
     SGCDJSF(tender) {
@@ -337,13 +340,14 @@ if (typeof baseFigureTemplate !== "undefined") {
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
       }
-      return calculateUtil.getProgressiveFee(
+      const rst = calculateUtil.getProgressiveFee(
         baseFee,
         "工程设计费",
         projectObj.project.property.progressiveInterval,
         decimalObj.bills.totalPrice,
         deficiency
       );
+      return Math.max(rst, 35000);
     },
   };