Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost into 1.0.0_online

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
 };
 

public/scHintBox.html

@@ -34,6 +34,7 @@
         </div>
     </div>
 </div>
+<div class="modal" id="waitBox_form" style="z-index: 9999; cursor: wait"></div>
 
 <script>
     const hintBox = {
@@ -159,6 +160,12 @@
             $('#hintBox_btn_no').click(hintBox.defalultEvent);
 
             $("#hintBox_form").modal('show');
+        },
+        waitBox: function () {
+            $(`#waitBox_form`).modal({'backdrop': false});
+        },
+        unWaitBox: function () {
+            $('#waitBox_form').modal('hide');
         }
     };
 

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');

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;
                 }

web/building_saas/report/js/rpt_main.js

@@ -242,10 +242,7 @@ let zTreeOprObj = {
     },
     requestReport: function (params) {
         let me = zTreeOprObj;
-        // $("rptCanvas").css("cursor")
-        let canvas = document.getElementById("rptCanvas");
-        canvas.style.cursor = "wait";
-        canvas.parentNode.style.cursor = "wait";
+        hintBox.waitBox();
         CommonAjax.postEx("report_api/getReport", params, 5000, true,
             function(result){
                 let pageRst = result;
@@ -264,12 +261,12 @@ let zTreeOprObj = {
                         canvas.height = size[1] + 50;
                     }
                     me.showPage(1, canvas);
-                    canvas.parentNode.style.cursor = "default";
+                    hintBox.unWaitBox();
                 }
             }, function(err){
-                canvas.parentNode.style.cursor = "default";
+                hintBox.unWaitBox();
             }, function(ex){
-                canvas.parentNode.style.cursor = "default";
+                hintBox.unWaitBox();
             }
         );
     },