From e5414022999d94626b0d55d29d0dba3ce700fea9 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 22 九月 2025 15:40:13 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
index 678a20c..58b8491 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
@@ -26,6 +26,7 @@
         List<FilterEntity> _filterList = new List<FilterEntity>();
         string date;
         string lineNo;
+        string orgId;
         
         // 鐢ㄤ簬璺熻釜鍘熷鍊肩殑瀛楀吀
         private Dictionary<string, Dictionary<string, object>> _originalValues = new Dictionary<string, Dictionary<string, object>>();
@@ -44,7 +45,11 @@
             this.toolBarMenu1.btnLianBanClick += ToolBarMenu1_btnLianBanClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView3);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView4);
             this.toolBarMenu1.getXmlConfig();
+            
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -61,7 +66,7 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
         {
-            var frm = new KQCX(lineNo, date);
+            var frm = new KQCX(lineNo, date, orgId);
             //璧嬪�肩粰鏄庣粏琛�
             frm.UpdateParent += (ss, ee) =>
             {
@@ -69,6 +74,7 @@
                 lst = ee.StringList;
                 lineNo = string.IsNullOrEmpty(lst[0]) ? "0" : lst[0];
                 date = string.IsNullOrEmpty(lst[1]) ? DateTime.Now.AddMonths(-1).ToString() : lst[1];
+                orgId = string.IsNullOrEmpty(lst[2]) ? "1" : lst[2];
                 getPageList();
             };
             frm.ShowDialog();
@@ -117,7 +123,8 @@
             var _obj = new
             {
                 date = date,
-                lineNo = lineNo
+                lineNo = lineNo,
+                orgId = orgId
             };
            // gcMain1.DataSource = null; 
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
@@ -167,11 +174,13 @@
                         Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
                         // 淇濆瓨鍘熷鍊�
                         SaveOriginalValues();
+                        SetGridView2EditState(false);
                     }
                     else
                     {
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl2, gridView2);
                         _originalValues.Clear();
+                        SetGridView2EditState(false);
                     }
 
                     JArray array2 = new JArray();
@@ -228,7 +237,8 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
         {
-           // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+            // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+            SetGridView2EditState(false);
         }
 
         /// <summary>
@@ -242,7 +252,8 @@
             var _obj = new
             {
                 date = date,
-                lineNo = lineNo
+                lineNo = lineNo,
+                orgId = orgId
             };
             try
             {
@@ -320,7 +331,8 @@
             {
                 lineNo = lineNo,
                 date = date,
-                list = list
+                list = list,
+                orgId = orgId
             };
 
             try
@@ -374,6 +386,20 @@
         {
             // 鍏跺畠闇�瑕佺殑UI鐘舵�佸垏鎹�
             //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+            SetGridView2EditState(true);
+
+        }
+
+        private void SetGridView2EditState(bool editable)
+        {
+            // 鍦ㄥ矖
+            var colHour = gridView2.Columns["hour"];
+            if (colHour != null)
+                colHour.OptionsColumn.AllowEdit = editable;
+            // 淇敼鍘熷洜
+            var colReason = gridView2.Columns["reason"];
+            if (colReason != null)
+                colReason.OptionsColumn.AllowEdit = editable;
         }
 
         /// <summary>
@@ -433,7 +459,8 @@
             {
                 lineNo = lineNo,
                 date = date,
-                list = list
+                list = list,
+                orgId = orgId
             };
 
             try
@@ -445,6 +472,7 @@
                     ToolBox.MsgHelper.ShowInformation("淇濆瓨鎴愬姛锛�");
                     getPageList();
                     toolBarMenu1.isSetBtn = true;
+                    SetGridView2EditState(false);
                 }
                 else
                 {
@@ -490,8 +518,23 @@
                     strMsg = "鍙嶅鏍�";
                     break;
             }
-    ;
-            toolBarMenu1.guidKey = "";
+            if (_inFieldValue == 1)
+            {
+                string confirmMsg = $"鏄惁瀹℃牳 浜х嚎鍙凤細{lineNo}锛屾棩鏈燂細{date}锛�";
+                if (MessageBox.Show(confirmMsg, "瀹℃牳纭", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+                {
+                    return;
+                }
+            }
+            else
+            {
+                string confirmMsg = $"鏄惁鍙嶅鏍� 浜х嚎鍙凤細{lineNo}锛屾棩鏈燂細{date}锛�";
+                if (MessageBox.Show(confirmMsg, "瀹℃牳纭", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+                {
+                    return;
+                }
+            }
+                toolBarMenu1.guidKey = "";
             var _obj = new
             {
                 lineNo = lineNo,

--
Gitblit v1.9.3