From 69ec7e59f74d0797a1350fbb5ef1d800dfdb8185 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 29 三月 2025 15:28:38 +0800
Subject: [PATCH] 工艺
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
index 16b4985..a8813fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
@@ -26,7 +26,7 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1);
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -44,7 +44,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -68,7 +68,7 @@
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, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -118,8 +118,11 @@
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1);
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ { }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -136,19 +139,20 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
- else
- {
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
- }
+ //if (xtraTabControl1.SelectedTabPageIndex == 1)
+ // getModel(lbGuid.Text.Trim());
+ //else
+ //{
+ // //_filterList.Clear();
+ // //if (gridView1.ActiveFilter.Count > 0)
+ // //{
+ // // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // // gridView1.ActiveFilter.Clear();
+ // // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ // //}
+ // //getPageList(1);
+ // getPageList(this.pageBar1.CurrentPage);
+ //}
}
/// <summary>
--
Gitblit v1.9.3