From 7f7b09f2cb3dbbdfe4a4bf078bfcde6cfbe76595 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 08 八月 2025 15:45:35 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs | 128 ++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 62 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
index 99497c7..41b3f90 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
@@ -29,15 +29,15 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -64,6 +64,7 @@
this.bandedGridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -131,10 +132,9 @@
this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -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";
@@ -253,9 +254,10 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1346, 570);
- this.split1.SplitterPosition = 555;
+ this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// 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(1346, 516);
+ this.gcMain1.Size = new System.Drawing.Size(1346, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -544,11 +546,21 @@
this.gridColumn8.VisibleIndex = 18;
this.gridColumn8.Width = 94;
//
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "閫�鏂欑被鍨�";
+ this.gridColumn10.FieldName = "tbl005";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 19;
+ this.gridColumn10.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 516);
+ 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;
@@ -568,7 +580,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -579,6 +591,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(1346, 570);
this.splitMx1.SplitterPosition = 168;
this.splitMx1.TabIndex = 0;
@@ -834,35 +847,35 @@
this.layoutControlItem17});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition13.Width = 100D;
- columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition14.Width = 100D;
- columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition15.Width = 100D;
- columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition16.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition13,
- columnDefinition14,
- columnDefinition15,
- columnDefinition16});
- rowDefinition16.Height = 100D;
- rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition17.Height = 100D;
- rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition18.Height = 100D;
- rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition19.Height = 100D;
- rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition20.Height = 100D;
- rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition16,
- rowDefinition17,
- rowDefinition18,
- rowDefinition19,
- rowDefinition20});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
this.Root.Size = new System.Drawing.Size(1346, 168);
this.Root.TextVisible = false;
//
@@ -888,6 +901,7 @@
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createBy;
+ this.layoutControlItem3.CustomizationFormText = "鍒涘缓浜哄憳";
this.layoutControlItem3.Location = new System.Drawing.Point(662, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -902,7 +916,7 @@
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(333, 28);
- this.layoutControlItem4.Text = "瀹℃牳浜�";
+ this.layoutControlItem4.Text = "瀹℃牳浜哄憳";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
@@ -1321,6 +1335,14 @@
this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 94;
//
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鐢宠鏄庣粏涓婚敭";
+ this.gridColumn9.FieldName = "itemDabid";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Width = 94;
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1331,24 +1353,6 @@
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "鐢宠鏄庣粏涓婚敭";
- this.gridColumn9.FieldName = "itemDabid";
- this.gridColumn9.MinWidth = 25;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Width = 94;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "閫�鏂欑被鍨�";
- this.gridColumn10.FieldName = "tbl005";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 19;
- this.gridColumn10.Width = 94;
//
// Frm_MesItemTbl_RK
//
--
Gitblit v1.9.3