|
@@ -302,7 +302,7 @@ async function getBudgetSummayDatas(projectIDs, userID, compilationID, overWrite
|
|
|
};
|
|
};
|
|
|
return result;
|
|
return result;
|
|
|
} catch (e) {
|
|
} catch (e) {
|
|
|
- console.log(e)
|
|
|
|
|
|
|
+ console.log(e.message)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -316,8 +316,8 @@ function getReportData(nameList, items, prjTypeNames, compilationScopes, decimal
|
|
|
overWrite = require("../../.." + overWriteUrl);
|
|
overWrite = require("../../.." + overWriteUrl);
|
|
|
}
|
|
}
|
|
|
setChildrenDatas(items, datas);
|
|
setChildrenDatas(items, datas);
|
|
|
- recalcTotalItem(one_to_four_Item, datas, isProgressiveType, progressiveInterval);
|
|
|
|
|
- recalcTotalItem(totalItem, datas, isProgressiveType, progressiveInterval);
|
|
|
|
|
|
|
+ if (one_to_four_Item) recalcTotalItem(one_to_four_Item, datas, isProgressiveType, progressiveInterval);
|
|
|
|
|
+ if (totalItem) recalcTotalItem(totalItem, datas, isProgressiveType, progressiveInterval);
|
|
|
for (let d of datas) {
|
|
for (let d of datas) {
|
|
|
if (d.billsTtlPrice && totalItem.billsTtlPrice) {
|
|
if (d.billsTtlPrice && totalItem.billsTtlPrice) {
|
|
|
d['各项费用比例'] = scMathUtil.roundForObj(d.billsTtlPrice / totalItem.billsTtlPrice * 100, 2)
|
|
d['各项费用比例'] = scMathUtil.roundForObj(d.billsTtlPrice / totalItem.billsTtlPrice * 100, 2)
|
