bugs

web/building_saas/main/js/models/calc_program.js

@@ -736,7 +736,7 @@ let calcTools = {
     uiGLJPrice: function (price, glj){
         if (price){
             let projGLJ = glj ? calcTools.getProjectGLJ(glj) : null;
-            let d = (projGLJ&&projGLJ.ratio_data.length > 0) ? decimalObj.glj.unitPriceHasMix : decimalObj.glj.unitPrice;
+            let d = (projGLJ && projGLJ.ratio_data.length > 0) ? decimalObj.glj.unitPriceHasMix : decimalObj.glj.unitPrice;
             return parseFloat(price).toDecimal(d);
         }
         else return 0;
@@ -1805,9 +1805,7 @@ class CalcProgram {
             projectObj.mainController.refreshTreeNode(treeNodes);
 
             // 批量树结点计算后，计算程序早已物是人非，所以这里要重新计算一下。
-            if (activeSubSheetIs(subSheetIndex.ssiCalcProgram)) {
-                calcProgramObj.refreshCurNodeCalcItems(me.project.mainTree.selected);
-            };
+            if (activeSubSheetIsCalcProgram()) calcProgramObj.refreshCurCalcProgram();
             $.bootstrapLoading.end();
         });
     };

web/building_saas/main/js/models/ration_glj.js

@@ -166,9 +166,7 @@ var ration_glj = {
                 if(isDef(node)){
                     project.calcProgram.calcAndSave(node);
                 }
-                if (activeSubSheetIs(subSheetIndex.ssiCalcProgram)) {
-                    calcProgramObj.showData(node, false);
-                }
+                if (activeSubSheetIsCalcProgram()) calcProgramObj.showData(node, false);
             });
         };
         ration_glj.prototype.getGljByRationID = function(rationID){

web/building_saas/main/js/views/calc_program_manage.js

@@ -178,6 +178,7 @@ let calcProgramManage = {
                     $.bootstrapLoading.end();
                 }
             });
+            if (activeSubSheetIsCalcProgram()) calcProgramObj.refreshCurCalcProgram();
         }
         else{
             let data = {

web/building_saas/main/js/views/calc_program_view.js

@@ -50,8 +50,9 @@ let calcProgramObj = {
         sheetCommonObj.showData(me.sheet, me.setting, me.datas);
     },
 
-    refreshCurNodeCalcItems: function (treeNode) {
+    refreshCurCalcProgram: function () {     // 刷新显示当前选中树结点的计算程序
         var me = this;
+        let treeNode = projectObj.project.mainTree.selected;
         me.treeNode = treeNode;
         projectObj.project.calcProgram.innerCalc(treeNode, []);
         delete treeNode.changed;

web/building_saas/main/js/views/project_view.js

@@ -36,9 +36,8 @@ var projectObj = {
             subViewObj.loadComments(node);
         }
         gljOprObj.showDataIfRationSelect(node);
-        if (activeSubSheetIs(subSheetIndex.ssiCalcProgram)) {
-            calcProgramObj.showData(node);
-        }
+        if (activeSubSheetIsCalcProgram()) calcProgramObj.showData(node);
+
         //zhong 2017-9-1 特征及内容
         if(pageCCOprObj.active){
             pageCCOprObj.mainActiveCell = projectObj.mainSpread.getActiveSheet().getSelections()[0];//mainSpread焦点单元格

web/building_saas/main/js/views/sub_view.js

@@ -366,6 +366,10 @@ function activeSubSheetIs(idx){
     return rst;
 }
 
+function activeSubSheetIsCalcProgram(){
+    return subSpread.getActiveSheetIndex() == subSheetIndex.ssiCalcProgram;
+}
+
 //弹出清单规则或定额库后导致subSpread和特征及内容spread显示出问题
 function refreshSubSpread(){
     if(pageCCOprObj.active){