|
@@ -85,10 +85,10 @@ $(document).ready(() => {
|
|
|
return ZhCalc.round(data.unit_price, unitPriceUnit);
|
|
|
},
|
|
|
oa_tp: function (data) {
|
|
|
- return ZhCalc.round(ZhCalc.mul(data.unit_price, data.oamount), totalPriceUnit);
|
|
|
+ return ZhCalc.round(ZhCalc.mul(data.unit_price, ZhCalc.round(data.oamount, findDecimal(data.unit))), totalPriceUnit);
|
|
|
},
|
|
|
ca_tp: function (data) {
|
|
|
- return ZhCalc.round(ZhCalc.mul(data.unit_price, data.camount), totalPriceUnit);
|
|
|
+ return ZhCalc.round(ZhCalc.mul(data.unit_price, ZhCalc.round(data.camount, findDecimal(data.unit))), totalPriceUnit);
|
|
|
},
|
|
|
oamount: function (data) {
|
|
|
return ZhCalc.round(data.oamount, findDecimal(data.unit));
|
|
@@ -110,7 +110,8 @@ $(document).ready(() => {
|
|
|
setAuditValue: function () {
|
|
|
for (const c of changeList) {
|
|
|
for (const j of aidList) {
|
|
|
- c['sa_tp_' + j] = ZhCalc.round(ZhCalc.mul(c['audit_amount_' + j], c.unit_price), totalPriceUnit);
|
|
|
+ c['audit_amount_' + j] = ZhCalc.round(c['audit_amount_' + j], findDecimal(c.unit);
|
|
|
+ c['sa_tp_' + j] = ZhCalc.round(ZhCalc.mul(c['audit_amount_' + j], ZhCalc.round(c.unit_price, unitPriceUnit)), totalPriceUnit);
|
|
|
}
|
|
|
}
|
|
|
// const rowCount = changeSpreadSheet.getRowCount();
|