SVN r589
SVN-Revision: r589
This commit is contained in:
@@ -745,7 +745,7 @@ namespace Lskj.BaseAccraditation
|
|||||||
string sqlValue = isDetailAttach ? model.DetailSql : GetSearchSql(model);
|
string sqlValue = isDetailAttach ? model.DetailSql : GetSearchSql(model);
|
||||||
GridControlEx grdExMain = (tabPage.Tag as GridControlEx);
|
GridControlEx grdExMain = (tabPage.Tag as GridControlEx);
|
||||||
if (!isDetailAttach) grdExMain.LastSearchSql = sqlValue;
|
if (!isDetailAttach) grdExMain.LastSearchSql = sqlValue;
|
||||||
this.tab_basicInfo.SetGridDataSource(tabPage, MainImpl.GetDataTableResult(this.ControlObj.ReplaceControlValue(sqlValue)));
|
this.tab_basicInfo.SetGridDataSource(tabPage, MainImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(this._baseRowData, sqlValue)));
|
||||||
if (!model.IsReadOnly) isModifyPage.Add(model.FormKey, tabPage);
|
if (!model.IsReadOnly) isModifyPage.Add(model.FormKey, tabPage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1055,7 +1055,8 @@ namespace Lskj.BaseAccraditation
|
|||||||
foreach (XtraTabPage page in this.tab_basicInfo.TabControlObj.TabPages)
|
foreach (XtraTabPage page in this.tab_basicInfo.TabControlObj.TabPages)
|
||||||
{
|
{
|
||||||
GridDetailModel model = this.tab_basicInfo.GetGridDetailModel(page);
|
GridDetailModel model = this.tab_basicInfo.GetGridDetailModel(page);
|
||||||
this.tab_basicInfo.SetGridDataSource(page, MainImpl.GetDataTableResult(this.ControlObj.ReplaceControlValue(model.DetailSql)));
|
|
||||||
|
this.tab_basicInfo.SetGridDataSource(page, MainImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(this._baseRowData, model.DetailSql)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -1528,17 +1529,19 @@ namespace Lskj.BaseAccraditation
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
bool isSuccess = false;//是否保存成功
|
||||||
if (this.ControlObj.VerifyNull())
|
if (this.ControlObj.VerifyNull())
|
||||||
{
|
{
|
||||||
if (this.ControlObj.VerifyUpdated())
|
if (this.ControlObj.VerifyUpdated())
|
||||||
{
|
{
|
||||||
if (this.ControlObj.SaveBaseModuleData(this.SysModel.ModuleCode, this.ModuleModelObj.MenuTable, this.ModuleModelObj.ParmaryKey, ref this.SysModel.PrimaryValue, false, "", true, ModuleModelObj.NewVer))
|
if (this.ControlObj.SaveBaseModuleData(this.SysModel.ModuleCode, this.ModuleModelObj.MenuTable, this.ModuleModelObj.ParmaryKey, ref this.SysModel.PrimaryValue, false, "", true, ModuleModelObj.NewVer))
|
||||||
{
|
{
|
||||||
|
isSuccess = true;
|
||||||
foreach (XtraTabPage item in this.tab_basicInfo.TabControlObj.TabPages)
|
foreach (XtraTabPage item in this.tab_basicInfo.TabControlObj.TabPages)
|
||||||
{
|
{
|
||||||
XtraTabPage tabPage = item as XtraTabPage;
|
XtraTabPage tabPage = item as XtraTabPage;
|
||||||
GridDetailModel detailModel = this.tab_basicInfo.GetGridDetailModel(tabPage);
|
GridDetailModel detailModel = this.tab_basicInfo.GetGridDetailModel(tabPage);
|
||||||
this.tab_basicInfo.SetGridDataSource(tabPage, MainImpl.GetDataTableResult(this.ControlObj.ReplaceControlValue(detailModel.DetailSql)));
|
this.tab_basicInfo.SetGridDataSource(tabPage, MainImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(this._baseRowData, detailModel.DetailSql)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1547,6 +1550,8 @@ namespace Lskj.BaseAccraditation
|
|||||||
MessageUtil.Show(ResourceKeys.UnUpdateData);
|
MessageUtil.Show(ResourceKeys.UnUpdateData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.ModuleModelObj.SaveSuccessfullyRefresh && !isSuccess) return;//保存成功才刷新
|
||||||
// 刷新主表
|
// 刷新主表
|
||||||
this._flowRowData = BaseAuditImpl.GetCurrentFlowRowData(this.ModuleModelObj.MenuTable, this.ModuleModelObj.ParmaryKey, this.SysModel.PrimaryValue);
|
this._flowRowData = BaseAuditImpl.GetCurrentFlowRowData(this.ModuleModelObj.MenuTable, this.ModuleModelObj.ParmaryKey, this.SysModel.PrimaryValue);
|
||||||
this._baseRowData = BaseAuditImpl.GetCurrentControlData(ReplaceHelper.ReplaceWhereCond(ReplaceHelper.ReplaceUserInfo(this.ModuleModelObj.MenuSql)), this.ModuleModelObj.ParmaryKey, this.SysModel.PrimaryValue);
|
this._baseRowData = BaseAuditImpl.GetCurrentControlData(ReplaceHelper.ReplaceWhereCond(ReplaceHelper.ReplaceUserInfo(this.ModuleModelObj.MenuSql)), this.ModuleModelObj.ParmaryKey, this.SysModel.PrimaryValue);
|
||||||
|
|||||||
Reference in New Issue
Block a user