类整合。

web/building_saas/main/js/models/fee_rate.js

@@ -142,8 +142,8 @@ var FeeRate = {
         FeeRate.prototype.synchronizeFeeRate = function () {
             var node = project.mainTree.selected;
             if(node){
-                if (node.sourceType==='ration'&&rationCalcView.sheet) {
-                    rationCalcView.showData(node);
+                if (node.sourceType==='ration' && calcProgramObj.sheet) {
+                    calcProgramObj.showData(node);
                 }
             }
         };

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

@@ -1,7 +1,10 @@
 /**
  * Created by Mai on 2017/7/28.
+ * Modified by CSL on 2017/08/21.
+ * 整合清单、定额的计算程序，代码合并、类合并、剔除多余单元。
  */
 
+
 let calcProgramSetting ={
     "emptyRows":0,
     "headRows":1,
@@ -203,19 +206,6 @@ let calcProgramSetting ={
 };
 
 let calcProgramObj = {
-    showBillsCalcProgram: function (node, calcProgram, sheet) {
-        SheetDataHelper.loadSheetHeader(calcProgramSetting, sheet);
-        SheetDataHelper.loadSheetData(calcProgramSetting, sheet, calcProgram);
-    }
-};
-
-
-/**
- * Created by CSL on 2017-07-17.
- * 清单定额的计算程序合并
- */
-
-let rationCalcView = {
     sheet: null,
     treeNode: null,
 
@@ -256,6 +246,12 @@ let rationCalcView = {
         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

@@ -151,11 +151,11 @@ var projectObj = {
                     // CSL.2017.07.25
                     if (SubActiveSheetNameIs('JSCX')) {
                         if (node.sourceType === that.project.Bills.getSourceType()) {
-                            calcProgramObj.showBillsCalcProgram(node.source, baseCalcField, rationCalcView.sheet);
-                        } else if (node.sourceType==='ration') {
-                            rationCalcView.showData(node);
+                            calcProgramObj.showBillsCalcProgram(node.source, baseCalcField);
+                        } else if (node.sourceType=== that.project.Ration.getSourceType()) {
+                            calcProgramObj.showData(node);
                         } else {
-                            rationCalcView.clearData();
+                            calcProgramObj.clearData();
                         }
                     }
                 });

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

@@ -58,15 +58,15 @@ $("#linkGCLMX").click(function(){
 
 $("#linkJSCX").click(function(){        // 计算程序
     subSpread.setActiveSheetIndex(4);
-    rationCalcView.initSheet(subSpread.getSheet(4));
+    calcProgramObj.initSheet(subSpread.getSheet(4));
     let sel = projectObj.mainController.tree.selected;
 
     if (sel.sourceType === projectObj.project.Bills.getSourceType()) {
-        calcProgramObj.showBillsCalcProgram(sel.source, baseCalcField, rationCalcView.sheet);
-    } else if (sel.sourceType==='ration') {
-        rationCalcView.showData(sel);
+        calcProgramObj.showBillsCalcProgram(sel.source, baseCalcField);
+    } else if (sel.sourceType=== projectObj.project.Ration.getSourceType()) {
+        calcProgramObj.showData(sel);
     } else {
-        rationCalcView.clearData();
+        calcProgramObj.clearData();
     }
 });