|
@@ -205,8 +205,9 @@ let gljUtil = {
|
|
|
}
|
|
}
|
|
|
return scMathUtil.roundForObj(p,price_hasM_decimal);
|
|
return scMathUtil.roundForObj(p,price_hasM_decimal);
|
|
|
}else {
|
|
}else {
|
|
|
- let tem_decimal = isRadio==true?process_decimal:price_decimal;
|
|
|
|
|
- return scMathUtil.roundForObj(parseFloat(glj.unit_price.market_price)*priceCoe,tem_decimal);
|
|
|
|
|
|
|
+ let tem_decimal =price_decimal; //isRadio==true?process_decimal:price_decimal;
|
|
|
|
|
+ let tem_price = scMathUtil.roundForObj(glj.unit_price.market_price,price_decimal);
|
|
|
|
|
+ return scMathUtil.roundForObj(tem_price*priceCoe,tem_decimal);
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
getBasePrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil) {
|
|
getBasePrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil) {
|
|
@@ -232,7 +233,7 @@ let gljUtil = {
|
|
|
}
|
|
}
|
|
|
return scMathUtil.roundForObj(p,price_hasM_decimal);
|
|
return scMathUtil.roundForObj(p,price_hasM_decimal);
|
|
|
}else {
|
|
}else {
|
|
|
- let tem_decimal = isRadio==true?process_decimal:price_decimal;
|
|
|
|
|
|
|
+ let tem_decimal =price_decimal; //isRadio==true?process_decimal:price_decimal;
|
|
|
return scMathUtil.roundForObj(glj.unit_price.base_price,tem_decimal);
|
|
return scMathUtil.roundForObj(glj.unit_price.base_price,tem_decimal);
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
@@ -245,7 +246,7 @@ let gljUtil = {
|
|
|
if (glj.unit_price.type == this.gljType.LABOUR || glj.unit_price.type == this.gljType.MACHINE_LABOUR) {//人工、机上人工，调整价根据定额价*调整系数计算得出。
|
|
if (glj.unit_price.type == this.gljType.LABOUR || glj.unit_price.type == this.gljType.MACHINE_LABOUR) {//人工、机上人工，调整价根据定额价*调整系数计算得出。
|
|
|
let labour = _.find(labourCoeDatas.coes,{'ID':glj.adjCoe});
|
|
let labour = _.find(labourCoeDatas.coes,{'ID':glj.adjCoe});
|
|
|
let coe = labour && labour.coe ? labour.coe : 1;
|
|
let coe = labour && labour.coe ? labour.coe : 1;
|
|
|
- return scMathUtil.roundTo(parseFloat(coe * scMathUtil.roundForObj(glj.unit_price.base_price,tem_decimal)), -tem_decimal);
|
|
|
|
|
|
|
+ return scMathUtil.roundTo(parseFloat(coe * scMathUtil.roundForObj(glj.unit_price.base_price,decimal)), -decimal);
|
|
|
} else if (notEditType.indexOf(glj.unit_price.type)!=-1&&glj.ratio_data.length>0) {//对于混凝土、配合比、砂浆、机械台班，调整价根据组成物计算得出。
|
|
} else if (notEditType.indexOf(glj.unit_price.type)!=-1&&glj.ratio_data.length>0) {//对于混凝土、配合比、砂浆、机械台班，调整价根据组成物计算得出。
|
|
|
let p =0;
|
|
let p =0;
|
|
|
for(let ratio of glj.ratio_data){
|
|
for(let ratio of glj.ratio_data){
|
|
@@ -264,7 +265,7 @@ let gljUtil = {
|
|
|
}
|
|
}
|
|
|
return scMathUtil.roundForObj(p,price_hasM_decimal);
|
|
return scMathUtil.roundForObj(p,price_hasM_decimal);
|
|
|
} else {//对于其他普通材料等，无调整系数，调整价=定额价。
|
|
} else {//对于其他普通材料等，无调整系数，调整价=定额价。
|
|
|
- return scMathUtil.roundForObj(glj.unit_price.base_price,tem_decimal)
|
|
|
|
|
|
|
+ return scMathUtil.roundForObj(glj.unit_price.base_price,decimal)
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
calcPriceDiff:function (glj,calcOptions) {
|
|
calcPriceDiff:function (glj,calcOptions) {
|
