|
|
@@ -244,7 +244,7 @@ var installation_fee = {
|
|
|
}
|
|
|
for(let d of me.datas){
|
|
|
for(let item of d.installFeeItem){
|
|
|
- if(item.isCal == 1){ //勾选了记取的费用项
|
|
|
+ //if(item.isCal == 1){ //勾选了记取的费用项 ------------------------------- 2019-07-12 需求修改，这里改成计算的时候不判断是否计取，直接按定额下的安装增加费的设置情况进行计算
|
|
|
let rule_ration_map = {};//费用规则定额映射表;
|
|
|
let ra_installs = rationInstallation.getCalcRIByItemID(d.libID,item.ID);//取所有有效的定额安装增加费
|
|
|
for(let ri of ra_installs){
|
|
|
@@ -260,7 +260,7 @@ var installation_fee = {
|
|
|
for(let ruleIDKey in rule_ration_map){
|
|
|
calcEachRule(item,d.libID,ruleIDKey,rule_ration_map[ruleIDKey],rationKeyMap,newBills);
|
|
|
}
|
|
|
- }
|
|
|
+ //}
|
|
|
}
|
|
|
}
|
|
|
let updateData = {
|
