Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/YangHuCost

modules/glj/controllers/glj_controller.js

@@ -898,7 +898,6 @@ async function getGLJListByProjectID(projectId){
                 usedUnitPriceInfo.id = tmp.property.unitPriceFile.id;
             }
         }
-        responseData.data.gljList = gljList;
         // 先获取对应标段的项目工料机数据
         let gljListModel = new GLJListModel();
         let [gljList, mixRatioConnectData,mixRationMap,unitPriceMap] = await gljListModel.getListByProjectId(projectId, unitPriceFileId);

modules/ration_glj/facade/glj_calculate_facade.js

@@ -98,8 +98,10 @@ function generateRationName(ration,gljList) {
     let caption = ration.caption ? ration.caption:ration.name;
     if(ration.rationAssList && ration.rationAssList.length > 0){
         let ass = ration.rationAssList[0];
-        if(ass.actualValue != null && ass.actualValue != undefined ){
+        if( ass.isAdjust == 1 && ass.actualValue != null && ass.actualValue != undefined ){
             caption =  caption.replace('%s',ass.actualValue);
+        }else {
+            caption =  caption.replace('%s',ass.stdValue);//没勾选的时候要恢复成标准值
         }
     }
     let reNameList = [];

web/building_saas/main/js/views/project_glj_view.js

@@ -58,15 +58,15 @@ projectGljObject={
         this.projectGljSpread.bind(GC.Spread.Sheets.Events.RangeChanged, this.onProjectGljRangeChange);
         this.initProjectGljSheet();
         this.initMaterialTreeSheet();
-        this.initProjectGljRightClick();
         //打开别人分享的项目，只读
         if(projectReadOnly){
             //锁定逻辑走disabledSpread里的
             if(this.projectGljSetting.view.lockColumns){
                 this.projectGljSetting.view.lockColumns = null;
             }
-            disableSpread(this.projectGljSpread);
-            disableRightMenu("project_glj_sheet",this.projectGljSpread,this.rightClickCallback);
+            disableSpread(this.projectGljSpread);  //disableRightMenu("project_glj_sheet",this.projectGljSpread,this.rightClickCallback);
+        }else {
+            this.initProjectGljRightClick();
         }
     },
     initProjectGljSheet:function () {