Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

modules/main/models/project_consts.js

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

modules/reports/util/rpt_construct_data_util.js

@@ -16,6 +16,8 @@ const gljUtil = require('../../../public/gljUtil');
 const gljType = require('../../common/const/glj_type_const');
 // const pm_facade = require('../../pm/facade/pm_facade');
 const GLJID_PRE = `gljId_`, COMPONENT_GLJID_PRE = `componetGljId_`;
+//import common_const = require('../../../public/common_constants');
+const { supplyType, supplyText } = require('../../../public/common_constants');
 
 
 const GLJ_TYPE = {
@@ -121,6 +123,23 @@ class Rpt_Common{
         }
         return rst;
     };
+    getSupplyType(srcValArr) {
+        let rst = [];
+        for (const val of srcValArr) {
+            let hasKey = false;
+            for (const propKey in supplyType) {
+                if (supplyType[propKey] === val) {
+                    hasKey = true;
+                    rst.push(supplyText[propKey]);
+                    break;
+                }
+            }
+            if (!hasKey) {
+                rst.push('未知方式');
+            }
+        }
+        return rst;    
+    };
 }
 
 class Rpt_Data_Extractor {

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);