Browse Source

fix: 重庆养护,套用定额,混凝土替换为商品砼后卡死。

zhangweicheng 5 years ago
parent
commit
85095fbcaf
2 changed files with 1 additions and 2 deletions
  1. 0 1
      public/web/sheet/sheet_common.js
  2. 1 1
      web/building_saas/main/js/views/glj_view.js

+ 0 - 1
public/web/sheet/sheet_common.js

@@ -700,7 +700,6 @@ var sheetCommonObj = {
         };
         TipCellType.prototype.processMouseEnter = function (hitinfo) {
             let text = hitinfo.sheet.getText(hitinfo.row, hitinfo.col);
-            console.log(tips);
             let setting = {};
             if(!tips){
                 let value = hitinfo.sheet.getValue(hitinfo.row, hitinfo.col);

+ 1 - 1
web/building_saas/main/js/views/glj_view.js

@@ -1230,7 +1230,7 @@ var gljOprObj = {
     replaceProgramInfo:function(oldType,newType){
         //检查是否由混凝土替换为商品砼或者商品砂浆
         if(gljUtil.isConcreteToCommercialConcrete(oldType,newType)){
-            alert("请手动修改取费类别为构造物III");
+           setTimeout(()=>{alert("请手动修改取费类别为构造物III");},300); 
         }
     },