Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

web/building_saas/main/js/views/quantity_edit_view.js

@@ -179,6 +179,8 @@ let quantityEditObj = {
         }
         try {
             let value = undefined;
+            //2021-1-14 工程量表达式中，允许输入“{、}”，花括号内的内容不参与计算，用户输入备注。如：“QDL*0.23{厚度}”、“10{长度}*5.8{宽度}”。
+            evalString = replaceAll("\{[^\}]*\}","",evalString);//[^\}] 表示匹配非}
             if(evalString&&evalString!=""){
                 let exp = new Expression('');
                 exp.Expression(evalString);

web/over_write/js/chongqing_2018_export.js

@@ -1206,7 +1206,7 @@ const XMLStandard = (function () {
                     let engineeringCostNode = tenderDetail.Bills.tree.roots.find(node => node.getFlag() === fixedFlag.ENGINEERINGCOST);
                     if (engineeringCostNode) {
                         let ecTotalFee = _util.getFee(engineeringCostNode.data.fees, 'common.totalFee');
-                        let exponentialGljs = materialAdjustObj.getPriceCoeDatas(projectGLJList, contractorList, ecTotalFee, decimalObj);
+                        let exponentialGljs = materialAdjustObj.getPriceCoeDatas(projectGLJList, contractorList, ecTotalFee, tenderDetail.projectInfo.property);
                         if (exponentialGljs.length) {
                             // 变值权重B累加
                             let totalVarWeight = exponentialGljs.reduce((acc, cur) => acc += cur.varWeight || 0, 0);

web/over_write/js/guangdong_2018_export.js

@@ -2804,7 +2804,7 @@ const XMLStandard = (function () {
             // 总承包人价格指数调整法数据
             const engineeringCostNode = tenderDetail.Bills.tree.roots.find(node => node.getFlag() === fixedFlag.ENGINEERINGCOST);
             const ecTotalFee = _util.getFee(engineeringCostNode.data.fees, 'common.totalFee');
-            const coeDatas = materialAdjustObj.getPriceCoeDatas(gljList, contractorList, ecTotalFee, decimalObj);
+            const coeDatas = materialAdjustObj.getPriceCoeDatas(gljList, contractorList, ecTotalFee, tenderDetail.projectInfo.property);
             return gljList
                 .filter(glj => !!+glj.quantity) // 总消耗量为0不导出
                 .map(glj => {