Merge remote-tracking branch 'origin/master'

public/web/sheet/sheet_common.js

@@ -1223,7 +1223,10 @@ var sheetCommonObj = {
             treeSetting.cols.push(getSettingCol(h))
         }
         for(let l of setting.view.lockColumns){
-            treeSetting.cols[l].readOnly = true;
+            if(_.isString(l)){//如果是dataCode 进行转换
+                l = _.findIndex(setting.header,{dataCode:l})
+            }
+            if(treeSetting.cols[l]) treeSetting.cols[l].readOnly = true;
         }
         return treeSetting;
         function getSettingCol(header) {

web/building_saas/main/html/tender_price.html

@@ -23,7 +23,7 @@
         <div class="form-check" style="margin-left:40px; margin-top:5px;">
             <label class="form-check-label">
                 <input class="form-check-input" name="cbShowTenderFields" id="cbShowTenderFields" value="true" type="checkbox">
-                显示调价后数据（造价书人材机界面、人材机汇总界面）
+                <span data-toggle="tooltip" data-original-title="造价书界面定额人材机的调价、人材机汇总界面的调价">显示调价后数据</span>
             </label>
         </div>
     </div>

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

@@ -928,12 +928,13 @@ var projectObj = {
             }
             if (!err) {
                 that.project.projectGLJ.calcQuantity(true);//计算分部分项和技术措施项目消耗量;
-                gljCol.initGljCol(that.project.projSetting.glj_col?that.project.projSetting.glj_col.showAdjustPrice:false);
-                subObj.initSubSpread();//初始化主界面下方的表格
-
                 let quantityTime = +new Date();
                 console.log(`计算quantity时间——${quantityTime - mTime}`);
                 that.project.property = projectObj.project.projectInfo.property;
+                gljCol.initGljCol(that.project.projSetting.glj_col?that.project.projSetting.glj_col.showAdjustPrice:false,
+                    that.project.property.tenderSetting.showTenderFields?that.project.property.tenderSetting.showTenderFields:false);
+                subObj.initSubSpread();//初始化主界面下方的表格
+
                 if (typeof overwriteRationCalcBases === 'function')
                     overwriteRationCalcBases(that.project.property.taxType);
                 //that.project.calcProgram.compileAllTemps();