From 2b0bc7f13cf57e1c383a0547f3057e944de7ab7a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 10 十二月 2024 10:36:30 +0800
Subject: [PATCH] 111
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 130 ++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 38 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 36f0dbb..000d432 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -10,6 +10,7 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -30,9 +31,17 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.btnZanTingClick += ToolBarMenu1_btnZanTingClick;
this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
+ this.toolBarMenu1.btnFtzblClick += ToolBarMenu1_btnFtzblClick;
+ this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
+ this.toolBarMenu1.btnBtnDkgClick += ToolBarMenu1_btnBtnDkgClick;
+ this.toolBarMenu1.btnZanTingClick += ToolBarMenu1_btnZanTingClick;
+ this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick;
+ this.toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
+ this.toolBarMenu1.btnBdllClick += ToolBarMenu1_btnBdllClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -48,10 +57,12 @@
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
}
-
-
-
-
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
+ }
/// <summary>
/// 鍙屽嚮浜嬩欢
/// </summary>
@@ -70,7 +81,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -79,7 +90,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -91,16 +105,39 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
- private async void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
{
_toolCk(1);
}
-
- private async void ToolBarMenu1_btnZanTingClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnFtzblClick(object sender, EventArgs e)
{
-
+ _toolCk(2);
+ }
+ private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
+ {
+ _toolCk(3);
+ }
+ private void ToolBarMenu1_btnBtnDkgClick(object sender, EventArgs e)
+ {
+ _toolCk(4);
+ }
+ private void ToolBarMenu1_btnZanTingClick(object sender, EventArgs e)
+ {
+ _toolCk(5);
+ }
+ private void ToolBarMenu1_btnBdllClick(object sender, EventArgs e)
+ {
+ _toolCk(6);
+ }
+ private void ToolBarMenu1_btnJieAnClick(object sender, EventArgs e)
+ {
+ _toolCk(7);
+ }
+ private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
+ {
+ _toolCk(8);
}
/// <summary>
@@ -139,7 +176,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -159,7 +196,16 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
/// 淇敼浜嬩欢
@@ -232,14 +278,11 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- foreach (FilterEntity itm in _filterList)
- {
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
- }
- PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -249,14 +292,18 @@
{
DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
- pageBar1.setTxt();
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
@@ -267,6 +314,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
@@ -323,7 +371,7 @@
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
- private async void _toolCk(int _inFieldValue)
+ private void _toolCk(int _inFieldValue)
{
string strMsg = "";
switch (_inFieldValue)
@@ -332,19 +380,25 @@
strMsg = "閫氱煡澶囨枡";
break;
case 2:
- strMsg = "寮�宸�";
+ strMsg = "鎾ゅ洖閫氱煡澶囨枡";
break;
case 3:
- strMsg = "寰呭紑宸�";
+ strMsg = "寮�宸�";
break;
case 4:
- strMsg = "宸ュ崟鏆傚仠";
+ strMsg = "寰呭紑宸�";
break;
case 5:
- strMsg = "澶囧崟棰嗘枡";
+ strMsg = "宸ュ崟鏆傚仠";
break;
case 6:
- strMsg = "鎵嬪伐瀹屽伐";
+ strMsg = "澶囧崟棰嗘枡";
+ break;
+ case 7:
+ strMsg = "缁撴";
+ break;
+ case 8:
+ strMsg = "鍙嶇粨妗�";
break;
};
toolBarMenu1.guidKey = "";
@@ -358,7 +412,7 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = rowGuid,
@@ -366,7 +420,7 @@
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -376,14 +430,14 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3