From ae28c33700e413d5acf60d1e48bbc9870bdef5a5 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 15 八月 2025 11:27:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs |   43 +++++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
index 068dd3b..5b97f88 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
@@ -241,6 +241,7 @@
             // split1
             // 
             this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
@@ -254,8 +255,9 @@
             // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 544;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
@@ -264,7 +266,7 @@
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1126, 505);
+            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -354,7 +356,7 @@
             this.gv_outDate.OptionsColumn.AllowEdit = false;
             this.gv_outDate.Tag = "query_a.out_date";
             this.gv_outDate.Visible = true;
-            this.gv_outDate.VisibleIndex = 3;
+            this.gv_outDate.VisibleIndex = 5;
             this.gv_outDate.Width = 120;
             // 
             // gv_outType
@@ -367,7 +369,7 @@
             this.gv_outType.OptionsColumn.AllowEdit = false;
             this.gv_outType.Tag = "query_a.out_type";
             this.gv_outType.Visible = true;
-            this.gv_outType.VisibleIndex = 4;
+            this.gv_outType.VisibleIndex = 6;
             this.gv_outType.Width = 94;
             // 
             // gv_checkUser
@@ -380,7 +382,7 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.check_user";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 5;
+            this.gv_checkUser.VisibleIndex = 7;
             this.gv_checkUser.Width = 94;
             // 
             // gv_checkDate
@@ -393,7 +395,7 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 6;
+            this.gv_checkDate.VisibleIndex = 8;
             this.gv_checkDate.Width = 120;
             // 
             // gv_receiver
@@ -406,7 +408,7 @@
             this.gv_receiver.OptionsColumn.AllowEdit = false;
             this.gv_receiver.Tag = "query_a.receiver";
             this.gv_receiver.Visible = true;
-            this.gv_receiver.VisibleIndex = 7;
+            this.gv_receiver.VisibleIndex = 9;
             this.gv_receiver.Width = 94;
             // 
             // gv_outPart
@@ -419,7 +421,7 @@
             this.gv_outPart.OptionsColumn.AllowEdit = false;
             this.gv_outPart.Tag = "query_a.out_part";
             this.gv_outPart.Visible = true;
-            this.gv_outPart.VisibleIndex = 8;
+            this.gv_outPart.VisibleIndex = 10;
             this.gv_outPart.Width = 94;
             // 
             // gv_createBy
@@ -432,7 +434,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 9;
+            this.gv_createBy.VisibleIndex = 11;
             this.gv_createBy.Width = 94;
             // 
             // gv_createDate
@@ -445,7 +447,7 @@
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 10;
+            this.gv_createDate.VisibleIndex = 12;
             this.gv_createDate.Width = 94;
             // 
             // gv_remark
@@ -458,7 +460,7 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 11;
+            this.gv_remark.VisibleIndex = 13;
             this.gv_remark.Width = 94;
             // 
             // gridColumn1
@@ -476,7 +478,7 @@
             this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 12;
+            this.gridColumn6.VisibleIndex = 14;
             this.gridColumn6.Width = 94;
             // 
             // gridColumn8
@@ -486,7 +488,7 @@
             this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 13;
+            this.gridColumn8.VisibleIndex = 15;
             this.gridColumn8.Width = 94;
             // 
             // gridColumn10
@@ -496,7 +498,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 14;
+            this.gridColumn10.VisibleIndex = 16;
             this.gridColumn10.Width = 94;
             // 
             // gridColumn11
@@ -506,7 +508,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 15;
+            this.gridColumn11.VisibleIndex = 17;
             this.gridColumn11.Width = 94;
             // 
             // gridColumn12
@@ -516,7 +518,7 @@
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 16;
+            this.gridColumn12.VisibleIndex = 18;
             this.gridColumn12.Width = 94;
             // 
             // gridColumn13
@@ -526,7 +528,7 @@
             this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 17;
+            this.gridColumn13.VisibleIndex = 19;
             this.gridColumn13.Width = 94;
             // 
             // gridColumn7
@@ -536,7 +538,7 @@
             this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 18;
+            this.gridColumn7.VisibleIndex = 3;
             this.gridColumn7.Width = 94;
             // 
             // gridColumn14
@@ -546,14 +548,14 @@
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 19;
+            this.gridColumn14.VisibleIndex = 4;
             this.gridColumn14.Width = 94;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 505);
+            this.pageBar1.Location = new System.Drawing.Point(0, 519);
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
@@ -584,6 +586,7 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1126, 570);
             this.splitMx1.SplitterPosition = 166;
             this.splitMx1.TabIndex = 0;

--
Gitblit v1.9.3