From f14d1fc28a8012035ee251fba71a0d048e9efd0d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 16 一月 2025 09:10:48 +0800
Subject: [PATCH] 工具条切换状态
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index 3056435..f66f2f6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -43,9 +43,9 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
txt_depotId.getSuppler("");
txt_suppId.getSuppler("");
- txt_org.EditChanged += (s, e) =>
+ txt_thOrgId.EditChanged += (s, e) =>
{
- var orgId = txt_org.GetId();
+ var orgId = txt_thOrgId.GetId();
if (string.IsNullOrEmpty(orgId))
return;
txt_suppId.getSuppler(orgId);
@@ -59,7 +59,7 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
return;
}
- var frm = new SelectMesCgthSq(this.txt_suppId.GetId());
+ var frm = new SelectMesCgthSq(this.txt_suppId.GetId(),this.txt_suppId.GetId(), (txt_isOut.Checked == true ? 2 : 1).ToString());
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -91,11 +91,9 @@
frm.ShowDialog();
};
}
-
-
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
await Task.Delay(100);
getPageList(1);
}
@@ -193,8 +191,11 @@
var _rtn = 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);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -217,14 +218,15 @@
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);
+ //_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>
@@ -277,11 +279,11 @@
toolBarMenu1.isSetBtn = false;
var _ckId = txt_depotId.GetId(); //浠撳簱缂栧彿 depots_code
var _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
- string _orgId = txt_org.GetId();
+ string _orgId = txt_thOrgId.GetId();
if (string.IsNullOrEmpty(_orgId))
{
MsgHelper.Warning("璇烽�夋嫨缁勭粐锛�");
- txt_org.Focus();
+ txt_thOrgId.Focus();
return;
}
if (string.IsNullOrEmpty(_gysId))
@@ -390,6 +392,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -445,6 +448,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -459,7 +463,6 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
@@ -512,7 +515,6 @@
}
}
-
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
gvMx1.CloseEditor();
--
Gitblit v1.9.3