fix: 甘肃养护2021基数调整

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

@@ -1195,7 +1195,8 @@ let cbParser = {
   },
   //获取表达式中的中文式
   getCN: function (expr) {
-    let cnRex = /\d*[\u4e00-\u9fa5]{1,}\({0,}[\u4e00-\u9fa5]{0,}\*?\d*%*、?[\u4e00-\u9fa5]{0,}\){0,}[\u4e00-\u9fa5]{0,}/g;
+    //let cnRex = /\d*[\u4e00-\u9fa5]{1,}\({0,}[\u4e00-\u9fa5]{0,}\*?\d*%*、?[\u4e00-\u9fa5]{0,}\){0,}[\u4e00-\u9fa5]{0,}/g;
+    let cnRex = /\d*[\u4e00-\u9fa5]{1,}\({0,}[\u4e00-\u9fa5]{0,}\*?\d*%*、?[\u4e00-\u9fa5]{0,}\){0,}[\u4e00-\u9fa5]{0,}\(?[\u4e00-\u9fa5]{0,}\)?/g;
     return _.filter(expr.match(cnRex), function (data) {
       return data
     });

web/over_write/js/gansu_2021.js

@@ -211,7 +211,8 @@ if (typeof baseFigureTemplate !== 'undefined') {
             const afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, deductFlags, tender, feeField, false);
             //定额设备购置费
             const equipmentAcFee = cbTools.getBaseFee(deductFlags[0], tender, 'equipment');
-            return (afterDeductFee + equipmentAcFee * 0.4).toDecimal(decimalObj.bills.totalPrice);
+            const equipmentAcTaxFee = cbTools.getBaseFee(deductFlags[0], tender, 'tax');
+            return (afterDeductFee + equipmentAcFee * 0.4 + equipmentAcTaxFee).toDecimal(decimalObj.bills.totalPrice);
         },
         // 设备费 算法：取清单固定类别是“设备购置”的建安费
         SBF(tender) {
@@ -233,7 +234,8 @@ if (typeof baseFigureTemplate !== 'undefined') {
             const afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.MAINTENANCE_FEE, deductFlags, tender, feeField, false);
             //定额设备购置费
             const equipmentAcFee = cbTools.getBaseFee(deductFlags[0], tender, 'equipment');
-            return (afterDeductFee + equipmentAcFee * 0.4).toDecimal(decimalObj.bills.totalPrice);
+            const equipmentAcTaxFee = cbTools.getBaseFee(deductFlags[0], tender, 'tax');
+            return (afterDeductFee + equipmentAcFee * 0.4 + equipmentAcTaxFee).toDecimal(decimalObj.bills.totalPrice);
         },
         // 养护单位(业主)管理费 算法：以{定额建筑安装工程费}为基数，采用累进办法计算。。
         YHDWYZGLF(tender) {