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

modules/reports/util/rpt_construct_data_util.js

@@ -277,10 +277,13 @@ class Rpt_Data_Extractor {
             if (projectGLJDatas && rationGLJDatas && labourCoeDatas) {
                 //考虑调价情况
                 const newAdjPriceArr = [];
+                // console.log('1');
+                // console.log(projectGLJDatas.data.gljList);
                 for (const glj of projectGLJDatas.data.gljList) {
-                    newAdjPriceArr.push(gljUtil.getGLJPrice(glj, projectGLJDatas.data, calcOptions, labourCoeDatas, decimalObj, false, gljUtil.getTenderPriceCoe(glj, rawDataObj.prj.property), true));
+                    newAdjPriceArr.push(gljUtil.getGLJPrice(glj, projectGLJDatas.data, calcOptions, labourCoeDatas, rawDataObj.prj.property.decimal, false, gljUtil.getTenderPriceCoe(glj, rawDataObj.prj.property), true));
                     // glj.unit_price.market_price_tender = gljUtil.getMarketPrice(glj, projectGLJDatas.data, calcOptions, rawDataObj.prj.property.decimal, false, gljUtil.getTenderPriceCoe(glj, rawDataObj.prj.property));
                 }
+                // console.log('2');
                 for (let gljIdx = 0; gljIdx < newAdjPriceArr.length; gljIdx++) {
                     let newGlj = newAdjPriceArr[gljIdx];
                     let gljItem = projectGLJDatas.data.gljList[gljIdx];
@@ -290,6 +293,7 @@ class Rpt_Data_Extractor {
                     // rationItem.marketUnitFee = newGlj.marketPrice;//更新树节点市场单价列的值
                     //
                 }
+                // console.log('3');
             }
         }
         //还有汇总的...
@@ -1157,9 +1161,10 @@ function sortData(sourceData, sortCfg, prjData) {
             break;
         case "self_define":
             if (sortCfg[JV.PROP_SORT_TYPE_SELF_DEFINE_LOGIC]) {
-                let selfDefFunc = null;
-                eval('selfDefFunc = ' + sortCfg[JV.PROP_SORT_TYPE_SELF_DEFINE_LOGIC]);
-                tempRstArr.sort(selfDefFunc);
+                let selfDefFuncA = null;
+                eval('selfDefFuncA = ' + sortCfg[JV.PROP_SORT_TYPE_SELF_DEFINE_LOGIC]);
+                // 备注： 因为eval方法的特殊性，不要定义相同变量（这里是‘selfDefFunc’），否则会得到个null
+                tempRstArr.sort(selfDefFuncA);
             }
             replaceActDataArr(sourceData, tempRstArr);
             break;

public/web/gljUtil.js

@@ -294,7 +294,7 @@ let gljUtil = {
         if(glj.is_evaluate==1){//先按是否暂估判断
             return calcOptions.calc_est;
         }
-        if(glj.type==gljType.MAIN_MATERIAL||glj.type==gljType.EQUIPMENT){//再判断是否是主材和设备
+        if(glj.type == this.gljType.MAIN_MATERIAL || glj.type == this.gljType.EQUIPMENT){//再判断是否是主材和设备
             return calcOptions.calc_main;
         }
         if(glj.unit_price.is_add==1){//再判断是否新增

public/web/sheet/sheet_common.js

@@ -371,7 +371,7 @@ var sheetCommonObj = {
             }
             if(setting.owner==='gljTree'){
                 if(setting.header[col].cellType === "checkBox"){
-                    val==1?val:0;
+                    val = val==1?val:0;
                     this.setCheckBoxCell(row,col,sheet,val);
                 }
                 if(setting.header[col].dataCode === 'gljType' && data[row].gljType){