Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

config/gulpConfig.js

@@ -133,6 +133,7 @@ module.exports = {
         'web/building_saas/report/js/rpt_cfg_const.js',
         'web/building_saas/report/js/jpc_output_value_define.js',
         'web/building_saas/report/js/jpc_output.js',
+        'web/building_saas/report/js/rpt_print.js',
         'web/building_saas/main/js/views/character_content_view.js',
         'web/building_saas/main/js/views/glj_view.js',
         'web/building_saas/main/js/views/zmhs_view.js',

web/building_saas/report/js/rpt_main.js

@@ -46,6 +46,13 @@ let zTreeOprObj = {
                 }
             }
             private_remove_hide_item(result);
+            for (let topNode of result) {
+                if (topNode.userId === "-100") {
+                    topNode.name = topNode.name + " - 标准报表";
+                } else {
+                    topNode.name = topNode.name + " - 定制报表";
+                }
+            }
             zTreeHelper.createTreeDirectly(result, rpt_tpl_setting, "rptTplTree", me);
             me.refreshNodes();
         }, null, null);