整合清单、定额计算程序。

web/building_saas/main/html/calc_program_manage.html

@@ -91,7 +91,7 @@
 </body>
 
 <script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
-<script type="text/javascript" src="/web/building_saas/main/js/models/ration_program.js"></script>
-<script type="text/javascript" src="/web/building_saas/main/js/views/ration_programs_manage.js"></script>
+<script type="text/javascript" src="/web/building_saas/main/js/models/calc_program.js"></script>
+<script type="text/javascript" src="/web/building_saas/main/js/views/calc_program_manage.js"></script>
 
 </html>

web/building_saas/main/html/main.html

@@ -94,7 +94,7 @@
                 <li class="nav-item"><a class="active" data-toggle="tab" href="#zaojiashu" role="tab">造价书</a></li>
                 <li class="nav-item"><a href="#" id="glj-link">工料机</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#fee_rates" id="tab_fee_rate" role="tab" onclick="">费率</a></li>
-                <li class="nav-item"><a data-toggle="tab" href="#calc_program_manage" id="tab_calc_program_manage" role="tab" onclick="">计算程序管理</a></li>
+                <li class="nav-item"><a data-toggle="tab" href="#calc_program_manage" id="tab_calc_program_manage" role="tab" onclick="">计算程序</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#baobiao" role="tab" onclick="">报表</a></li>
             </ul>
         </div>
@@ -548,7 +548,6 @@
     <script type="text/javascript" src="/web/building_saas/main/js/rpt/rpt_main.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/rpt/rpt_cfg_const.js"></script>
     <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 type="text/javascript" src="/web/building_saas/main/js/views/fee_rate_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/sub_fee_rate_views.js"></script>
@@ -614,9 +613,9 @@
             var projectId = getQueryString('project');
             $("#glj-link").attr("href", "/glj?project=" + projectId);
 
-            $("#tab_calc_program").click(function(){
+/*            $("#tab_calc_program").click(function(){
                 location.href = '/web/building_saas/main/html/calc_program.html';
-            });
+            });*/
 
             rptTplObj.iniPage();
   		});

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

@@ -208,3 +208,54 @@ let calcProgramObj = {
         SheetDataHelper.loadSheetData(calcProgramSetting, sheet, calcProgram);
     }
 };
+
+
+/**
+ * Created by CSL on 2017-07-17.
+ * 清单定额的计算程序合并
+ */
+
+let rationCalcView = {
+    sheet: null,
+    treeNode: null,
+
+    setting: {
+        header: [
+            {headerName: "费用代号", headerWidth: 75, dataCode: "code", dataType: "String", hAlign: "left"},
+            {headerName: "费用名称", headerWidth: 200, dataCode: "name", dataType: "String"},
+            {headerName: "计算基数", headerWidth: 200, dataCode: "dispExpr", dataType: "String"},
+            {headerName: "基数说明", headerWidth: 400, dataCode: "statement", dataType: "String"},
+            {headerName: "费率", headerWidth: 80, dataCode: "feeRate", dataType: "Number"},   // precision: 3
+            {headerName: "单价", headerWidth: 100, dataCode: "unitFee", dataType: "Number"},  // execRst
+            {headerName: "合价", headerWidth: 100, dataCode: "totalFee", dataType: "Number"},
+            {headerName: "备注", headerWidth: 120, dataCode: "memo", dataType: "String"}
+        ],
+        view: {
+            comboBox: [],
+            lockColumns: [0, 1, 2, 3, 4, 5, 6, 7]
+        }
+    },
+
+    initSheet: function (sheet) {
+        var me = this;
+        me.sheet = sheet;
+        sheetCommonObj.initSheet(me.sheet, me.setting, 20);
+    },
+
+    showData: function (treeNode) {
+        var me = this;
+        me.treeNode = treeNode;
+        projectObj.project.rationProgram.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);
+    },
+
+    clearData: function (){
+        var me = this;
+        me.treeNode = null;
+        sheetCommonObj.cleanSheet(me.sheet, me.setting, -1);
+    }
+
+}

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

@@ -1,48 +0,0 @@
-/**
- * Created by CSL on 2017-07-17.
- */
-
-let rationCalcView = {
-    sheet: null,
-    treeNode: null,
-
-    setting: {
-        header: [
-            {headerName: "费用代号", headerWidth: 75, dataCode: "code", dataType: "String", hAlign: "left"},
-            {headerName: "费用名称", headerWidth: 200, dataCode: "name", dataType: "String"},
-            {headerName: "计算基数", headerWidth: 200, dataCode: "dispExpr", dataType: "String"},
-            {headerName: "基数说明", headerWidth: 400, dataCode: "statement", dataType: "String"},
-            {headerName: "费率", headerWidth: 80, dataCode: "feeRate", dataType: "Number"},   // precision: 3
-            {headerName: "单价", headerWidth: 100, dataCode: "unitFee", dataType: "Number"},  // execRst
-            {headerName: "合价", headerWidth: 100, dataCode: "totalFee", dataType: "Number"},
-            {headerName: "备注", headerWidth: 120, dataCode: "memo", dataType: "String"}
-        ],
-        view: {
-            comboBox: [],
-            lockColumns: [0, 1, 2, 3, 4, 5, 6, 7]
-        }
-    },
-
-    initSheet: function (sheet) {
-        var me = this;
-        me.sheet = sheet;
-        sheetCommonObj.initSheet(me.sheet, me.setting, 20);
-    },
-
-    showData: function (treeNode) {
-        var me = this;
-        me.treeNode = treeNode;
-        projectObj.project.rationProgram.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);
-    },
-
-    clearData: function (){
-        var me = this;
-        me.treeNode = null;
-        sheetCommonObj.cleanSheet(me.sheet, me.setting, -1);
-    }
-
-}