SVN-Revision: r920
This commit is contained in:
cyf
2025-08-07 09:17:15 +00:00
parent 237421c550
commit 32dd8a715b
@@ -742,12 +742,53 @@ namespace Lskj.BaseAccraditation
{ {
GridDetailModel model = this.tab_basicInfo.GetGridDetailModel(tabPage); GridDetailModel model = this.tab_basicInfo.GetGridDetailModel(tabPage);
bool isDetailAttach = (model.IsReadOnly || model.IsChart); bool isDetailAttach = (model.IsReadOnly || model.IsChart);
if (tabPage.Tag is GridControlEx)
{
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(ReplaceHelper.ReplaceRowParam(this._baseRowData, 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);
} }
else if (tabPage.Tag is TabMultipledetails)
{
TabMultipledetails tabMultipledetails = tabPage.Tag as TabMultipledetails;
tabMultipledetails.SetConditionValues(this._baseRowData);
GridControlEx grdExMain = (tabMultipledetails.SplitMain.Panel1.Tag as GridControlEx);
GridDetailModel MainModel = grdExMain.Tag as GridDetailModel;
string searchMainSql = ReplaceHelper.ReplaceRowParam(this._baseRowData, isDetailAttach ? MainModel.DetailSql : GetSearchSql(MainModel)) ;
DataTable firstTable = MainImpl.GetDataTableResult(searchMainSql);
grdExMain.LastSearchSql = searchMainSql;
grdExMain.SetGridViewDataSource(firstTable);
if (tabMultipledetails.SplitMain.Panel2.Tag is GridControlEx)
{
GridControlEx grdExAdditional = (tabMultipledetails.SplitMain.Panel2.Tag as GridControlEx);
GridDetailModel AdditionalModel = grdExAdditional.Tag as GridDetailModel;
string searchAddSql = ReplaceHelper.ReplaceRowParam(this._baseRowData, isDetailAttach ? AdditionalModel.DetailSql : GetSearchSql(AdditionalModel));
if (!MainModel.IsUnioDetail)
{
grdExAdditional.LastSearchSql = searchAddSql;
grdExAdditional.SetGridViewDataSource(MainImpl.GetDataTableResult(searchAddSql));
}
//右侧是左侧的明细,左侧没有数据时。右侧赋空值(因为无法触发左侧行改变事件)
if (MainModel.IsUnioDetail && firstTable.Rows.Count == 0)
{
grdExAdditional.LastSearchSql = "";
grdExAdditional.SetGridViewDataSource(new DataTable());
}
}
else if (tabMultipledetails.SplitMain.Panel2.Tag is ChartControlEx)
{
ChartControlEx grdExAdditional = (tabMultipledetails.SplitMain.Panel2.Tag as ChartControlEx);
GridDetailModel AdditionalModel = grdExAdditional.Tag as GridDetailModel;
string searchAddSql = this.GetSearchSql(AdditionalModel);
DataTable table = MainImpl.GetDataTableResult(searchAddSql);
grdExAdditional.CreateChart(table);
}
}
}
} }
#endregion #endregion
#region #region
@@ -1032,7 +1073,7 @@ namespace Lskj.BaseAccraditation
{ {
details = GetTabDetails(); details = GetTabDetails();
} }
this.tab_basicInfo.InitTabPages(details, false); this.tab_basicInfo.InitTabPages(details);
this.tab_basicInfo.OnRightCallback += new EventHandler(tabBasicInfo_OnRightCallback); this.tab_basicInfo.OnRightCallback += new EventHandler(tabBasicInfo_OnRightCallback);
//设置高度 //设置高度
SetTabHeight(); SetTabHeight();
@@ -1057,11 +1098,52 @@ namespace Lskj.BaseAccraditation
GridDetailModel model = this.tab_basicInfo.GetGridDetailModel(page); GridDetailModel model = this.tab_basicInfo.GetGridDetailModel(page);
//this.tab_basicInfo.SetGridDataSource(page, MainImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(this._baseRowData, model.DetailSql))); //this.tab_basicInfo.SetGridDataSource(page, MainImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(this._baseRowData, model.DetailSql)));
bool isDetailAttach = (model.IsReadOnly || model.IsChart); bool isDetailAttach = (model.IsReadOnly || model.IsChart);
if (page.Tag is GridControlEx)
{
string sqlValue = isDetailAttach ? model.DetailSql : GetSearchSql(model); string sqlValue = isDetailAttach ? model.DetailSql : GetSearchSql(model);
GridControlEx grdExMain = (page.Tag as GridControlEx); GridControlEx grdExMain = (page.Tag as GridControlEx);
if (!isDetailAttach) grdExMain.LastSearchSql = sqlValue; if (!isDetailAttach) grdExMain.LastSearchSql = sqlValue;
this.tab_basicInfo.SetGridDataSource(page, MainImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(this._baseRowData, sqlValue))); this.tab_basicInfo.SetGridDataSource(page, MainImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(this._baseRowData, sqlValue)));
} }
else if (page.Tag is TabMultipledetails)
{
TabMultipledetails tabMultipledetails = page.Tag as TabMultipledetails;
tabMultipledetails.SetConditionValues(this._baseRowData);
GridControlEx grdExMain = (tabMultipledetails.SplitMain.Panel1.Tag as GridControlEx);
GridDetailModel MainModel = grdExMain.Tag as GridDetailModel;
string searchMainSql = ReplaceHelper.ReplaceRowParam(this._baseRowData, isDetailAttach ? MainModel.DetailSql : GetSearchSql(MainModel));
DataTable firstTable = MainImpl.GetDataTableResult(searchMainSql);
grdExMain.LastSearchSql = searchMainSql;
grdExMain.SetGridViewDataSource(firstTable);
if (tabMultipledetails.SplitMain.Panel2.Tag is GridControlEx)
{
GridControlEx grdExAdditional = (tabMultipledetails.SplitMain.Panel2.Tag as GridControlEx);
GridDetailModel AdditionalModel = grdExAdditional.Tag as GridDetailModel;
string searchAddSql = ReplaceHelper.ReplaceRowParam(this._baseRowData, isDetailAttach ? AdditionalModel.DetailSql : GetSearchSql(AdditionalModel));
if (!MainModel.IsUnioDetail)
{
grdExAdditional.LastSearchSql = searchAddSql;
grdExAdditional.SetGridViewDataSource(MainImpl.GetDataTableResult(searchAddSql));
}
//右侧是左侧的明细,左侧没有数据时。右侧赋空值(因为无法触发左侧行改变事件)
if (MainModel.IsUnioDetail && firstTable.Rows.Count == 0)
{
grdExAdditional.LastSearchSql = "";
grdExAdditional.SetGridViewDataSource(new DataTable());
}
}
else if (tabMultipledetails.SplitMain.Panel2.Tag is ChartControlEx)
{
ChartControlEx grdExAdditional = (tabMultipledetails.SplitMain.Panel2.Tag as ChartControlEx);
GridDetailModel AdditionalModel = grdExAdditional.Tag as GridDetailModel;
string searchAddSql = this.GetSearchSql(AdditionalModel);
DataTable table = MainImpl.GetDataTableResult(searchAddSql);
grdExAdditional.CreateChart(table);
}
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -1329,6 +1411,7 @@ namespace Lskj.BaseAccraditation
this.ControlObj = new MyControl(); this.ControlObj = new MyControl();
this.ControlObj.PrimaryValue = this.SysModel.PrimaryValue; this.ControlObj.PrimaryValue = this.SysModel.PrimaryValue;
this.ControlObj.isAuditMain = true;
this.ControlObj.InitControl(this._dtFileds, pl_main, this._dtAddGroup); this.ControlObj.InitControl(this._dtFileds, pl_main, this._dtAddGroup);
if (SystemInfo.Instance.AuditAutoScroll) this.pl_main.AutoScroll = true; if (SystemInfo.Instance.AuditAutoScroll) this.pl_main.AutoScroll = true;
@@ -1579,11 +1662,52 @@ namespace Lskj.BaseAccraditation
bool isDetailAttach = (detailModel.IsReadOnly || detailModel.IsChart); bool isDetailAttach = (detailModel.IsReadOnly || detailModel.IsChart);
if (tabPage.Tag is GridControlEx)
{
string sqlValue = isDetailAttach ? detailModel.DetailSql : GetSearchSql(detailModel); string sqlValue = isDetailAttach ? detailModel.DetailSql : GetSearchSql(detailModel);
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(ReplaceHelper.ReplaceRowParam(this._baseRowData, sqlValue))); this.tab_basicInfo.SetGridDataSource(tabPage, MainImpl.GetDataTableResult(ReplaceHelper.ReplaceRowParam(this._baseRowData, sqlValue)));
} }
else if (tabPage.Tag is TabMultipledetails)
{
TabMultipledetails tabMultipledetails = tabPage.Tag as TabMultipledetails;
tabMultipledetails.SetConditionValues(this._baseRowData);
GridControlEx grdExMain = (tabMultipledetails.SplitMain.Panel1.Tag as GridControlEx);
GridDetailModel MainModel = grdExMain.Tag as GridDetailModel;
string searchMainSql = ReplaceHelper.ReplaceRowParam(this._baseRowData, isDetailAttach ? MainModel.DetailSql : GetSearchSql(MainModel));
DataTable firstTable = MainImpl.GetDataTableResult(searchMainSql);
grdExMain.LastSearchSql = searchMainSql;
grdExMain.SetGridViewDataSource(firstTable);
if (tabMultipledetails.SplitMain.Panel2.Tag is GridControlEx)
{
GridControlEx grdExAdditional = (tabMultipledetails.SplitMain.Panel2.Tag as GridControlEx);
GridDetailModel AdditionalModel = grdExAdditional.Tag as GridDetailModel;
string searchAddSql = ReplaceHelper.ReplaceRowParam(this._baseRowData, isDetailAttach ? AdditionalModel.DetailSql : GetSearchSql(AdditionalModel));
if (!MainModel.IsUnioDetail)
{
grdExAdditional.LastSearchSql = searchAddSql;
grdExAdditional.SetGridViewDataSource(MainImpl.GetDataTableResult(searchAddSql));
}
//右侧是左侧的明细,左侧没有数据时。右侧赋空值(因为无法触发左侧行改变事件)
if (MainModel.IsUnioDetail && firstTable.Rows.Count == 0)
{
grdExAdditional.LastSearchSql = "";
grdExAdditional.SetGridViewDataSource(new DataTable());
}
}
else if (tabMultipledetails.SplitMain.Panel2.Tag is ChartControlEx)
{
ChartControlEx grdExAdditional = (tabMultipledetails.SplitMain.Panel2.Tag as ChartControlEx);
GridDetailModel AdditionalModel = grdExAdditional.Tag as GridDetailModel;
string searchAddSql = this.GetSearchSql(AdditionalModel);
DataTable table = MainImpl.GetDataTableResult(searchAddSql);
grdExAdditional.CreateChart(table);
}
}
}
} }
} }
else else
@@ -1990,6 +2114,27 @@ namespace Lskj.BaseAccraditation
{ {
try try
{ {
if (!string.IsNullOrWhiteSpace(SystemInfo.Instance.AntiAuditUrl) && this.ModuleModelObj.NewVer == 1)
{
//string url = string.Format("/pages/app/app.html?stepcode=200&id=YQPS250610001&xtype=plugins.BaseAccraditation.AuditBackBox&username={0}&password={1}&dllcoid=", ERPInfo.Instance.UserName, "2383C0ADDCD699FB2CB45079ABB39E3CEF242D98");
string url = ReplaceHelper.ReplaceUserInfo(SystemInfo.Instance.AntiAuditUrl);
url = url.Replace("{stepcode}", this.SysModel.StepCode).Replace("{primaryvalue}", this.SysModel.PrimaryValue).Replace("{remark}", txt_remark.Text);
string[] defaultArgs = string.Format(ModuleArgs.DefaultArgs, this.SysModel.FormText, this.SysModel.UserId, this.SysModel.UserName, this.SysModel.Privilege, this.SysModel.ModuleCode).Split('~');
string[] menuArgs = new string[] { "", "", url };
string[] args = defaultArgs.Concat(menuArgs).ToArray();
IForm form = FormHelper.LoadDllForm(ResourceDynamic.PubBrower, args);
form.SubForm.WindowState = FormWindowState.Normal;
DialogResult result = form.SubForm.ShowDialog();
if (result == DialogResult.OK)
{
this.DialogResult = DialogResult.OK;
if (refreshThePage != null) refreshThePage("", ERPInfo.Instance.PageControl.SelectedTabPage.Tag + "");
}
return;
}
if (VerificationRequired()) return; if (VerificationRequired()) return;
int returnd = ExecuteBackSelect(this._baseRowData); int returnd = ExecuteBackSelect(this._baseRowData);