Pārlūkot izejas kodu

Merge branch 'budget' of http://192.168.1.41:3000/SmartCost/ConstructionCost into budget

zhangweicheng 4 gadi atpakaļ
vecāks
revīzija
7f48e00feb

+ 1 - 1
modules/equipment_purchase/facade/equipment_purchase_facade.js

@@ -72,7 +72,7 @@ async function getEquipmentSummary(projectIDs) {
             /*/
             // 以下是根据实际来调整
             if(map[projectID]) {
-                for (let item of map[e.projectID].equipments) {
+                for (let item of map[projectID].equipments) {
                     let dtlData = {projectID: -1, total: 0, equipSummaryType: 'budget_equipment'};
                     // 属性summaryType是作为一个判断依据给后来代码用
                     dtlData.projectID = projectID;

+ 2 - 1
modules/main/models/project_consts.js

@@ -57,7 +57,8 @@ let summaryConstList = [
     'Budget',
     'BudgetDetail',
     'BudgetCalcType',
-    'BudgetCalcTypeDetail'
+    'BudgetCalcTypeDetail',
+    'BudgetEquipmentDetail'
 ];
 
 let projectFieldConstList = [

+ 1 - 1
web/building_saas/budget-summary/js/budgetSummarySheet.js

@@ -1,11 +1,11 @@
 
+let budgetSummaryTreeSetting;
 /* 建设其他费表格相关 */
 const budgetSummaryObj = (() => {
 
   const { isEmptyVal, isDef, isNumber } = window.commonUtil;
   const { fixedFlag, BudgetArea, BudgetType } = window.commonConstants;
 
-  let budgetSummaryTreeSetting;
 
   let curBudgetType = BudgetType.BUILDING;