mainTree: upMove && downMove, disable or not

web/building_saas/main/html/main.html

@@ -499,8 +499,7 @@
 	<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>

web/building_saas/main/js/calc/bills_calc.js

@@ -68,7 +68,7 @@ let nodeCalcObj = {
     }
 };
 
-class BillsCalc {
+class BillsCalcHelper {
     constructor (project, CalcFlag) {
         this.project = project;
         this.CalcFlag = CalcFlag;

web/building_saas/main/js/calc/ration_calc.js

@@ -302,7 +302,7 @@ let rationCalcObj = {
     }
 };
 
-class RationCalc {
+class RationCalcHelper {
     constructor (project) {
         this.project = project;
     }

web/building_saas/main/js/controllers/project_controller.js

@@ -94,11 +94,11 @@ ProjectController = {
     },
     calculateAll: function (project, sheetController, CalcType) {
         let date0 = new Date();
-        let ration_calc = new RationCalc(project);
+        let ration_calc = new RationCalcHelper(project);
         ration_calc.calculateAll();
         let date1 = new Date();
         console.log(date1 - date0);
-        let calc = new BillsCalc(project, CalcType);
+        let calc = new BillsCalcHelper(project, CalcType);
         calc.calcAll();
         calc = null;
         let date2 = new Date();

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

@@ -368,18 +368,4 @@ let calcTemplate = {
             statement: "基价直接工程费+企业管理费+利润+风险因素+人材机价差"
         }
     ]
-};
-
-class RationCalc {
-    constructor(project){
-        this.project = project;
-    };
-
-    calculate(ration){
-        let calc = new calculation();
-        calc.init(calcTemplate, calcFeeRate);
-        calc.compile();
-        ration.data.gljList = projectObj.project.ration_glj.getGljArrByRation(ration.data.ID);
-        calc.calculate(ration);
-    };
-}
+};

web/building_saas/main/js/models/volume_price.js

@@ -61,7 +61,7 @@ var VolumePrice = {
                 if (pre) {
                     let preIndex = bv.indexOf(pre), i;
                     updateData.push({updateType: 'ut_create', updateData: this.getTempVolumePrice(this.maxID() + 1, billsID, preIndex < bv.length - 1 ? bv[preIndex + 1].serialNo : bv[preIndex].serialNo + 1)});
-                    for (i = preIndex + 1; i < br.length; i++) {
+                    for (i = preIndex + 1; i < bv.length; i++) {
                         updateData.push({updateType: 'ut_update', updateData: this.getTempVolumePrice(bv[i].ID, billsID, i < bv.length - 1 ? bv[i+1].serialNo : bv[i].serialNo + 1)});
                     }
                 } else {

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

@@ -42,8 +42,8 @@ var projectObj = {
                     let selected = tree.selected;
                     setButtonValid(selected && selected.canUpLevel(), $('#upLevel'));
                     setButtonValid(selected && selected.canDownLevel(), $('#downLevel'));
-                    setButtonValid(selected && (selected.level > 0) && selected.canUpMove(), $('#upMove'));
-                    setButtonValid(selected && (selected.level > 0) && selected.canDownMove(), $('#downMove'));
+                    setButtonValid(selected && (selected.depth() > 0) && selected.canUpMove(), $('#upMove'));
+                    setButtonValid(selected && (selected.depth() > 0) && selected.canDownMove(), $('#downMove'));
                     setButtonValid(selected, $('#delete'));
                 });
 
@@ -134,7 +134,7 @@ var projectObj = {
                                     return true;
                                 }
                             } else if (selected.sourceType === project.VolumePrice.getSourceType()) {
-                                return true;
+                                return false;
                             };
                         } else {
                             return true;