多计算规则支持。

public/calc_util.js

@@ -1,10 +1,11 @@
 /**
  * Created by Tony on 2017/6/21.
+ * Modified by CSL, 2017-08-01
  */
+
 let executeObj = {
     calculation : null,
     ration: null,
-    feeRate: null,
     at: function(ID) {
         let me = executeObj,
             rst = 0;
@@ -32,11 +33,6 @@ let executeObj = {
         };
         return rst;
     },
-    fee: function(feeID) {
-        let me = executeObj, rst = 0;
-        if (me.compiledFeeRateFile["fee_" + feeID]) rst = me.compiledFeeRateFile["fee_" + feeID].rate;
-        return rst;
-    },
     factor: function(factorCode) {
         let me = executeObj;
         let rst = 0.89; //暂时固定输出，测试用
@@ -45,14 +41,14 @@ let executeObj = {
 };
 
 class Calculation {
-    init(calcTemplate, feeRate){
+/*    init(calcTemplate, feeRates){
         let me = this;
         me.calcTemplate = calcTemplate;
-        me.feeRate = feeRate;
+        me.feeRates = feeRates;
         me.hasCompiled = false;
-    };
+    };*/
 
-    compile(){
+    compile(calcTemplate, feeRates){
         let me = this;
         me.hasCompiled = false;
         me.errs = [];
@@ -100,46 +96,46 @@ class Calculation {
                 }
                 idx = item.expression.indexOf('@(', idx + ID.length + 3);
             }
-            if (me.calcTemplate.compiledSeq.indexOf(itemIdx) < 0) {
-                me.calcTemplate.compiledSeq.push(itemIdx);
+            if (calcTemplate.compiledSeq.indexOf(itemIdx) < 0) {
+                calcTemplate.compiledSeq.push(itemIdx);
             }
         };
         let private_setup_seq = function(item, itemIdx){
-            if (me.calcTemplate.compiledSeq.indexOf(itemIdx) < 0) {
+            if (calcTemplate.compiledSeq.indexOf(itemIdx) < 0) {
                 private_parse_ref(item, itemIdx);
             }
         };
         let private_compile_items = function() {
-            for (let idx of me.calcTemplate.compiledSeq) {
-                let item = me.calcTemplate.calcItems[idx];
+            for (let idx of calcTemplate.compiledSeq) {
+                let item = calcTemplate.calcItems[idx];
                 item.compiledExpr = item.expression.split('@(').join('$CE.at(');
                 item.compiledExpr = item.compiledExpr.split('base(').join('$CE.base(');
-                item.compiledExpr = item.compiledExpr.split('fee(').join('$CE.fee(');
+                //item.compiledExpr = item.compiledExpr.split('rate(').join('$CE.rate(');
                 item.compiledExpr = item.compiledExpr.split('factor(').join('$CE.factor(');
             }
         };
         let private_comile_feeFile = function() {
-            if (me.feeRate) {
-                me.compiledFee = {};
-                for (let fee of me.feeRate) {
-                    me.compiledFee["fee_" + fee.ID] = fee;
+            if (feeRates) {
+                me.compiledFeeRate = {};
+                for (let rate of feeRates) {
+                    me.compiledFeeRate["feeRate_" + rate.ID] = rate;
                 }
             }
         };
 
-        if (me.calcTemplate && me.calcTemplate.calcItems && me.calcTemplate.calcItems.length > 0) {
-            me.calcTemplate.compiledSeq = [];
+        if (calcTemplate && calcTemplate.calcItems && calcTemplate.calcItems.length > 0) {
+            calcTemplate.compiledSeq = [];
             me.compileAssistantObj = {};
             //1. first round -> prepare
             private_comile_feeFile();
-            for (let i = 0; i < me.calcTemplate.calcItems.length; i++) {
-                let item = me.calcTemplate.calcItems[i];
+            for (let i = 0; i < calcTemplate.calcItems.length; i++) {
+                let item = calcTemplate.calcItems[i];
                 me.compileAssistantObj[item.ID] = item;
                 me.compileAssistantObj[item.ID + "_idx"] = i;
             }
             //2. second round -> go!
-            for (let i = 0; i < me.calcTemplate.calcItems.length; i++) {
-                private_setup_seq(me.calcTemplate.calcItems[i], i);
+            for (let i = 0; i < calcTemplate.calcItems.length; i++) {
+                private_setup_seq(calcTemplate.calcItems[i], i);
             }
             if (me.errs.length == 0) {
                 private_compile_items();
@@ -155,31 +151,47 @@ class Calculation {
             let $CE = executeObj;
             $CE.ration = $RATION;
             $CE.calculation = me;
-            $CE.feeRate = me.feeRate;
-            $CE.compiledFeeRateFile = me.compiledFee;
 
             if (!$RATION.fees) {
                 $RATION.fees = [];
                 $RATION.feesIndex = {};
             };
 
-            for (let idx of me.calcTemplate.compiledSeq) {
-                let calcItem = me.calcTemplate.calcItems[idx];
+            //let calcTemplate = getCalcTemplate($RATION.CalcTemplateID);   // AAAAAA 通过定额获取计算规则
+            let calcTemplate = calcTemplates[0];
+            for (let idx of calcTemplate.compiledSeq) {
+                let calcItem = calcTemplate.calcItems[idx];
 
-                // 这两项用于界面显示。
-                calcItem.unitFee = eval(calcItem.compiledExpr);   // AAAAA 如果eval()对清单树有影响，就换成小麦的Expression对象再试
+                let feeRate = 100;    // 100%
+                // 下面三项用于界面显示。
+                if (calcItem.feeRateID) {
+                    feeRate = me.compiledFeeRate["feeRate_" + calcItem.feeRateID].rate;
+                    calcItem.feeRate = feeRate;
+                };
+                calcItem.unitFee = eval(calcItem.compiledExpr) * feeRate * 0.01;   // 如果eval()对清单树有影响，就换成小麦的Expression对象再试
                 calcItem.totalFee = calcItem.unitFee * 3;     // AAAAA 测试值，因目前定额无数量（保存不上） $RATION.data.Quantity
 
                 // 费用同步到定额
                 // 引入小麦的字段检测后，快速切换定额出现计算卡顿现象，过多的循环造成。这里把她的代码拆出来，减少微循环。
-                if (!$RATION.feesIndex[calcItem.type]){
-                    calcFees.addFee($RATION, calcItem.type);
-                };
-                $RATION.feesIndex[calcItem.type].unitFee = calcItem.unitFee;
-                $RATION.feesIndex[calcItem.type].totalFee = calcItem.totalFee;
+                if (!$RATION.feesIndex[calcItem.fieldName]){
+                    let fee = {
+                        'fieldName': calcItem.fieldName,
+                        'unitFee': calcItem.unitFee,
+                        'totalFee': calcItem.totalFee,
+                        'tenderUnitFee': 0,
+                        'tenderTotalFee': 0
+                    };
+                    $RATION.fees.push(fee);
+                    $RATION.feesIndex[calcItem.fieldName] = fee;
+                }
+                else{
+                    $RATION.feesIndex[calcItem.fieldName].unitFee = calcItem.unitFee;
+                    $RATION.feesIndex[calcItem.fieldName].totalFee = calcItem.totalFee;
+                }
             }
         }
     }
 }
 
+
 //module.exports = new calculation();

web/building_saas/main/js/models/ration_program.js

@@ -2,7 +2,7 @@
  * Created by CSL on 2017-07-19.
  */
 
-let calcFeeRate = [
+let calcFeeRates = [
     {
         "ID" : 1,
         "ParentID" : null,
@@ -215,211 +215,220 @@ let calcFeeRate = [
     }
 ];
 
-let calcTemplate = {
-    calType: 3,
-    calTypeName: "测试用_重庆",
-    compiledSeq: [],
-    calcItems: [
-        {
-            ID: "1",
-            code: "1",
-            name: "基价直接工程费",
-            type: "baseDirect",
-            dispExpr: "F2+F5+F6+F10",
-            expression: "@('2') + @('5') + @('6') + @('10')",
-            compiledExpr: "",
-            statement: "基价人工费+基价材料费+基价机械费+未计价材料费"
-        },
-        {
-            ID: "2",
-            code: "1.1",
-            name: "基价人工费",
-            type: "baseLabour",
-            dispExpr: "F3+F4",
-            expression: "@('3') + @('4')",
-            compiledExpr: "",
-            statement: "定额基价人工费+定额人工单价(基价)调整"
-        },
-        {
-            ID: "3",
-            code: "1.1.1",
-            name: "定额基价人工费",
-            type: "rationBaseLabour",
-            dispExpr: "[定额基价人工费]",
-            expression: "base('定额基价人工费').toFixed(2)",
-            compiledExpr: "",
-            statement: "定额基价人工费"
-        },
-        {
-            ID: "4",
-            code: "1.1.2",
-            name: "定额人工单价(基价)调整",
-            type: "rationLabourFixed",
-            dispExpr: "F3*(1.89-1)",
-            expression: "@('3') * (1.89-1)",
-            compiledExpr: "",
-            statement: "定额基价人工费*[定额人工单价(基价)调整系数-1]",
-            memo: "渝建发(2013)51"
-        },
-        {
-            ID: "5",
-            code: "1.2",
-            name: "基价材料费",
-            type: "baseMaterial",
-            dispExpr: "[定额基价材料费]",
-            expression: "base('定额基价材料费')",
-            compiledExpr: "",
-            statement: "定额基价材料费"
-        },
-        {
-            ID: "6",
-            code: "1.3",
-            name: "基价机械费",
-            type: "baseMachine",
-            dispExpr: "F7+F9",
-            expression: "@('7') + @('9')",
-            compiledExpr: "",
-            statement: "定额基价机械费+定额机上人工单价(基价)调整"
-        },
-        {
-            ID: "7",
-            code: "1.3.1",
-            name: "定额基价机械费",
-            type: "rationBaseMachine",
-            dispExpr: "[定额基价机械费]",
-            expression: "base('定额基价机械费')",
-            compiledExpr: "",
-            statement: "定额基价机械费"
-        },
-        {
-            ID: "8",
-            code: "1.3.1.1",
-            name: "其中：定额基价机上人工费",
-            type: "rationBaseMachineLabour",
-            dispExpr: "[定额基价机上人工费]",
-            expression: "base('定额基价机上人工费')",
-            compiledExpr: "",
-            statement: "定额基价机上人工费"
-        },
-        {
-            ID: "9",
-            code: "1.3.2",
-            name: "定额机上人工单价(基价)调整",
-            type: "rationBaseMachineLabourFixed",
-            dispExpr: "F8*(1.89-1)",
-            expression: "@('8') * (1.89-1)",
-            compiledExpr: "",
-            statement: "定额基价机上人工费*[定额机上人工单价(基价)调整系数-1]"
-        },
-        {
-            ID: "10",
-            code: "1.4",
-            name: "未计价材料费",
-            type: "unPriceMaterial",
-            dispExpr: "[主材费]+[设备费]",
-            expression: "base('主材费') + base('设备费')",
-            compiledExpr: "",
-            statement: "主材费+设备费"
-        },
-        {
-            ID: "11",
-            code: "2",
-            name: "企业管理费",
-            type: "manageFee",
-            dispExpr: "F3",
-            feeRate: 8.21,
-            expression: "@('3')*8.21 / 100",
-            compiledExpr: "",
-            statement: "定额基价人工费",
-            memo: "渝建发[2014]27号"
-        },
-        {
-            ID: "12",
-            code: "3",
-            name: "利润",
-            type: "profit",
-            dispExpr: "F3",
-            feeRate: 6.5,
-            expression: "@('3')*6.5 / 100",
-            compiledExpr: "",
-            statement: "定额基价人工费"
-        },
-        {
-            ID: "13",
-            code: "4",
-            name: "风险因素",
-            type: "risk",
-            dispExpr: "F3",
-            feeRate: 3,
-            expression: "@('3')*3 / 100",
-            compiledExpr: "",
-            statement: "定额基价人工费",
-            memo: "同定额包干费"
-        },
-        {
-            ID: "14",
-            code: "5",
-            name: "人材机价差",
-            type: "lmmDiff",
-            dispExpr: "F15+F16+F17",
-            expression: "@('15') + @('16') + @('17')",
-            compiledExpr: "",
-            statement: "人工费价差+材料费价差+机械费价差"
-        },
-        {
-            ID: "15",
-            code: "5.1",
-            name: "人工费价差",
-            type: "labourDiff",
-            dispExpr: "[人工费价差]",
-            expression: "base('市场价格人工费') - base('定额基价人工费(调整后)')",
-            compiledExpr: "",
-            statement: "市场价格人工费-调整后的定额人工费(基价)"
-        },
-        {
-            ID: "16",
-            code: "5.2",
-            name: "材料费价差",
-            type: "materialDiff",
-            dispExpr: "[材料费价差]",
-            expression: "base('市场价格材料费') - base('定额基价材料费(调整后)')",
-            compiledExpr: "",
-            statement: "市场价格材料费-定额基价材料费"
-        },
-        {
-            ID: "17",
-            code: "5.3",
-            name: "机械费价差",
-            type: "machineDiff",
-            dispExpr: "[机械费价差]",
-            expression: "base('市场价格机械费') - base('定额基价机械费(调整后)')",
-            compiledExpr: "",
-            statement: "市场价格机械费-调整后的定额基价机械费(基价)"
-        },
-        {
-            ID: "18",
-            code: "6",
-            name: "综合单价",
-            type: "common",
-            dispExpr: "F1+F11+F12+F13+F14",
-            expression: "@('1') + @('11') + @('12') + @('13') + @('14')",
-            compiledExpr: "",
-            statement: "基价直接工程费+企业管理费+利润+风险因素+人材机价差"
-        }
-    ]
-};
+let calcTemplates = [
+    {
+        ID: 1,
+        name: "重庆2015",
+        compiledSeq: [],
+        calcItems: [
+            {
+                ID: "1",
+                code: "1",
+                name: "基价直接工程费",
+                fieldName: "baseDirect",
+                dispExpr: "F2+F5+F6+F10",
+                expression: "@('2') + @('5') + @('6') + @('10')",
+                compiledExpr: "",
+                statement: "基价人工费+基价材料费+基价机械费+未计价材料费"
+            },
+            {
+                ID: "2",
+                code: "1.1",
+                name: "基价人工费",
+                fieldName: "baseLabour",
+                dispExpr: "F3+F4",
+                expression: "@('3') + @('4')",
+                compiledExpr: "",
+                statement: "定额基价人工费+定额人工单价(基价)调整"
+            },
+            {
+                ID: "3",
+                code: "1.1.1",
+                name: "定额基价人工费",
+                fieldName: "rationBaseLabour",
+                dispExpr: "[定额基价人工费]",
+                expression: "base('定额基价人工费').toFixed(2)",
+                compiledExpr: "",
+                statement: "定额基价人工费"
+            },
+            {
+                ID: "4",
+                code: "1.1.2",
+                name: "定额人工单价(基价)调整",
+                fieldName: "rationLabourFixed",
+                dispExpr: "F3*(1.89-1)",
+                expression: "@('3') * (1.89-1)",
+                compiledExpr: "",
+                statement: "定额基价人工费*[定额人工单价(基价)调整系数-1]",
+                memo: "渝建发(2013)51"
+            },
+            {
+                ID: "5",
+                code: "1.2",
+                name: "基价材料费",
+                fieldName: "baseMaterial",
+                dispExpr: "[定额基价材料费]",
+                expression: "base('定额基价材料费')",
+                compiledExpr: "",
+                statement: "定额基价材料费"
+            },
+            {
+                ID: "6",
+                code: "1.3",
+                name: "基价机械费",
+                fieldName: "baseMachine",
+                dispExpr: "F7+F9",
+                expression: "@('7') + @('9')",
+                compiledExpr: "",
+                statement: "定额基价机械费+定额机上人工单价(基价)调整"
+            },
+            {
+                ID: "7",
+                code: "1.3.1",
+                name: "定额基价机械费",
+                fieldName: "rationBaseMachine",
+                dispExpr: "[定额基价机械费]",
+                expression: "base('定额基价机械费')",
+                compiledExpr: "",
+                statement: "定额基价机械费"
+            },
+            {
+                ID: "8",
+                code: "1.3.1.1",
+                name: "其中：定额基价机上人工费",
+                fieldName: "rationBaseMachineLabour",
+                dispExpr: "[定额基价机上人工费]",
+                expression: "base('定额基价机上人工费')",
+                compiledExpr: "",
+                statement: "定额基价机上人工费"
+            },
+            {
+                ID: "9",
+                code: "1.3.2",
+                name: "定额机上人工单价(基价)调整",
+                fieldName: "rationBaseMachineLabourFixed",
+                dispExpr: "F8*(1.89-1)",
+                expression: "@('8') * (1.89-1)",
+                compiledExpr: "",
+                statement: "定额基价机上人工费*[定额机上人工单价(基价)调整系数-1]"
+            },
+            {
+                ID: "10",
+                code: "1.4",
+                name: "未计价材料费",
+                fieldName: "unPriceMaterial",
+                dispExpr: "[主材费]+[设备费]",
+                expression: "base('主材费') + base('设备费')",
+                compiledExpr: "",
+                statement: "主材费+设备费"
+            },
+            {
+                ID: "11",
+                code: "2",
+                name: "企业管理费",
+                fieldName: "manageFee",
+                dispExpr: "F3",
+                feeRateID: 3,
+                expression: "@('3')",
+                compiledExpr: "",
+                statement: "定额基价人工费",
+                memo: "渝建发[2014]27号"
+            },
+            {
+                ID: "12",
+                code: "3",
+                name: "利润",
+                fieldName: "profit",
+                dispExpr: "F3",
+                feeRateID: 4,
+                expression: "@('3')",
+                compiledExpr: "",
+                statement: "定额基价人工费"
+            },
+            {
+                ID: "13",
+                code: "4",
+                name: "风险因素",
+                fieldName: "risk",
+                dispExpr: "F3",
+                feeRateID: 5,
+                expression: "@('3')",
+                compiledExpr: "",
+                statement: "定额基价人工费",
+                memo: "同定额包干费"
+            },
+            {
+                ID: "14",
+                code: "5",
+                name: "人材机价差",
+                fieldName: "lmmDiff",
+                dispExpr: "F15+F16+F17",
+                expression: "@('15') + @('16') + @('17')",
+                compiledExpr: "",
+                statement: "人工费价差+材料费价差+机械费价差"
+            },
+            {
+                ID: "15",
+                code: "5.1",
+                name: "人工费价差",
+                fieldName: "labourDiff",
+                dispExpr: "[人工费价差]",
+                expression: "base('市场价格人工费') - base('定额基价人工费(调整后)')",
+                compiledExpr: "",
+                statement: "市场价格人工费-调整后的定额人工费(基价)"
+            },
+            {
+                ID: "16",
+                code: "5.2",
+                name: "材料费价差",
+                fieldName: "materialDiff",
+                dispExpr: "[材料费价差]",
+                expression: "base('市场价格材料费') - base('定额基价材料费(调整后)')",
+                compiledExpr: "",
+                statement: "市场价格材料费-定额基价材料费"
+            },
+            {
+                ID: "17",
+                code: "5.3",
+                name: "机械费价差",
+                fieldName: "machineDiff",
+                dispExpr: "[机械费价差]",
+                expression: "base('市场价格机械费') - base('定额基价机械费(调整后)')",
+                compiledExpr: "",
+                statement: "市场价格机械费-调整后的定额基价机械费(基价)"
+            },
+            {
+                ID: "18",
+                code: "6",
+                name: "综合单价",
+                fieldName: "common",
+                dispExpr: "F1+F11+F12+F13+F14",
+                expression: "@('1') + @('11') + @('12') + @('13') + @('14')",
+                compiledExpr: "",
+                statement: "基价直接工程费+企业管理费+利润+风险因素+人材机价差"
+            }
+        ]
+    }
+];
 
-class RationCalc {
+class RationProgram {
     constructor(project){
         this.project = project;
+        this.calc = new Calculation();
     };
 
-    calculate(ration){
-        ration.data.gljList = projectObj.project.ration_glj.getGljArrByRation(ration.data.ID);
+    compileAllTemps(){
+       for (let ct of calcTemplates){
+           this.calc.compile(ct, calcFeeRates);
+       };
+    };
+
+    compile(calcTemplate){
+       this.calc.compile(calcTemplate, calcFeeRates);
+    };
 
-        let calc = new Calculation();
-        calc.init(calcTemplate, calcFeeRate);
-        calc.compile();
-        calc.calculate(ration);
+    calculate(ration){
+        ration.data.gljList = this.project.ration_glj.getGljArrByRation(ration.data.ID);
+        this.calc.calculate(ration);
     };
 }

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

@@ -121,6 +121,8 @@ var projectObj = {
 
             }
         });
+        this.rationProgram = new RationProgram(this.project);
+        this.rationProgram.compileAllTemps();
     },
     loadMainSpreadContextMenu: function () {
         var project = this.project, spread = this.mainSpread, controller = this.mainController;

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

@@ -32,10 +32,10 @@ let rationCalcView = {
     showData: function (ration) {
         var me = this;
         me.ration = ration;
-        let rationCalc = new RationCalc(projectObj.project);
-        rationCalc.calculate(me.ration);
+        projectObj.rationProgram.calculate(me.ration);
 
-        me.datas = calcTemplate.calcItems;   // AAAAAAAAA
+        me.datas = calcTemplates[0].calcItems;   // AAAAAAAAA
+        //me.datas = getCalcTemplate(me.ration.CalcTemplateID);
         sheetCommonObj.showData(me.sheet, me.setting, me.datas);
     },