fix: BUG修改
This commit is contained in:
parent
a509514d69
commit
e2a3cd3285
@ -588,7 +588,7 @@ const getSubItemList = async () => {
|
|||||||
recordData.value = [];
|
recordData.value = [];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let sumRowData = {
|
let sumRowData: any = {
|
||||||
// 自定义表格合计行
|
// 自定义表格合计行
|
||||||
reportContent: "合计:",
|
reportContent: "合计:",
|
||||||
totalAmount: 0,
|
totalAmount: 0,
|
||||||
@ -608,7 +608,7 @@ const getSubItemList = async () => {
|
|||||||
symbolSum: true
|
symbolSum: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
reportContent: "按合同约定进度款按每月实际完成工程造价的80%支付=(11)*80%",
|
reportContent: "按合同约定进度款按每月实际完成工程造价的80%支付=(9)*80%",
|
||||||
amount: res2.result ? +res2.result.payment : 0,
|
amount: res2.result ? +res2.result.payment : 0,
|
||||||
key: "payment",
|
key: "payment",
|
||||||
symbolSum: true
|
symbolSum: true
|
||||||
@ -636,24 +636,29 @@ const getSubItemList = async () => {
|
|||||||
responseArr = res.result;
|
responseArr = res.result;
|
||||||
responseArr.map(item => {
|
responseArr.map(item => {
|
||||||
if (item.totalAmount) {
|
if (item.totalAmount) {
|
||||||
sumRowData.totalAmount += item.totalAmount;
|
sumRowData.totalAmount += item.totalAmount * 100;
|
||||||
}
|
}
|
||||||
if (item.completeAmount) {
|
if (item.completeAmount) {
|
||||||
sumRowData.completeAmount += +item.completeAmount;
|
sumRowData.completeAmount += +item.completeAmount * 100;
|
||||||
}
|
}
|
||||||
if (item.lastEndAmount) {
|
if (item.lastEndAmount) {
|
||||||
sumRowData.lastEndAmount += +item.lastEndAmount;
|
sumRowData.lastEndAmount += +item.lastEndAmount * 100;
|
||||||
}
|
}
|
||||||
if (item.nowEndAmount) {
|
if (item.nowEndAmount) {
|
||||||
sumRowData.nowEndAmount += +item.nowEndAmount;
|
sumRowData.nowEndAmount += +item.nowEndAmount * 100;
|
||||||
}
|
}
|
||||||
if (item.scheduleRatio) {
|
if (item.scheduleRatio) {
|
||||||
sumRowData.scheduleRatio += +item.scheduleRatio;
|
sumRowData.scheduleRatio += +item.scheduleRatio * 100;
|
||||||
}
|
}
|
||||||
if (item.completeScheduleRatio) {
|
if (item.completeScheduleRatio) {
|
||||||
sumRowData.completeScheduleRatio += +item.completeScheduleRatio;
|
sumRowData.completeScheduleRatio += +item.completeScheduleRatio * 100;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
for (let i in sumRowData) {
|
||||||
|
if (i != "reportContent") {
|
||||||
|
sumRowData[i] = sumRowData[i] / 100;
|
||||||
|
}
|
||||||
|
}
|
||||||
responseArr.push(sumRowData);
|
responseArr.push(sumRowData);
|
||||||
responseArr2.map(item => {
|
responseArr2.map(item => {
|
||||||
responseArr.push(item);
|
responseArr.push(item);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user