|
@@ -73,10 +73,10 @@ $(document).ready(() => {
|
|
|
return ZhCalc.round(data.unit_price, unitPriceUnit);
|
|
|
},
|
|
|
oa_tp: function (data) {
|
|
|
- return ZhCalc.round(ZhCalc.mul(data.unit_price, ZhCalc.round(data.oamount, findDecimal(data.unit))), totalPriceUnit);
|
|
|
+ return ZhCalc.round(ZhCalc.mul(ZhCalc.round(data.unit_price, unitPriceUnit), ZhCalc.round(data.oamount, findDecimal(data.unit))), totalPriceUnit);
|
|
|
},
|
|
|
ca_tp: function (data) {
|
|
|
- return ZhCalc.round(ZhCalc.mul(data.unit_price, ZhCalc.round(data.camount, findDecimal(data.unit))), totalPriceUnit);
|
|
|
+ return ZhCalc.round(ZhCalc.mul(ZhCalc.round(data.unit_price, unitPriceUnit), ZhCalc.round(data.camount, findDecimal(data.unit))), totalPriceUnit);
|
|
|
},
|
|
|
oamount: function (data) {
|
|
|
return ZhCalc.round(data.oamount, findDecimal(data.unit));
|
|
@@ -88,7 +88,7 @@ $(document).ready(() => {
|
|
|
return ZhCalc.round(data.samount, findDecimal(data.unit));
|
|
|
},
|
|
|
sa_tp: function (data) {
|
|
|
- return ZhCalc.round(ZhCalc.mul(data.unit_price, data.samount), totalPriceUnit);
|
|
|
+ return ZhCalc.round(ZhCalc.mul(ZhCalc.round(data.unit_price, unitPriceUnit), ZhCalc.round(data.samount, findDecimal(data.unit))), totalPriceUnit);
|
|
|
},
|
|
|
},
|
|
|
};
|