1.导入基数处理bug

2.优化loadData后的fees字段初始化(getFeeIndex)

web/building_saas/js/global.js

@@ -142,10 +142,14 @@ function getFeeIndex(fees) {
     let feesIndex = {};
     if (fees) {
         for(let fee of fees){
-            fee.unitFee = parseFloat(fee.unitFee);
-            fee.totalFee = parseFloat(fee.totalFee);
-            fee.tenderUnitFee = parseFloat(fee.tenderUnitFee);
-            fee.tenderTotalFee = parseFloat(fee.tenderTotalFee);
+            const parsedUnitFee = parseFloat(fee.unitFee);
+            const parsedTotalFee = parseFloat(fee.totalFee);
+            const parsedTenderUnitFee = parseFloat(fee.tenderUnitFee);
+            const parsedTenderTotalFee = parseFloat(fee.tenderTotalFee);
+            fee.unitFee = parsedUnitFee || 0;
+            fee.totalFee = parsedTotalFee || 0;
+            fee.tenderUnitFee = parsedTenderUnitFee || 0;
+            fee.tenderTotalFee = parsedTenderTotalFee || 0;
             feesIndex[fee.fieldName] = fee;
         }
     }

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

@@ -1589,7 +1589,6 @@ let calcBase = {
             if(!cbTools.isDef(exp)){
                 throw '表达式不正确';
             }
-
             //输入式转换表达式
             let compileExp = $CBP.toCompileExpr(exp);
             //计算

web/building_saas/main/js/models/importStandardInterface.js

@@ -1429,7 +1429,7 @@ const ImportXML = (() => {
             if (!match) {
                 return false;
             }
-            return match.some(item => bills.calcBase.match(new RegExp(`${item}\\b`)));
+            return match.some(item => bills.calcBase.match(new RegExp(`\\b${item}\\b`)));
         }
         //转换计算基数
         //1.有子项数据，则清空基数