Browse Source

bug fixed

zhangweicheng 6 years atrás
parent
commit
411757b4bd

+ 1 - 1
modules/pm/models/project_property_template.js

@@ -15,7 +15,7 @@ const defaultDecimal = {
 const displaySetting = {
     autoHeight:true,
     billsAutoHeight:true,
-    rationAutoHeight:false,
+    rationAutoHeight:true,
     disPlayMainMaterial:false
 };
 

+ 1 - 3
public/web/tree_sheet/tree_sheet_helper.js

@@ -510,15 +510,13 @@ var TREE_SHEET_HELPER = {
                     $(this._toolTipElement).css("top", setting.pos.y + hitinfo.y + 15).css("left", marginLeftMouse ? setting.pos.x + marginLeftMouse : setting.pos.x);
                 }
                 else {
-                    $(this._toolTipElement).css("top", setting.pos.y + hitinfo.cellRect.y -$(this._toolTipElement).height()-10 ).css("left", setting.pos.x + hitinfo.cellRect.x + hitinfo.cellRect.width);
+                    $(this._toolTipElement).css("top", setting.pos.y + hitinfo.cellRect.y ).css("left", setting.pos.x + hitinfo.cellRect.x + hitinfo.cellRect.width);
                 }
                 $(this._toolTipElement).show("fast");
                 TREE_SHEET_HELPER.tipDiv = 'show';//做个标记
             }
         }
     },
-
-
     tipDivCheck(){
         setTimeout(function () {
             let tips = $('#autoTip');

+ 2 - 4
web/building_saas/main/js/views/fee_rate_view.js

@@ -556,14 +556,12 @@ var feeRateObject={
             if(!me.mainFeeRateEditChecking(c.row, c.col)){
                 me.mainFeeRateSheet.setValue(c.row, c.col, oldValue);
                 continue;
-            }else if(fieldID == 'rate'&&value != null){
+            }else if(fieldID == 'rate'&&value !== null && value!==0){
                 let checkResult = scMathUtil.isNumOrFormula(value);
                 if(checkResult!=null && !isNaN(checkResult)){
                     value = scMathUtil.roundForObj(checkResult,getDecimal("feeRate"));
                 }else {
-                    setTimeout(function () {
-                        alert('当前输入的数据类型不正确,请重新输入。');
-                    },100);
+                    alert('当前输入的数据类型不正确,请重新输入。');
                     me.mainFeeRateSheet.setValue(c.row, c.col, oldValue);
                     continue;
                 }