From 800f1652b2ed0473850975efe5028685bcd605c4 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 20 九月 2025 14:42:40 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 3a9be81..90af3a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -75,6 +75,8 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -331,7 +333,9 @@
this.gridColumn13,
this.gridColumn14,
this.gridColumn15,
- this.gridColumn20});
+ this.gridColumn20,
+ this.gridColumn21,
+ this.gridColumn22});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -483,7 +487,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 13;
+ this.gridColumn5.VisibleIndex = 14;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -493,7 +497,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 14;
+ this.gridColumn6.VisibleIndex = 15;
this.gridColumn6.Width = 94;
//
// gridColumn13
@@ -541,6 +545,25 @@
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 5;
this.gridColumn20.Width = 94;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "鐢宠鍗旼uid";
+ this.gridColumn21.FieldName = "guid";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.OptionsColumn.ReadOnly = true;
+ this.gridColumn21.Width = 94;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "璐т富";
+ this.gridColumn22.FieldName = "hzOrg";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 13;
+ this.gridColumn22.Width = 94;
//
// pageBar1
//
@@ -883,7 +906,8 @@
"4:瀹㈡埛璧犻��",
"5:鎶ュ簾鍑哄簱",
"6:鏍锋満鍑哄簱",
- "7:鏃犳簮鍗曞澶栭��鏂�"});
+ "7:鏃犳簮鍗曞澶栭��鏂�",
+ "8:鐩樹簭"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_qtlx.Size = new System.Drawing.Size(165, 24);
this.txt_qtlx.StyleController = this.layoutMx1;
@@ -1818,5 +1842,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private UserControl.UcLookSupplier txt_wwgys;
private DevExpress.XtraLayout.LayoutControlItem layItemWwgys;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
}
}
\ No newline at end of file
--
Gitblit v1.9.3