同步

public/web/gljUtil.js

@@ -551,7 +551,7 @@ let gljUtil = {
     },
     getTenderPriceCoe : function(glj,tproperty){
         let tenderCoe = 1;
-        let property = tproperty?tproperty:projectObj.project.property;
+        let property = tproperty ? tproperty : projectObj.project.property;
         if (!glj.is_adjust_price&&property.tenderSetting && isDef(property.tenderSetting.gljPriceTenderCoe) ){
             tenderCoe = parseFloat(property.tenderSetting.gljPriceTenderCoe);
             if (tenderCoe == 0) tenderCoe = 1;

web/building_saas/main/js/models/project.js

@@ -57,9 +57,12 @@ var PROJECT = {
                 }
             }
 
+            me._project.property = me._project.projectInfo.property;
             me._project.loadMainTree();
             //me.test(result[0].data[0]);
-            callback(0);
+            if (callback) {
+                callback(0);
+            }
         };
         tools.eachItem=function(item){
             if (me.modules[item.moduleName]){

web/building_saas/main/js/models/project_glj.js

@@ -1666,13 +1666,14 @@ ProjectGLJ.prototype.getTenderMarketPrice = function (glj,isRadio) {
     let calcOptions=projectObj.project.projectInfo.property.calcOptions;
     let decimalObj = projectObj.project.projectInfo.property.decimal;
     let labourCoeDatas =  projectObj.project.labourCoe.datas;
-    let tenderCoe = 1;
-    if (projectObj.project.property.tenderSetting && gljUtil.isDef(projectObj.project.property.tenderSetting.gljPriceTenderCoe) ){
-        tenderCoe = parseFloat(projectObj.project.property.tenderSetting.gljPriceTenderCoe);
-    }
+    let tenderCoe = this.getTenderPriceCoe(glj);
     return gljUtil.getMarketPrice(glj,proGLJ.datas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil,tenderCoe);
 };
 
+ProjectGLJ.prototype.getTenderPriceCoe = function(glj,tproperty){
+    return gljUtil.getTenderPriceCoe(glj,tproperty);
+};
+
 ProjectGLJ.prototype.isEstimateType = function(type){
     let typeString = type + "";
     if (typeString.startsWith("2")||typeString=='4'||typeString=='5') {//只有材料、主材、设备类型才显示是否暂估

web/building_saas/main/js/views/glj_view.js

@@ -747,11 +747,13 @@ var gljOprObj = {
         let labourCoeDatas =  projectObj.project.labourCoe.datas;
         glj = glj?glj:_.find(proGLJ.datas.gljList, {'id': data.projectGLJID});
         if(glj){
-            let result = gljUtil.getGLJPrice(glj,proGLJ.datas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil,ext);
+            let tenderCoe = projectObj.project.projectGLJ.getTenderPriceCoe(glj);
+            let result = gljUtil.getGLJPrice(glj,proGLJ.datas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil,ext,tenderCoe);
             data.marketPrice = result.marketPrice;
             data.basePrice =  result.basePrice;
             data.adjustPrice = result.adjustPrice;
             data.marketUnitFee = data.marketPrice;//更新树节点市场单价列的值
+            data.tenderPrice = result.tenderPrice;
         }
         return data;
 

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

@@ -892,7 +892,7 @@ var projectObj = {
                 subObj.initSubSpread();//初始化主界面下方的表格
 
                 let quantityTime = +new Date();
-                that.project.property = projectObj.project.projectInfo.property;
+               // that.project.property = projectObj.project.projectInfo.property;
                 if (typeof overwriteRationCalcBases === 'function')
                     overwriteRationCalcBases(that.project.property.taxType);
                 //that.project.calcProgram.compileAllTemps();