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_MESJJERRORJS.Designer.cs |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
index 0a38a7b..d0d4cda 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
@@ -307,6 +307,7 @@
             this.gridColumn6.FieldName = "checkStatus";
             this.gridColumn6.MinWidth = 31;
             this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 0;
             this.gridColumn6.Width = 117;
@@ -945,6 +946,7 @@
             this.gridColumn16.FieldName = "staffId";
             this.gridColumn16.MinWidth = 30;
             this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.OptionsColumn.ReadOnly = true;
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 0;
             this.gridColumn16.Width = 112;
@@ -955,6 +957,7 @@
             this.gridColumn9.FieldName = "staffNo";
             this.gridColumn9.MinWidth = 30;
             this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 1;
             this.gridColumn9.Width = 112;
@@ -965,6 +968,7 @@
             this.gridColumn10.FieldName = "staffName";
             this.gridColumn10.MinWidth = 30;
             this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.OptionsColumn.ReadOnly = true;
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 2;
             this.gridColumn10.Width = 112;
@@ -975,6 +979,7 @@
             this.gridColumn11.FieldName = "hour";
             this.gridColumn11.MinWidth = 30;
             this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Tag = "edit";
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 3;
             this.gridColumn11.Width = 112;
@@ -986,6 +991,7 @@
             this.gridColumn12.FieldName = "lineNo";
             this.gridColumn12.MinWidth = 30;
             this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Tag = "edit";
             this.gridColumn12.Visible = true;
             this.gridColumn12.VisibleIndex = 4;
             this.gridColumn12.Width = 112;
@@ -1023,7 +1029,7 @@
             this.gridColumn14.FieldName = "salary";
             this.gridColumn14.MinWidth = 30;
             this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.OptionsColumn.ReadOnly = true;
+            this.gridColumn14.Tag = "edit";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 6;
             this.gridColumn14.Width = 112;
@@ -1034,6 +1040,7 @@
             this.gridColumn15.FieldName = "remark";
             this.gridColumn15.MinWidth = 30;
             this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Tag = "edit";
             this.gridColumn15.Visible = true;
             this.gridColumn15.VisibleIndex = 7;
             this.gridColumn15.Width = 112;

--
Gitblit v1.9.3