整合计算程序。

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

@@ -235,23 +235,23 @@ let calcProgramObj = {
     showData: function (treeNode) {
         var me = this;
         me.treeNode = treeNode;
-        projectObj.project.calcProgram.calculate(treeNode);
-        me.datas = me.treeNode.data.calcTemplate.calcItems;
-        //me.sheet.setRowCount(me.datas.length);
-        sheetCommonObj.initSheet(me.sheet, me.setting, me.datas.length);
-        sheetCommonObj.showData(me.sheet, me.setting, me.datas);
+        if (treeNode.sourceType === projectObj.project.Ration.getSourceType()) {
+            projectObj.project.calcProgram.calculate(treeNode);
+            me.datas = me.treeNode.data.calcTemplate.calcItems;
+            //me.sheet.setRowCount(me.datas.length);
+            sheetCommonObj.initSheet(me.sheet, me.setting, me.datas.length);
+            sheetCommonObj.showData(me.sheet, me.setting, me.datas);
+        }
+        else if (treeNode.sourceType === projectObj.project.Bills.getSourceType()) {
+            SheetDataHelper.loadSheetHeader(calcProgramSetting, me.sheet);
+            SheetDataHelper.loadSheetData(calcProgramSetting, me.sheet, baseCalcField);
+        }
     },
 
     clearData: function (){
         var me = this;
         me.treeNode = null;
         sheetCommonObj.cleanSheet(me.sheet, me.setting, -1);
-    },
-
-    showBillsCalcProgram: function (node, calcProgram) {
-        var me = this;
-        SheetDataHelper.loadSheetHeader(calcProgramSetting, me.sheet);
-        SheetDataHelper.loadSheetData(calcProgramSetting, me.sheet, calcProgram);
     }
 };
 

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

@@ -150,14 +150,12 @@ var projectObj = {
 
                     // CSL.2017.07.25
                     if (SubActiveSheetNameIs('JSCX')) {
-                        if (node.sourceType === that.project.Bills.getSourceType()) {
-                            calcProgramObj.showBillsCalcProgram(node.source, baseCalcField);
-                        } else if (node.sourceType=== that.project.Ration.getSourceType()) {
+                        if (node.sourceType === that.project.Bills.getSourceType() || node.sourceType === that.project.Ration.getSourceType()) {
                             calcProgramObj.showData(node);
                         } else {
                             calcProgramObj.clearData();
-                        }
-                    }
+                        };
+                    };
                 });
 
                 that.mainSpread.bind(GC.Spread.Sheets.Events.EditEnded, that.mainSpreadEditEnded);

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

@@ -61,13 +61,11 @@ $("#linkJSCX").click(function(){        // 计算程序
     calcProgramObj.initSheet(subSpread.getSheet(4));
     let sel = projectObj.mainController.tree.selected;
 
-    if (sel.sourceType === projectObj.project.Bills.getSourceType()) {
-        calcProgramObj.showBillsCalcProgram(sel.source, baseCalcField);
-    } else if (sel.sourceType=== projectObj.project.Ration.getSourceType()) {
-        calcProgramObj.showData(sel);
+    if (sel.sourceType === projectObj.project.Bills.getSourceType() || sel.sourceType === projectObj.project.Ration.getSourceType()) {
+        calcProgramObj.showData(node);
     } else {
         calcProgramObj.clearData();
-    }
+    };
 });
 
 $("#linkFXSM").click(function(){