From b7b06604c4057163332b4017e02fe38bb40f51e4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 03 十二月 2024 21:46:00 +0800
Subject: [PATCH] 修改了初始化

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs |  131 ++++++++++++++-----------------------------
 1 files changed, 42 insertions(+), 89 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index a641ab8..984913a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -10,9 +10,9 @@
 using Gs.DevApp.DevFrm.QC.Models;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using static DevExpress.XtraPrinting.Native.PageSizeInfo;
 
 namespace Gs.DevApp.DevFrm.QC
 {
@@ -24,14 +24,17 @@
         public Frm_IQCLookups()
         {
             InitializeComponent();
-            toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
             toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
             toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
             toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
             toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
-            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+            gridView1.FocusedRowChanged += (s, e) =>
+            {
+                UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", "");
+            };
             getPageList(1, UtilityHelper.GetPageSize());
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             gridView1.CustomDrawRowIndicator += (s, e) =>
@@ -73,32 +76,36 @@
         {
             getPageList(curPage, pageSize);
         }
-
+      
         /// <summary>
-        ///     鏌ヨ浜嬩欢
+        ///     鍙嶅鏍�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
         {
-            var frm =
-                new ShowFilter(gridView1.Columns,
-                    _filterList);
-            frm.UpdateParent += Frm_UpdateParent;
-            frm.ShowDialog();
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_lookupTypeCode, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
+           
         }
 
         /// <summary>
-        ///     鏌ヨ鍥炶皟
+        ///     瀹℃牳浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
         {
-            _filterList = e.FilterList;
-            getPageList(1, pageBar1.RowsCount);
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_lookupTypeCode, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
         }
-
         /// <summary>
         ///     鍙栨秷浜嬩欢
         /// </summary>
@@ -108,49 +115,7 @@
         {
             UtilityHelper.JumpToTab(xtraTabControl1, 0);
         }
-
-        /// <summary>
-        ///     鍒犻櫎浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
-        {
-            string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_lookupTypeCode, gridView1);
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
-                return;
-            var lst = new List<dynamic>();
-            lst.Add(rowGuid);
-            var _obj = lst;
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "DeleteModel",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn =
-                    UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
-                    getPageList(1, UtilityHelper.GetPageSize());
-                }
-
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
+ 
         /// <summary>
         ///     鍒锋柊浜嬩欢
         /// </summary>
@@ -158,8 +123,10 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-            getPageList(1, UtilityHelper.GetPageSize());
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim(), false, 999);
+            else
+                getPageList(1, UtilityHelper.GetPageSize());
         }
 
         /// <summary>
@@ -177,25 +144,7 @@
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-
             getModel(rowGuid, true, 1);
-        }
-
-        /// <summary>
-        ///     鏂板浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
-        {
-            UtilityHelper.JumpToTab(xtraTabControl1, 1);
-            lbGuid.Text = "";
-            var gridViews =
-                new List<GridView>();
-            gridViews.Add(gvMx1);
-            UtilityHelper.CleanValueByControl(panel1.Controls, true,
-                gridViews);
-            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
         }
 
         /// <summary>
@@ -213,6 +162,8 @@
                 return;
             }
 
+            gvMx1.CloseEditor();
+            gvMx1.UpdateCurrentRow();
             var lst = new List<MesSysLookups>();
             for (var i = 0; i < gvMx1.DataRowCount; i++)
             {
@@ -220,9 +171,7 @@
                 if (row != null)
                     lst.Add(new MesSysLookups
                     {
-                        Guid = row["Guid"].ToString().Length > 0
-                            ? Guid.Parse(row["Guid"].ToString())
-                            : Guid.Empty,
+                        Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
                         LookupName = row["LookupName"].ToString(),
                         LookupValue = row["LookupValue"].ToString()
                     });
@@ -230,9 +179,8 @@
 
             var _obj = new MesSysLookupTypes
             {
-                Guid = lbGuid.Text.Trim().Length > 0
-                    ? Guid.Parse(lbGuid.Text.Trim())
-                    : Guid.Empty,
+                
+                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                 LookupTypeCode = txt_lookupTypeCode.Text,
                 LookupTypeName = txt_lookupTypeName.Text,
                 list = lst
@@ -250,8 +198,7 @@
                 {
                     lbGuid.Text = _rtn.rtnData;
                     toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(panel1.Controls,
-                        false);
+                    getModel(lbGuid.Text, false, 1);
                 }
             }
             catch (Exception ex)
@@ -291,7 +238,6 @@
                 pageBar1.TotalPages = dddd;
                 pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
                 pageBar1.CurrentPage = curPage; //褰撳墠椤�
-                pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
                 pageBar1.setTxt();
             }
             catch (Exception ex)
@@ -362,6 +308,8 @@
         private void repositoryItemButtonEdit1_ButtonClick(object sender,
             ButtonPressedEventArgs e)
         {
+            gvMx1.CloseEditor();
+            gvMx1.UpdateCurrentRow();
             var rowhandle = gvMx1.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
@@ -371,6 +319,11 @@
                 var mxGuid = dr["guid"].ToString();
                 if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
                     return;
+                if (string.IsNullOrEmpty(mxGuid))
+                {
+                    gvMx1.DeleteRow(rowhandle);
+                    return;
+                }
                 var strJson = "";
                 var lst = new List<string>();
                 lst.Add(mxGuid);

--
Gitblit v1.9.3