From 0c3d3f4b2be6e38afde96537c73c38d2d18b96fe Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 20 十一月 2024 13:53:11 +0800
Subject: [PATCH] 工单

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
index e596080..80e28c1 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -6,7 +6,6 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
 using DevExpress.XtraGrid.Views.Grid;
-using FastReport.Dialog;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -33,12 +32,15 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+            gridView1.FocusedRowChanged += (s, e) =>
+            {
+                UtilityHelper.SetCheckIco(s, picCheckBox, this);
+            };
             gridView1.CustomDrawRowIndicator +=
                 GridView1_CustomDrawRowIndicator;
             getPageList(1, UtilityHelper.GetPageSize());
             pageBar1.PagerEvent += PageBar1_PagerEvent;
         }
- 
 
         private void GridView1_CustomDrawRowIndicator(object sender,
             RowIndicatorCustomDrawEventArgs e)
@@ -148,7 +150,7 @@
             }
 
             getModel(rowGuid, true, 1);
-          
+
         }
         /// <summary>
         ///     鍒犻櫎浜嬩欢
@@ -200,8 +202,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>
@@ -248,7 +252,7 @@
 
             var _obj = new
             {
-                guid = lbGuid.Text.Trim(), //涓诲缓
+                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 name = txt_name.Text.Trim(),
                 time1 = txt_begTime.Value.Date,
                 time2 = txt_endTime.Value.Date,

--
Gitblit v1.9.3