|
@@ -409,7 +409,7 @@ let calcTools = {
|
|
|
if (priceType == priceTypes.ptBasePrice){ price = me.uiGLJPrice(glj["basePrice"], glj);}
|
|
|
else if (priceType == priceTypes.ptAdjustPrice){price = aprice;}
|
|
|
else if (priceType == priceTypes.ptMarketPrice){price = mprice;}
|
|
|
- if (projectObj.project.property.areaSetting && treeNode.data.areaIncreaseFee){
|
|
|
+ /*if (projectObj.project.property.areaSetting && treeNode.data.areaIncreaseFee){
|
|
|
let p;
|
|
|
if ([gljType.LABOUR].includes(glj.type))
|
|
|
p = projectObj.project.property.areaSetting.labour
|
|
@@ -418,7 +418,7 @@ let calcTools = {
|
|
|
else if ([gljType.GENERAL_MACHINE].includes(glj.type))
|
|
|
p = projectObj.project.property.areaSetting.machine;
|
|
|
qty = qty * (1 + p * 0.01).toDecimal(decimalObj.process);
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
temp = (qty * price).toDecimal(decimalObj.process);
|
|
|
result = (result + temp).toDecimal(decimalObj.process);
|