From 06d6a778ee0762d5b1108278f15ec8f8261ea8ba Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期三, 19 二月 2025 10:25:46 +0800 Subject: [PATCH] 布局 --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 63 ++++++++++++++++++++++--------- 1 files changed, 44 insertions(+), 19 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs index eaae209..12f033d 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; using System.Data; -using System.Drawing; using System.Threading.Tasks; using System.Windows.Forms; @@ -28,6 +27,9 @@ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gridView1); + Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); @@ -41,24 +43,33 @@ }); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; + this.txt_fSubsidiary.EditChanged += (s, e) => + { + string _orgId = txt_fSubsidiary.GetId(); + if (string.IsNullOrEmpty(_orgId)) + return; + txt_suppId.getSuppler(_orgId); + txt_itemId.getSuppler(_orgId); + }; txt_itemId.EditChanged += (s, e) => { - txt_itemNo.Text = this.txt_itemId.GetCode(); + if (!string.IsNullOrEmpty(this.txt_itemId.GetCode())) + txt_itemNo.Text = this.txt_itemId.GetCode(); }; - txt_suppId.getSuppler(""); txt_suppId.EditChanged += (s, e) => { - txtGysNo.Text = this.txt_suppId.GetCode(); + if (!string.IsNullOrEmpty(this.txt_suppId.GetCode())) + txt_suppNo.Text = this.txt_suppId.GetCode(); }; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { - _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); + Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); Task.Delay(100); getPageList(1); } - + /// <summary> /// 鍒嗛〉浜嬩欢 /// </summary> @@ -128,8 +139,11 @@ ReturnModel<dynamic> _rtn = ToolBox.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); } ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); } @@ -150,14 +164,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> @@ -198,6 +213,13 @@ toolBarMenu1.isSetBtn = false; string _ItemId = txt_itemId.GetId(); string _suppNo = txt_suppId.GetId(); + string _orgId = txt_fSubsidiary.GetId(); + //if (string.IsNullOrEmpty(_orgId)) + //{ + // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨缁勭粐锛�"); + // txt_OrgName.Focus(); + // return; + //} if (string.IsNullOrEmpty(_ItemId)) { Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�"); @@ -242,9 +264,9 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); - PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date", "asc", "", _sbSqlWhere.ToString()); + _sbSqlWhere += " and b.guid is not null"; + PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,b.ITEM_NO", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try { @@ -259,6 +281,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); + gridView1.BestFitColumns(); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); @@ -307,7 +330,6 @@ dynamic dy = _rtn.rtnData; lbGuid.Text = strGuid; UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit); - } else ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); @@ -385,6 +407,7 @@ getModel(lbGuid.Text.Trim()); else getPageList(this.pageBar1.CurrentPage); + UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } } catch (Exception ex) @@ -392,5 +415,7 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } + + } } \ No newline at end of file -- Gitblit v1.9.3