From b94097020bf79e3d5f046ac4fbd3c05efcda30b3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 03 十二月 2024 15:16:27 +0800
Subject: [PATCH] 删除了用户空间的id
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 88 +++++++++++++++++++++++++++-----------------
1 files changed, 54 insertions(+), 34 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 8f23f1d..42a9f5a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -3,6 +3,7 @@
using System.Data;
using System.Drawing;
using System.Text;
+using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
@@ -34,7 +35,12 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ gridView1.FocusedRowChanged += (s, e) =>
+ {
+ UtilityHelper.SetCheckIco(s, picCheckBox, this, "foneChecked", "");
+ };
+ getPageList(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
@@ -53,7 +59,12 @@
//鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
_setIno();
}
-
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ await Task.Delay(100);
+ getPageList(1);
+ }
/// <summary>
/// 鍙屽嚮浜嬩欢
/// </summary>
@@ -75,7 +86,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
@@ -85,9 +96,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- var frm =
- new 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();
}
@@ -100,7 +112,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
/// 鎵瑰噯
@@ -119,7 +131,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -197,7 +209,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -217,7 +229,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>
@@ -263,7 +284,7 @@
{
toolBarMenu1.isSetBtn = false;
string _ItemId = txt_ItemId.GetId()
-; if (string.IsNullOrEmpty(_ItemId))
+; if (string.IsNullOrEmpty(_ItemId))
{
MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
txt_ItemId.Focus();
@@ -287,7 +308,7 @@
Fstand = row["Fstand"].ToString(),
FacLevel = row["FacLevel"].ToString(),
FspecRequ = row["FspecRequ"].ToString(),
- Memo = row["memo"].ToString(),
+ Memo = row["memo"].ToString(),
FupAllow = row["FupAllow"].ToString(),
FdownAllow = row["FdownAllow"].ToString(),
});
@@ -301,7 +322,7 @@
ItemNo = txt_itemNo.Text.Trim(),
Isenabled = txt_isenabled.Checked,
Ftype = "1",
- Fversion =Gs.DevApp.ToolBox.UtilityHelper.ToLong( txt_fversion.Text.Trim()),
+ Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
list = lst
};
try
@@ -332,36 +353,36 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private async void getPageList(int curPage)
{
- var _sbSqlWhere =
- new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
+ UcLoading _loading = new UcLoading();
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, pageSize,
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
"a.create_date", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = UtilityHelper.HttpPost("",
- // _webServiceName + "GetListPageIQC", json);
+ var strReturn = await UtilityHelper.HttpPostAsync("",
_webServiceName + "GetListPage", json);
var dd =
UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
- var dt = dd.rtnData.list;
+ DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
- pageBar1.setTxt();
+ 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.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
@@ -372,6 +393,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ _loading.Close();
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
@@ -390,7 +412,7 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- // _webServiceName + "GetModelIQC",
+ // _webServiceName + "GetModelIQC",
_webServiceName + "GetModel",
JsonConvert.SerializeObject(_obj));
var _rtn =
@@ -489,7 +511,6 @@
private void _setIno()
{
- txt_ItemId.KeyFile = "id";
txt_ItemId.EditChanged += (s, e) =>
{
txt_itemModel.Text = this.txt_ItemId.GetModel();
@@ -641,7 +662,6 @@
gvMx1.UpdateCurrentRow();
gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
-
}
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
--
Gitblit v1.9.3