计算调整。

public/calc_util.js

@@ -20,6 +20,7 @@ let executeObj = {
         let me = executeObj,
             rst = 0;
         rst = me.currentTpl.compileAssistantObj[ID].unitFee;
+        rst = parseFloat(rst);
         return rst;
     },
     base: function(calcBaseCode) {
@@ -170,8 +171,6 @@ class calculation {
                 console.log('errors: ' + me.errs.toString());
             }
         }
-        //console.log(me.compileAssistantObj);
-        //console.log(me.calcTpl.compiledSeq);
     };
     calculate( $RATION){
         let me = this;
@@ -184,7 +183,7 @@ class calculation {
             for (let idx of me.calcTpl.compiledSeq) {
                 let item = me.calcTpl.calcItems[idx];
                 item.unitFee = eval(item.compiledExpr);
-                item.totalFee = eval(item.unitFee * 5);     // AAAAA 5为测试值 $RATION.data.Quantity
+                item.totalFee = item.unitFee * 3;     // AAAAA 5为测试值 $RATION.data.Quantity
             }
         }
     }

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

@@ -242,7 +242,7 @@ let calcTemplate = {
             ID: "3",
             code: "1.1.1",
             name: "定额基价人工费",
-            dispExpr: "定额基价人工费",
+            dispExpr: "[定额基价人工费]",
             expression: "base('定额基价人工费').toFixed(2)",
             compiledExpr: "",
             statement: "定额基价人工费"
@@ -250,8 +250,8 @@ let calcTemplate = {
         {
             ID: "4",
             code: "1.1.2",
-            name: "定额人工单价(基价)调整",
-            dispExpr: "F3*[1.89-1]",
+            name: "[定额人工单价(基价)调整]",
+            dispExpr: "F3*(1.89-1)",
             expression: "@('3') * (1.89-1)",
             compiledExpr: "",
             statement: "定额基价人工费*[定额人工单价(基价)调整系数-1]",
@@ -261,7 +261,7 @@ let calcTemplate = {
             ID: "5",
             code: "1.2",
             name: "基价材料费",
-            dispExpr: "定额基价材料费",
+            dispExpr: "[定额基价材料费]",
             expression: "base('定额基价材料费')",
             compiledExpr: "",
             statement: "定额基价材料费"
@@ -279,7 +279,7 @@ let calcTemplate = {
             ID: "7",
             code: "1.3.1",
             name: "定额基价机械费",
-            dispExpr: "定额基价机械费",
+            dispExpr: "[定额基价机械费]",
             expression: "base('定额基价机械费')",
             compiledExpr: "",
             statement: "定额基价机械费"
@@ -288,7 +288,7 @@ let calcTemplate = {
             ID: "8",
             code: "1.3.1.1",
             name: "其中：定额基价机上人工费",
-            dispExpr: "定额基价机上人工费",
+            dispExpr: "[定额基价机上人工费]",
             expression: "base('定额基价机上人工费')",
             compiledExpr: "",
             statement: "定额基价机上人工费"
@@ -297,7 +297,7 @@ let calcTemplate = {
             ID: "9",
             code: "1.3.2",
             name: "定额机上人工单价(基价)调整",
-            dispExpr: "F8*[1.89-1]",
+            dispExpr: "F8*(1.89-1)",
             expression: "@('8') * (1.89-1)",
             compiledExpr: "",
             statement: "定额基价机上人工费*[定额机上人工单价(基价)调整系数-1]"
@@ -306,7 +306,7 @@ let calcTemplate = {
             ID: "10",
             code: "1.4",
             name: "未计价材料费",
-            dispExpr: "主材费+设备费",
+            dispExpr: "[主材费]+[设备费]",
             expression: "base('主材费') + base('设备费')",
             compiledExpr: "",
             statement: "主材费+设备费"
@@ -316,7 +316,7 @@ let calcTemplate = {
             code: "2",
             name: "企业管理费",
             dispExpr: "F3",
-            expression: "@('3')",
+            expression: "@('3')*8.21 / 100",
             compiledExpr: "",
             statement: "定额基价人工费",
             memo: "渝建发[2014]27号"
@@ -326,7 +326,7 @@ let calcTemplate = {
             code: "3",
             name: "利润",
             dispExpr: "F3",
-            expression: "@('3')",
+            expression: "@('3')*6.5 / 100",
             compiledExpr: "",
             statement: "定额基价人工费"
         },
@@ -335,7 +335,7 @@ let calcTemplate = {
             code: "4",
             name: "风险因素",
             dispExpr: "F3",
-            expression: "@('3')",
+            expression: "@('3')*3 / 100",
             compiledExpr: "",
             statement: "定额基价人工费",
             memo: "同定额包干费"
@@ -353,7 +353,7 @@ let calcTemplate = {
             ID: "15",
             code: "5.1",
             name: "人工费价差",
-            dispExpr: "信息价或市场价格-调整后的定额人工费(基价)",
+            dispExpr: "[市场价格人工费]-[调整后的定额人工费(基价)]",
             expression: "base('市场价格人工费') - base('定额基价人工费(调整后)')",
             compiledExpr: "",
             statement: "市场价格人工费-调整后的定额人工费(基价)"
@@ -362,7 +362,7 @@ let calcTemplate = {
             ID: "16",
             code: "5.2",
             name: "材料费价差",
-            dispExpr: "信息价或市场价格-定额基价材料费",
+            dispExpr: "[市场价格材料费]-[定额基价材料费]",
             expression: "base('市场价格材料费') - base('定额基价材料费(调整后)')",
             compiledExpr: "",
             statement: "市场价格材料费-定额基价材料费"
@@ -371,7 +371,7 @@ let calcTemplate = {
             ID: "17",
             code: "5.3",
             name: "机械费价差",
-            dispExpr: "信息价或市场价格-调整后的定额基价机械费(基价)",
+            dispExpr: "[市场价格机械费]-[调整后的定额基价机械费(基价)]",
             expression: "base('市场价格机械费') - base('定额基价机械费(调整后)')",
             compiledExpr: "",
             statement: "市场价格机械费-调整后的定额基价机械费(基价)"

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

@@ -67,7 +67,7 @@ let rationCalcView = {
         header: [
             {headerName: "费用代号", headerWidth: 75, dataCode: "code", dataType: "String", hAlign: "left"},
             {headerName: "费用名称", headerWidth: 200, dataCode: "name", dataType: "String"},
-            {headerName: "计算基数", headerWidth: 180, dataCode: "dispExpr", dataType: "String"},
+            {headerName: "计算基数", headerWidth: 280, dataCode: "dispExpr", dataType: "String"},
             {headerName: "基数说明", headerWidth: 220, dataCode: "statement", dataType: "String"},
             {headerName: "费率", headerWidth: 80, dataCode: "feeRate", dataType: "Number"},   // precision: 3
             {headerName: "单价", headerWidth: 100, dataCode: "unitFee", dataType: "Number"},  // execRst

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

@@ -60,7 +60,7 @@ $("#linkJSCX").click(function(){        // 计算程序
     subSpread.setActiveSheetIndex(4);
     rationCalcView.initSheet(subSpread.getSheet(4));
     let sel = projectObj.mainController.tree.selected;
-    if (sel.sourceType == 'ration'){
+    if (sel != null && sel.sourceType == 'ration'){
         rationCalcView.showData(sel);
     }
     else{