From cef3b10ff4a9ea1c6980a092a8c14c11681d8f89 Mon Sep 17 00:00:00 2001 From: cyf Date: Thu, 7 Aug 2025 09:32:32 +0000 Subject: [PATCH] SVN r927 SVN-Revision: r927 --- .../Lskj.PubAccraditation/FrmAccraditation.cs | 74 +++++++++++++++++-- 1 file changed, 69 insertions(+), 5 deletions(-) diff --git a/插件库/Lskj.PubAccraditation/FrmAccraditation.cs b/插件库/Lskj.PubAccraditation/FrmAccraditation.cs index f8a2f37..db331fd 100644 --- a/插件库/Lskj.PubAccraditation/FrmAccraditation.cs +++ b/插件库/Lskj.PubAccraditation/FrmAccraditation.cs @@ -962,6 +962,7 @@ namespace Lskj.PubAccraditation dtControlLocation = BaseModuleImpl.GetControlLocation(this.BillModelObj.FormKey, this.SysModel.ModuleCode); } this.ControlObj.PrimaryValue = this.SysModel.BillDocumentId; + this.ControlObj.isAuditMain = true; this.ControlObj.InitControl(dtControlLocation, this.pl_left_top); if (SystemInfo.Instance.AuditAutoScroll) { @@ -2061,11 +2062,52 @@ namespace Lskj.PubAccraditation bool isDetailAttach = (model.IsReadOnly || model.IsChart); - string sqlValue = isDetailAttach ? ReplaceHelper.ReplaceRowParam(dataRow, model.DetailSql) : GetSearchSql(model); - GridControlEx grdExMain = (tabPage.Tag as GridControlEx); - if (!isDetailAttach) grdExMain.LastSearchSql = sqlValue; - //this.tab_basicInfo.SetGridDataSource(tabPage, MainImpl.GetDataTableResult(sqlValue)); - this.tab_basicInfo.SetGridDataSource(tabPage, sqlValue); + if (tabPage.Tag is GridControlEx) + { + string sqlValue = isDetailAttach ? ReplaceHelper.ReplaceRowParam(dataRow, model.DetailSql) : GetSearchSql(model); + GridControlEx grdExMain = (tabPage.Tag as GridControlEx); + if (!isDetailAttach) grdExMain.LastSearchSql = sqlValue; + //this.tab_basicInfo.SetGridDataSource(tabPage, MainImpl.GetDataTableResult(sqlValue)); + this.tab_basicInfo.SetGridDataSource(tabPage, sqlValue); + } + else if (tabPage.Tag is TabMultipledetails) + { + TabMultipledetails tabMultipledetails = tabPage.Tag as TabMultipledetails; + tabMultipledetails.SetConditionValues(dataRow); + GridControlEx grdExMain = (tabMultipledetails.SplitMain.Panel1.Tag as GridControlEx); + GridDetailModel MainModel = grdExMain.Tag as GridDetailModel; + string searchMainSql = isDetailAttach ? ReplaceHelper.ReplaceRowParam(dataRow, MainModel.DetailSql) : this.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 = isDetailAttach ? ReplaceHelper.ReplaceRowParam(dataRow, AdditionalModel.DetailSql) : this.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 @@ -2844,6 +2886,28 @@ namespace Lskj.PubAccraditation { try { + + if (!string.IsNullOrWhiteSpace(SystemInfo.Instance.AntiAuditUrl) && this.BillModelObj.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.BillDocumentId).Replace("{remark}", txtRemark.Text).Replace("&isbase=1", ""); + 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; this._auditAdvice = txtRemark.Text;