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

public/web/tree_sheet/tree_sheet_helper.js

@@ -703,7 +703,7 @@ var TREE_SHEET_HELPER = {
         },600)
     },
     delayShowTips:function(hitinfo,setting,tips){//延时显示
-        let delayTimes = 500; //延时时间
+        let delayTimes = 200; //延时时间
         let now_timeStamp = +new Date();
         TREE_SHEET_HELPER.tipTimeStamp = now_timeStamp;
         setTimeout(function () {

web/building_saas/main/js/views/main_tree_col.js

@@ -33,7 +33,9 @@ let MainTreeCol = {
         // CSL, 2017-11-28
         calcProgramName: function (node) {
             let programID = node.data.programID;
-            if (!programID) return
+            if (!programID){
+              return node.sourceType === projectObj.project.Bills.getSourceType()?"":"请选择…";
+            } 
             else return projectObj.project.calcProgram.compiledTemplateMaps[programID];
         },
         calcBase: function (node) {