|
@@ -216,12 +216,13 @@ let calcTools = {
|
|
|
if (priceType == priceTypes.ptBasePrice){ price = me.uiGLJPrice(glj["basePrice"]);}
|
|
|
else if (priceType == priceTypes.ptAdjustPrice){price = me.uiGLJPrice(glj["adjustPrice"]);}
|
|
|
else if (priceType == priceTypes.ptMarketPrice){price = me.uiGLJPrice(glj["marketPrice"]);}
|
|
|
- temp = (me.uiGLJQty(glj["quantity"]) * price).toDecimal(decimalObj.ration.unitPrice);
|
|
|
+ temp = (me.uiGLJQty(glj["quantity"]) * price).toDecimal(decimalObj.process);
|
|
|
};
|
|
|
-
|
|
|
- result = (result + temp).toDecimal(decimalObj.ration.unitPrice);
|
|
|
+ result = (result + temp).toDecimal(decimalObj.process);
|
|
|
};
|
|
|
};
|
|
|
+
|
|
|
+ result = result.toDecimal(decimalObj.ration.unitPrice);
|
|
|
return result;
|
|
|
},
|
|
|
machineLabourFee: function (gljArr) {
|