计算程序展示计算数据。

public/calc_util.js

@@ -19,7 +19,7 @@ let executeObj = {
     at: function(code) {
         let me = executeObj,
             rst = 0;
-        rst = me.currentTpl.compileAssistantObj[code].execRst;
+        rst = me.currentTpl.compileAssistantObj[code].unitFee;
         return rst;
     },
     base: function(calcBaseCode) {
@@ -29,8 +29,8 @@ let executeObj = {
             if (dummyCalcBaseCodeTypeCollection[idx].length > 0) {
                 let tmpSum = 0;
                 for (let glj of me.currentRationItem.data.gljList) {
-                    if (dummyCalcBaseCodeTypeCollection[idx].indexOf(glj["glj"]["gljType"]) >= 0) {
-                        tmpSum += glj["glj"]["basePrice"] * glj["consumeAmt"];
+                    if (dummyCalcBaseCodeTypeCollection[idx].indexOf(glj["type"]) >= 0) {
+                        tmpSum += glj["basePrice"] * glj["quantity"];
                     }
                 }
                 rst = tmpSum;
@@ -184,7 +184,8 @@ class calculation {
             $CE.compiledFeeRateFile = me.compiledFee;
             for (let idx of me.calcTpl.compiledSeq) {
                 let item = me.calcTpl.calcItems[idx];
-                item.execRst = eval(item.compiledExpr);
+                item.unitFee = eval(item.compiledExpr);
+                item.totalFee = eval(item.unitFee * 5);     // AAAAA 5为测试值 $RATION.data.Quantity
             }
         }
     }

web/building_saas/css/main.css

@@ -234,7 +234,7 @@ body {
     }
 }
 .bottom-content .tab-content .main-data-bottom{
-    height: 200px;
+    height: 450px;
     overflow: auto;
 }
 .bottom-content .tab-content .ovf-hidden{

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

@@ -250,7 +250,8 @@ let calcTemplate = {
             dispExpr: "A3*[1.89-1]",
             expression: "A('3') * (1.89-1)",
             compiledExpr: "",
-            statement: "定额基价人工费*[定额人工单价(基价)调整系数-1]"
+            statement: "定额基价人工费*[定额人工单价(基价)调整系数-1]",
+            memo: "渝建发(2013)51"
         },
         {
             code: "5",
@@ -306,7 +307,8 @@ let calcTemplate = {
             dispExpr: "A3",
             expression: "A('3')",
             compiledExpr: "",
-            statement: "定额基价人工费"
+            statement: "定额基价人工费",
+            memo: "渝建发[2014]27号"
         },
         {
             code: "12",
@@ -322,7 +324,8 @@ let calcTemplate = {
             dispExpr: "",
             expression: "A('3')",
             compiledExpr: "",
-            statement: "定额基价人工费"
+            statement: "定额基价人工费",
+            memo: "同定额包干费"
         },
         {
             code: "14",
@@ -373,12 +376,10 @@ class RationCalc {
     };
 
     calculate(ration){
-        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);
+        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/views/ration_calc_view.js

@@ -71,7 +71,7 @@ let rationCalcView = {
             {headerName: "计算基数", headerWidth: 180, dataCode: "dispExpr", dataType: "String"},
             {headerName: "基数说明", headerWidth: 220, dataCode: "statement", dataType: "String"},
             {headerName: "费率", headerWidth: 80, dataCode: "feeRate", dataType: "Number"},   // precision: 3
-            {headerName: "单价", headerWidth: 100, dataCode: "execRst", dataType: "Number"},  // unitFee
+            {headerName: "单价", headerWidth: 100, dataCode: "unitFee", dataType: "Number"},  // execRst
             {headerName: "合价", headerWidth: 100, dataCode: "totalFee", dataType: "Number"},
             {headerName: "备注", headerWidth: 120, dataCode: "memo", dataType: "String"}
         ],
@@ -84,7 +84,7 @@ let rationCalcView = {
     initSheet: function (sheet) {
         var me = this;
         me.sheet = sheet;
-        sheetCommonObj.initSheet(me.sheet, me.setting, 20);     // AAAAAAAAAAAA
+        sheetCommonObj.initSheet(me.sheet, me.setting, 20);     // AAAAAAAA
     },
 
     showData: function (ration) {