Browse Source

Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/YangHuCost

TonyKang 6 years ago
parent
commit
50fefa0c51
1 changed files with 4 additions and 1 deletions
  1. 4 1
      web/building_saas/main/js/models/calc_base.js

+ 4 - 1
web/building_saas/main/js/models/calc_base.js

@@ -400,7 +400,10 @@ let cbTools = {
         if (this.isUnDef(bills.feesIndex) || _.isEmpty(bills.feesIndex)) {
             return 0;
         }
-        return this.isDef(bills.feesIndex[feeField]) && this.isDef(bills.feesIndex[feeField][subFeeField]) ? bills.feesIndex[feeField][subFeeField] : 0;
+        return this.isDef(bills.feesIndex[feeField]) &&
+               this.isDef(bills.feesIndex[feeField][subFeeField]) &&  !isNaN(bills.feesIndex[feeField][subFeeField])
+               ? bills.feesIndex[feeField][subFeeField]
+               : 0;
     },
     //获取扣除固定项后的金额,扣除其节点后重新汇总
     //@param {Number}fixedFlag(基数取值固定行类别) {Array}deductFlags(扣除的固定类别组) {String}fullFeeField(完整的取费字段: 'rationCommon.totalFee')