From a3f24c099a536012ecd3dd4a6629b7dcbff2ef82 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 20 一月 2025 11:12:04 +0800
Subject: [PATCH] 用户权限

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 54e22c3..2211461 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -67,10 +67,12 @@
                 frm.ShowDialog();
             };
             btnSave.Click += BtnSave_Click;
+
+           
         }
         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);
         }
@@ -160,14 +162,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);
             }
         }
 
@@ -243,7 +246,8 @@
                         lst.Add(new MesQmCheckitemDt
                         {
                             Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
-                            Forder = int.Parse(row["forder"].ToString()),
+                           // Forder = int.Parse(row["forder"].ToString()),
+                            Forder = 0,
                             FcheckItem = row["FcheckItem"].ToString(),
                             SampleSizeNo = row["SampleSizeNo"].ToString(),
                             FcheckTool = row["FcheckTool"].ToString(),
@@ -303,8 +307,9 @@
         private void getPageList(int curPage)
         {
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            _sbSqlWhere += " and b.guid is not null";
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
-                "a.create_date", "asc", "", _sbSqlWhere.ToString());
+                "org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
             {
@@ -321,6 +326,7 @@
                     {
                         gcMain.DataSource = dt;
                         gcMain.ForceInitialize();
+                        gridView1.BestFitColumns();
                     }
                     else
                         UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -338,7 +344,6 @@
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
 
         private void getModel(string strGuid)
@@ -383,6 +388,7 @@
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
                     }
                     else
                     {
@@ -430,7 +436,6 @@
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
                 return;
-
             var _obj = new
             {
                 guid = rowGuid,
@@ -449,15 +454,14 @@
                         getModel(lbGuid.Text.Trim());
                     else
                         getPageList(this.pageBar1.CurrentPage);
+                    UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString());
                 }
             }
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
-
 
         #region 浠ヤ笅涓虹绉嶄笅鎷�
         private void _setIno()
@@ -708,6 +712,5 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
-
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3