From b0cebba8ea5393c5de74f4b09078f7a4d3d3e8cf Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 十二月 2024 10:38:09 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/User/User.cs | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index 2c9557a..7242d95 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -28,14 +28,14 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -106,7 +106,7 @@
{
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_userName, gridView1);
+ lbGuid, txt_userName, gridView1, "userName");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -174,7 +174,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
getModel(rowGuid, true, 1);
}
@@ -257,9 +256,8 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "CREATE_TIME",
"asc", "", _sbSqlWhere.ToString());
@@ -267,7 +265,7 @@
try
{
var strReturn =
- await UtilityHelper.HttpPostAsync("", "User/GetListPage", json);
+ UtilityHelper.HttpPost("", "User/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -295,7 +293,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Close();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
--
Gitblit v1.9.3