zhangweicheng 5 gadi atpakaļ
vecāks
revīzija
f121f3b012
1 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 3 3
      modules/main/facade/project_facade.js

+ 3 - 3
modules/main/facade/project_facade.js

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