Browse Source

code merge from 3.0.4_online

TonyKang 4 years ago
parent
commit
9d7c90bad6
2 changed files with 2 additions and 1 deletions
  1. 1 0
      modules/main/models/project_consts.js
  2. 1 1
      web/building_saas/report/js/rpt_main.js

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

@@ -42,6 +42,7 @@ let projectConstList = [
     // 'volume_price',
     'feeRate',
     'labour_coe',
+    'contractor_list',
     'calc_program'
 ];
 

+ 1 - 1
web/building_saas/report/js/rpt_main.js

@@ -29,7 +29,7 @@ let rptTplObj = {
             }
             //收集本单位工程所属的建设项目下所有单位工程id用
             me.project_tree = tree_Data_Helper.buildTreeNodeDirectly(JSON.parse(sessionStorage.getItem('projects_tree_data')), false);
-            // console.log(me.getAllPrjIds());
+            console.log(me.getAllPrjIds());
             // projectObj.project.projectInfo.ID
             // dynamicLoadJs('/lib/jspdf/SmartSimsun-normal.js');
             // dynamicLoadJs('/lib/jspdf/SmartSimsun-bold.js', me.pdfFontSimsunCallBack);