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

public/web/tree_sheet/tree_sheet_helper.js

@@ -692,7 +692,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/html/main.html

@@ -375,7 +375,7 @@
                                 id="apply_mbzm">应用</button>
                               <label class="applySuccess"><i class="fa fa-check" aria-hidden="true"></i>成功</label>
                               <button class=" btn btn-primary btn-sm cus-width" type="button"
-                                id="next_mbzm">下一条</button>
+                                id="next_mbzm" data-toggle="tooltip" data-placement="right" data-original-title="跳转到下一条有模板子目内容的定额">下一条</button>
                             </div>
 
                           </div>

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

@@ -321,8 +321,14 @@ let MainTreeCol = {
         unit: function (node,setting) {
             let tips = "";
             //在这里做要不要显示的判断
-             if(node.sourceType == ModuleNames.bills &&projectObj.ifItemCharHiden(setting)){//清单、并且项目特征列隐藏的时候悬浮提示
-                tips = node.data.itemCharacterText?node.data.itemCharacterText:'';
+             if(node.sourceType == ModuleNames.bills){//清单悬浮提示
+                //显示工程量计算规则
+                if(node.data.ruleText){
+                    tips += `<label class="font_blue">工程量计算规则：<br>${node.data.ruleText.replace(/\n/g,"<br>")}</label>`; 
+                }
+                if(projectObj.ifItemCharHiden(setting)){//项目特征列隐藏的时候
+                    tips += node.data.itemCharacterText?`<br>${node.data.itemCharacterText}`:'';
+                } 
              }
             if(node.sourceType == ModuleNames.ration && node.data.type == rationType.ration){//定额类型时，显示人材机，工作内容等
                 //这里的人材机需要进行过滤，在初始化时组装会影响性能，应实时显示