优化显示

web/building_saas/main/js/views/project_glj_view.js

@@ -269,29 +269,13 @@ projectGljObject={
       $.bootstrapLoading.end();
       return result;
     },
-    getSelectedProjectGLJ:function () {
-        let me = this,data = null;
-        let sheet = me.projectGljSpread.getActiveSheet();
-        if(sheet.name() == 'projectGljSheet'){//projectGljSheet/materialSheet 工料机汇总和三材汇总表
-            let sel = me.projectGljSheet.getSelections()[0];
-            let srow = sel.row == -1||sel.row == ""?0:sel.row;
-            if(me.projectGljSheetData.length>srow){
-                data = me.projectGljSheetData[srow];
-            }
-        }else if(sheet.name() == 'materialTreeSheet'){
-            if(this.materialTree.selected){
-                data = this.materialTree.selected.data;
-            }
-        }
-        return data;
-    },
 
     showMixRatioData:function () {
         let me = this,gljId = null,gljType = null;
         if(!$('#mixRatio-nav').hasClass('active')) return;
         me.mixRatioSpread.setActiveSheetIndex(0);
         let oldSel = me.mixRatioSheet.getSelections()[0];
-        let projectGLJData = me.getSelectedProjectGLJ();
+        let projectGLJData = me.getProjectGLJSelected();
         if(projectGLJData){
             gljId = projectGLJData.id;
             gljType = projectGLJData.type;
@@ -316,10 +300,10 @@ projectGljObject={
         })
     },
     showRelatedRationDatas:function(){
-      let me = this,gljId = null,gljType = null;
+      let me = this;
       if(!$('#ration-nav').hasClass('active')) return;
       me.mixRatioSpread.setActiveSheetIndex(1);
-      let projectGLJData = me.getSelectedProjectGLJ();
+      let projectGLJData = me.getProjectGLJSelected();
       let rationIDMap = {};
       let rations = [];
       if(projectGLJData){
@@ -656,7 +640,7 @@ projectGljObject={
         }
        // parentBasePrice = scMathUtil.roundForObj(parentBasePrice,getDecimal("glj.unitPrice"));
         parentMarketPrice = scMathUtil.roundForObj(parentMarketPrice,getDecimal("glj.unitPrice"));
-        let parentData = me.getSelectedProjectGLJ();
+        let parentData = me.getProjectGLJSelected();
         if(parentData){  //计算受影响的综合电价
             let ext = {};
             ext[parentData.id] = {marketPrice:parentMarketPrice};
@@ -964,7 +948,7 @@ projectGljObject={
         let me = this, deleteRecode = me.mixRatioData[row];
         let consumption = deleteRecode.consumption;
         let [parentMarketPrice, parentBasePrice] = me.getCompositionSumPrice('delete', row);
-        let prowData =  me.getSelectedProjectGLJ();
+        let prowData =  me.getProjectGLJSelected();
         let updateData = {id: deleteRecode.mix_ratio_id, field: 'mix_ratio.consumption' , value: 0, market_price: parentMarketPrice, base_price: parentBasePrice};
         let ext = {};
         ext[prowData.id] = {marketPrice:parentMarketPrice};
@@ -1104,21 +1088,21 @@ projectGljObject={
         return sheetCommonObj.checkData(col,setting, value);
     },
     getProjectGLJSelected:function () {
-        let me = projectGljObject;
-        let sheet = me.projectGljSpread.getActiveSheet();
-        let selectedProjectGLJ = null;
-        if(sheet.name() == 'projectGljSheet'){//projectGljSheet/materialSheet 工料机汇总和三材汇总表
-            let sel = me.projectGljSheet.getSelections()[0];
-            if(sel.row != -1 && me.projectGljSheetData.length>sel.row){
-                selectedProjectGLJ = me.projectGljSheetData[sel.row]
-            }
-        }else if(sheet.name() == 'materialTreeSheet' ){
-            if(me.materialTree.selected){
-                selectedProjectGLJ = me.materialTree.selected.data;
-            }
-        }
-        return selectedProjectGLJ;
-    },
+      let me = this,data = null;
+      let sheet = me.projectGljSpread.getActiveSheet();
+      if(sheet.name() == 'projectGljSheet'){//projectGljSheet/materialSheet 工料机汇总和三材汇总表
+          let sel = me.projectGljSheet.getSelections()[0];
+          let srow = sel.row == -1||sel.row == ""?0:sel.row;
+          if(me.projectGljSheetData.length>srow){
+              data = me.projectGljSheetData[srow];
+          }
+      }else if(sheet.name() == 'materialTreeSheet'){
+          if(this.materialTree.selected){
+              data = this.materialTree.selected.data;
+          }
+      }
+      return data;
+  },
     initProjectGljRightClick:function(){
         //如果当前行是无组成物的“普通材料”、“绿化苗木”、“外购砼构件”、“商品混凝土”、“商品砂浆”，则右键“添加计算材料”按钮有效。
         let me = this;
@@ -1304,6 +1288,7 @@ function getProjectResizeEles() {
 
 
 function loadProjectGljSize() {
+    if(!$('#project-glj-main').is(':visible')) return;
     let me = projectGljObject;
     let pojGljResizeEles = getProjectResizeEles();
     SlideResize.loadVerticalHeight(pojGljResizeEles.eleObj.module, pojGljResizeEles.eleObj, pojGljResizeEles.limit, function () {
@@ -1583,8 +1568,7 @@ $(function () {
     $("#ration-nav").on('shown.bs.tab', function () {
       projectGljObject.mixRatioSpread.refresh();
       projectGljObject.showRelatedRationDatas();
-      console.log('hehe');
-  });
+    });
 });