From cdca5a70b3fac5f804a6eabb7a3976f8c00e35e8 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 08 四月 2025 16:40:30 +0800 Subject: [PATCH] fqc --- DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs index 00105b8..f29129b 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs @@ -26,7 +26,6 @@ txt_bl017.Text = _strType; txt_bl017.Tag = "moren." + _strType; } - protected override void OnCreateControl() { base.OnCreateControl(); @@ -47,14 +46,14 @@ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "bl018", "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); - }); + }, tips); Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => { getModel(value); }, (value) => { getPageList(this.pageBar1.CurrentPage); - }); + }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; //璁剧疆缁勭粐 @@ -78,9 +77,10 @@ txt_bl002.Text = txt_aboutGuid.GetPrdNo(); txt_bl014.Text = txt_aboutGuid.GetPrdName(); txt_bl015.Text = txt_aboutGuid.GetPrdModel(); - txt_bl011.Text = txt_aboutGuid.GetWorkName(); + txt_dptName.Text = txt_aboutGuid.GetWorkName(); txt_bl012.Text = txt_aboutGuid.GetWorkXb(); txt_bl013.Text = txt_aboutGuid.GetRwd(); + txt_tldh.Text = txt_aboutGuid.GetTldh(); var _obj = new { currentPage = 1, @@ -97,6 +97,7 @@ var rtn = UtilityHelper.ReturnToTablePage(strReturn); var dt = rtn.rtnData.list; this.repositoryItemSearchLookUpEdit1.DataSource = dt; + this.repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup; } catch (Exception ex) { @@ -106,7 +107,7 @@ } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { - Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); + _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); Task.Delay(100); getPageList(1); } @@ -145,10 +146,16 @@ /// <param name="e"></param> private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) { + Form parentForm; + if (this.Parent is Form) + parentForm = this.Parent as Form; + else + parentForm = this.Parent.Parent as Form; + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; gridView1.ActiveFilter.Clear(); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; - var frm = new ShowFilter(gridView1.Columns, _filterList); + var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } @@ -257,7 +264,7 @@ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); if (xtraTabControl1.SelectedTabPageIndex == 1) { - getModel(lbGuid.Text.Trim()); + getModel(rowGuid); } else { @@ -370,6 +377,7 @@ gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); toolBarMenu1.currentAction = ""; + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } } catch (Exception ex) @@ -402,7 +410,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); @@ -464,6 +472,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { -- Gitblit v1.9.3