|
@@ -245,7 +245,7 @@ let gljCol = {
|
|
|
setting.view.lockColumns = newArray;
|
|
setting.view.lockColumns = newArray;
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- initGljCol:function (showAdjustPrice, showTenderFields) {
|
|
|
|
|
|
|
+ initGljCol:function (showAdjustPrice, showTenderFields,init=false) {
|
|
|
let me = gljCol;
|
|
let me = gljCol;
|
|
|
if(showAdjustPrice !== true){
|
|
if(showAdjustPrice !== true){
|
|
|
me.removeCol('adjustPrice',me.ration_glj_setting);
|
|
me.removeCol('adjustPrice',me.ration_glj_setting);
|
|
@@ -256,14 +256,14 @@ let gljCol = {
|
|
|
me.removeCol('is_adjust_price',me.project_glj_setting);
|
|
me.removeCol('is_adjust_price',me.project_glj_setting);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- me.showTenderFields(showTenderFields, false);
|
|
|
|
|
|
|
+ me.showTenderFields(showTenderFields, false,init);
|
|
|
gljOprObj.setting = me.ration_glj_setting;
|
|
gljOprObj.setting = me.ration_glj_setting;
|
|
|
projectGljObject.projectGljSetting = me.project_glj_setting;
|
|
projectGljObject.projectGljSetting = me.project_glj_setting;
|
|
|
projectGljObject.mixRatioSetting = me.mixRatio_Setting;
|
|
projectGljObject.mixRatioSetting = me.mixRatio_Setting;
|
|
|
me.setScopeFormater();
|
|
me.setScopeFormater();
|
|
|
gljOprObj.scopeSetting = me.scopeSetting;
|
|
gljOprObj.scopeSetting = me.scopeSetting;
|
|
|
},
|
|
},
|
|
|
- showTenderFields: function (showFields = false, needRefresh = false){
|
|
|
|
|
|
|
+ showTenderFields: function (showFields = false, needRefresh = false,init=false){
|
|
|
let me = gljCol;
|
|
let me = gljCol;
|
|
|
|
|
|
|
|
let PGLJHeader = me.project_glj_setting.header;
|
|
let PGLJHeader = me.project_glj_setting.header;
|
|
@@ -289,7 +289,7 @@ let gljCol = {
|
|
|
|
|
|
|
|
colSettingObj.setVisible('feesIndex.common.tenderUnitFee', showFields);
|
|
colSettingObj.setVisible('feesIndex.common.tenderUnitFee', showFields);
|
|
|
colSettingObj.setVisible('feesIndex.common.tenderTotalFee', showFields);
|
|
colSettingObj.setVisible('feesIndex.common.tenderTotalFee', showFields);
|
|
|
- colSettingObj.updateColSetting(true);
|
|
|
|
|
|
|
+ colSettingObj.updateColSetting(true,init);
|
|
|
|
|
|
|
|
if (needRefresh){
|
|
if (needRefresh){
|
|
|
if(projectGljObject.projectGljSpread) {
|
|
if(projectGljObject.projectGljSpread) {
|