From 1c8df1e24fcf4a18c1d96ec6f6821d24313d73aa Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 26 七月 2025 15:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
index 678a20c..564c21e 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
@@ -167,11 +167,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 +230,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>
@@ -374,6 +377,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>
@@ -445,6 +462,7 @@
ToolBox.MsgHelper.ShowInformation("淇濆瓨鎴愬姛锛�");
getPageList();
toolBarMenu1.isSetBtn = true;
+ SetGridView2EditState(false);
}
else
{
@@ -490,8 +508,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