From 8fe5fc7c9e254d8b5c846bd2da8d8fd0f22f1e63 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 19 十二月 2024 17:45:06 +0800
Subject: [PATCH] 工单之前的细节
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 154 ++++++++++++++++++++++++++++++--------------------
1 files changed, 92 insertions(+), 62 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 36f0dbb..b3ae679 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,6 +1,3 @@
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using DevExpress.XtraPivotGrid.Data;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -9,7 +6,7 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -28,30 +25,21 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- this.toolBarMenu1.btnZanTingClick += ToolBarMenu1_btnZanTingClick;
+ this.toolBarMenu1.btnZhongTaiClick += ToolBarMenu1_btnZhongTaiClick;
this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
+ this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- Font f = new Font("寰蒋闆呴粦", 16);
- Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- 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 +58,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -79,7 +67,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 +82,37 @@
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);
+ _toolCk(7);
}
-
- private async void ToolBarMenu1_btnZanTingClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
{
-
+ _toolCk(8);
+ }
+ private void ToolBarMenu1_btnWgClick(object sender, EventArgs e)
+ {
+ _toolCk(9);
+ }
+ private void ToolBarMenu1_btnZhongTaiClick(object sender, EventArgs e)
+ {
+ var frm = new showZhongTai();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ int _zt = int.Parse(ee.StringSingle.Split(',')[0]);
+ _toolCk(_zt);
+ };
+ frm.ShowDialog();
+ }
+ private void ToolBarMenu1_btnJieAnClick(object sender, EventArgs e)
+ {
+ _toolCk(7);
+ }
+ private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
+ {
+ _toolCk(8);
}
/// <summary>
@@ -139,7 +151,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -159,7 +171,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 +253,10 @@
/// </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 +266,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 +288,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
@@ -323,28 +345,37 @@
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
- private async void _toolCk(int _inFieldValue)
+ private void _toolCk(int _inFieldValue)
{
string strMsg = "";
switch (_inFieldValue)
{
case 1:
- strMsg = "閫氱煡澶囨枡";
- break;
- case 2:
- strMsg = "寮�宸�";
- break;
- case 3:
strMsg = "寰呭紑宸�";
break;
- case 4:
+ case 2:
strMsg = "宸ュ崟鏆傚仠";
break;
+ case 3:
+ strMsg = "鎾ゅ洖瀹屽伐";
+ break;
+ case 4:
+ strMsg = "绱ф�ュ鏂�";
+ break;
case 5:
- strMsg = "澶囧崟棰嗘枡";
+ strMsg = "鏆傚仠澶囨枡";
break;
case 6:
- strMsg = "鎵嬪伐瀹屽伐";
+ strMsg = "鎾ゅ洖澶囨枡";
+ break;
+ case 7:
+ strMsg = "閫氱煡澶囨枡";
+ break;
+ case 8:
+ strMsg = "寮�宸�";
+ break;
+ case 9:
+ strMsg = "鎵嬪姩瀹屽伐";
break;
};
toolBarMenu1.guidKey = "";
@@ -358,7 +389,6 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
- UcLoading _loading = new UcLoading();
var _obj = new
{
guid = rowGuid,
@@ -366,7 +396,7 @@
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -376,14 +406,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