Commit a2f28482 by 宋祥

1.结算单明细累计结算工程量计算错误问题修复

parent 5ef8e4c4
...@@ -426,6 +426,8 @@ function calcTotalPrice(e, type) { ...@@ -426,6 +426,8 @@ function calcTotalPrice(e, type) {
let totalPrice = isBlank(taxPoints) ? totalTaxPrice : totalTaxPrice / (1 + taxPoints / 100); let totalPrice = isBlank(taxPoints) ? totalTaxPrice : totalTaxPrice / (1 + taxPoints / 100);
detail1Grid.setCellValue(item, 'totalPrice', parseFloat(totalPrice)); detail1Grid.setCellValue(item, 'totalPrice', parseFloat(totalPrice));
detail1Grid.setCellValue(item, 'thisEngineeringQuantity', thisEngineeringQuantity); detail1Grid.setCellValue(item, 'thisEngineeringQuantity', thisEngineeringQuantity);
// 计算累计工程量
queryCumulativeEngineeringQuantity(item);
} else { } else {
// 工程量 // 工程量
var thisEngineeringQuantity = parseFloat(item.thisEngineeringQuantity) || 0; var thisEngineeringQuantity = parseFloat(item.thisEngineeringQuantity) || 0;
...@@ -437,7 +439,7 @@ function calcTotalPrice(e, type) { ...@@ -437,7 +439,7 @@ function calcTotalPrice(e, type) {
let totalPrice = isBlank(taxPoints) ? totalTaxPrice : totalTaxPrice / (1 + taxPoints / 100); let totalPrice = isBlank(taxPoints) ? totalTaxPrice : totalTaxPrice / (1 + taxPoints / 100);
detail1Grid.setCellValue(item, 'totalPrice', parseFloat(totalPrice)); detail1Grid.setCellValue(item, 'totalPrice', parseFloat(totalPrice));
detail1Grid.setCellValue(item, 'totalTaxPrice', parseFloat(totalTaxPrice)); detail1Grid.setCellValue(item, 'totalTaxPrice', parseFloat(totalTaxPrice));
// 累计工程量 // 计算累计工程量
if (type == 2) { if (type == 2) {
queryCumulativeEngineeringQuantity(item); queryCumulativeEngineeringQuantity(item);
} }
......
...@@ -347,6 +347,8 @@ function calcTotalPrice(e, type) { ...@@ -347,6 +347,8 @@ function calcTotalPrice(e, type) {
let totalPrice = isBlank(taxPoints) ? totalTaxPrice : totalTaxPrice / (1 + taxPoints / 100); let totalPrice = isBlank(taxPoints) ? totalTaxPrice : totalTaxPrice / (1 + taxPoints / 100);
detail1Grid.setCellValue(item, 'totalPrice', parseFloat(totalPrice)); detail1Grid.setCellValue(item, 'totalPrice', parseFloat(totalPrice));
detail1Grid.setCellValue(item, 'thisEngineeringQuantity', thisEngineeringQuantity); detail1Grid.setCellValue(item, 'thisEngineeringQuantity', thisEngineeringQuantity);
// 计算累计工程量
queryCumulativeEngineeringQuantity(item);
} else { } else {
// 工程量 // 工程量
var thisEngineeringQuantity = parseFloat(item.thisEngineeringQuantity) || 0; var thisEngineeringQuantity = parseFloat(item.thisEngineeringQuantity) || 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment