计算程序

public/calc_util.js

@@ -28,7 +28,7 @@ let executeObj = {
         if (idx >= 0) {
             if (dummyCalcBaseCodeTypeCollection[idx].length > 0) {
                 let tmpSum = 0;
-                for (let glj of me.currentRationItem.rationGljList) {
+                for (let glj of me.currentRationItem.data.gljList) {
                     if (dummyCalcBaseCodeTypeCollection[idx].indexOf(glj["glj"]["gljType"]) >= 0) {
                         tmpSum += glj["glj"]["basePrice"] * glj["consumeAmt"];
                     }

web/building_saas/main/html/main.html

@@ -498,8 +498,11 @@
 	<script type="text/javascript" src="/test/tmp_data/test_ration_calc/ration_calc_base.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/cache_tree.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/calc/calc_fees.js"></script>
-    <script type="text/javascript" src="/web/building_saas/main/js/calc/ration_calc.js"></script>
+    <!-- 小麦这里跑不通，暂时屏蔽。另外单元名、类名均重复
+    <script type="text/javascript" src="/web/building_saas/main/js/calc/ration_calc.js"></script>-->
     <script type="text/javascript" src="/web/building_saas/main/js/calc/bills_calc.js"></script>
+    <script type="text/javascript" src="/public/calc_util.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/ration_calc.js"></script>
     <!-- Controller -->
     <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_controller.js"></script>
     <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
@@ -529,6 +532,7 @@
     <script type="text/javascript" src="/web/building_saas/main/js/views/glj_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/ration_calc_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/sub_view.js"></script>
+    <script src="/public/debug.js"></script>
 
     <SCRIPT type="text/javascript">
   		<!--

web/building_saas/main/js/models/ration_calc.js

@@ -376,6 +376,9 @@ class RationCalc {
         let calcUtil = new calculation();
         calcUtil.init(calcTemplate, calcFeeRate);
         calcUtil.compile();
+        console.log(ration.getID());
+        console.log(projectObj.project.ration_glj.getGljArrByRation(ration.getID()));
+        ration.data.gljList = projectObj.project.ration_glj.getGljArrByRation(ration.getID());
         calcUtil.calculate(ration);
     };
 }

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

@@ -51,8 +51,15 @@ var projectObj = {
 
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.treeSelectedChanged, function (node) {
                     gljOprObj.showDataIfRationSelect(node);
-                    if(node.sourceType=="ration"){
+
+                    // CSL.2017.07.25
+                    if(node.sourceType=="ration" && subSpread.getActiveSheet().name()=='JSCX'){
                         rationCalcView.showData(node);
+                    }else{
+                        if (subSpread.getActiveSheet().name()=='JSCX'){
+                            //alert('clearData');
+                            rationCalcView.clearData;
+                        }
                     }
                 });
 

web/building_saas/main/js/views/ration_calc_view.js

@@ -1,6 +1,7 @@
 /**
  * Created by CSL on 2017-07-17.
  */
+//for test AAAAAAAAAAAAA
 let calcRation = {
     "sectionId" : 76,
     "ID" : 15,
@@ -88,14 +89,19 @@ let rationCalcView = {
 
     showData: function (ration) {
         var me = this;
-        //me.ration = ration;  // AAAAAAA
-        me.ration = calcRation;
-
-        let rationCalc = new RationCalc(null);
+        me.ration = ration;  // AAAAAAA
+        //me.ration = calcRation;
+        let rationCalc = new RationCalc(projectObj.project);
         rationCalc.calculate(me.ration);
 
         me.datas = calcTemplate.calcItems;   // AAAAAAAAA
         sheetCommonObj.showData(me.sheet, me.setting, me.datas);
+    },
+
+    clearData: function (){
+        var me = this;
+        sheetCommonObj.showData(me.sheet, me.setting,[]);
+        //sheetCommonObj.cleanSheet(me.sheet, me.setting, -1);  无效
     }
 
 }

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

@@ -4,6 +4,7 @@
 
 // Tab panes 下有多个Spread时，相互之间不能正确显示。改成一个Spread下多个Sheet。
 var subSpread = sheetCommonObj.createSpread($("#subSpread")[0], 7);
+subSpread.getSheet(4).name('JSCX');
 
 
 // 工料机
@@ -50,10 +51,10 @@ $("#linkGCLMX").click(function(){
     //subSpread.getActiveSheet().setValue(0, 0, "工程量明细");
 });
 
-$("#linkJSCX").click(function(){
+$("#linkJSCX").click(function(){        // 计算程序
     subSpread.setActiveSheetIndex(4);
     rationCalcView.initSheet(subSpread.getSheet(4));
-    rationCalcView.showData();
+    //rationCalcView.showData();
 });
 
 $("#linkFXSM").click(function(){