From b7ad7b35a094d5f9fcf4a884d876e05b4a226c98 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 六月 2025 14:15:49 +0800
Subject: [PATCH] 批准
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs | 103 ++++++++++++++++++++++++++++-----------------------
1 files changed, 56 insertions(+), 47 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index a79ae60..2c64f62 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -1,7 +1,7 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm
{
- partial class Frm_MesWorkshopLine
+ partial class Frm_MesWorkshopLine
{
/// <summary>
/// Required designer variable.
@@ -29,6 +29,7 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -54,6 +55,8 @@
this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -77,6 +80,7 @@
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -152,6 +156,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";
@@ -165,14 +170,14 @@
// 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 = 558;
+ this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
@@ -185,7 +190,6 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -199,7 +203,9 @@
this.gv_lastupdateBy,
this.gv_lastupdateDate,
this.gv_lineType,
- this.gv_isZxbg});
+ this.gv_isZxbg,
+ this.gridColumn2,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -209,7 +215,6 @@
//
// gv_org
//
- this.gv_org.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_org.AppearanceCell.Options.UseFont = true;
this.gv_org.Caption = "浣跨敤缁勭粐";
this.gv_org.FieldName = "fSubsidiary";
@@ -234,9 +239,8 @@
//
// gv_lineNo
//
- this.gv_lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lineNo.AppearanceCell.Options.UseFont = true;
- this.gv_lineNo.Caption = "浜х嚎缂栧彿";
+ this.gv_lineNo.Caption = "绾夸綋缂栧彿";
this.gv_lineNo.FieldName = "lineNo";
this.gv_lineNo.MinWidth = 50;
this.gv_lineNo.Name = "gv_lineNo";
@@ -248,7 +252,6 @@
//
// gv_name
//
- this.gv_name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_name.AppearanceCell.Options.UseFont = true;
this.gv_name.Caption = "浜х嚎鍚嶇О";
this.gv_name.FieldName = "name";
@@ -262,7 +265,6 @@
//
// gv_remark
//
- this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "remark";
@@ -276,7 +278,6 @@
//
// gv_createBy
//
- this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "寤虹珛鑰�";
this.gv_createBy.FieldName = "createBy";
@@ -290,7 +291,6 @@
//
// gv_createDate
//
- this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "寤虹珛鏃堕棿";
this.gv_createDate.FieldName = "createDate";
@@ -304,7 +304,6 @@
//
// gv_lastupdateBy
//
- this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏇存柊鑰�";
this.gv_lastupdateBy.FieldName = "lastupdateBy";
@@ -318,7 +317,6 @@
//
// gv_lastupdateDate
//
- this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
@@ -332,7 +330,6 @@
//
// gv_lineType
//
- this.gv_lineType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lineType.AppearanceCell.Options.UseFont = true;
this.gv_lineType.Caption = "绾夸綋绫诲埆";
this.gv_lineType.FieldName = "lineType";
@@ -340,13 +337,10 @@
this.gv_lineType.Name = "gv_lineType";
this.gv_lineType.OptionsColumn.AllowEdit = false;
this.gv_lineType.Tag = "query_a.line_type";
- this.gv_lineType.Visible = true;
- this.gv_lineType.VisibleIndex = 9;
this.gv_lineType.Width = 80;
//
// gv_isZxbg
//
- this.gv_isZxbg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_isZxbg.AppearanceCell.Options.UseFont = true;
this.gv_isZxbg.Caption = "鏁寸嚎鎶ュ伐";
this.gv_isZxbg.FieldName = "isZxbg";
@@ -354,9 +348,25 @@
this.gv_isZxbg.Name = "gv_isZxbg";
this.gv_isZxbg.OptionsColumn.AllowEdit = false;
this.gv_isZxbg.Tag = "query_a.is_zxbg";
- this.gv_isZxbg.Visible = true;
- this.gv_isZxbg.VisibleIndex = 10;
this.gv_isZxbg.Width = 50;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "绾夸綋ID";
+ this.gridColumn2.FieldName = "id";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 9;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭Guid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
//
// pageBar1
//
@@ -392,6 +402,7 @@
// splitMx1.Panel2
//
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 147;
this.splitMx1.TabIndex = 0;
@@ -429,7 +440,7 @@
//
// txt_lineType
//
- this.txt_lineType.Location = new System.Drawing.Point(360, 76);
+ this.txt_lineType.Location = new System.Drawing.Point(360, 75);
this.txt_lineType.Name = "txt_lineType";
this.txt_lineType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -446,48 +457,44 @@
this.txt_dptId.IsReadly = false;
this.txt_dptId.Location = new System.Drawing.Point(84, 12);
this.txt_dptId.Name = "txt_dptId";
- this.txt_dptId.Size = new System.Drawing.Size(200, 28);
+ this.txt_dptId.Size = new System.Drawing.Size(200, 24);
this.txt_dptId.TabIndex = 244;
//
// txt_lineNo
//
- this.txt_lineNo.Location = new System.Drawing.Point(84, 44);
+ this.txt_lineNo.Location = new System.Drawing.Point(84, 43);
this.txt_lineNo.Name = "txt_lineNo";
- this.txt_lineNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lineNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lineNo.Size = new System.Drawing.Size(200, 28);
+ this.txt_lineNo.Size = new System.Drawing.Size(200, 24);
this.txt_lineNo.StyleController = this.layoutMx1;
this.txt_lineNo.TabIndex = 216;
this.txt_lineNo.Tag = "";
//
// txt_name
//
- this.txt_name.Location = new System.Drawing.Point(84, 76);
+ this.txt_name.Location = new System.Drawing.Point(84, 75);
this.txt_name.Name = "txt_name";
- this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_name.Properties.Appearance.Options.UseFont = true;
- this.txt_name.Size = new System.Drawing.Size(200, 28);
+ this.txt_name.Size = new System.Drawing.Size(200, 24);
this.txt_name.StyleController = this.layoutMx1;
this.txt_name.TabIndex = 217;
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(360, 44);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(360, 43);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
- this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(200, 28);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(200, 24);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 231;
this.txt_lastupdateDate.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(84, 108);
+ this.txt_remark.Location = new System.Drawing.Point(84, 107);
this.txt_remark.Name = "txt_remark";
- this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(200, 28);
+ this.txt_remark.Size = new System.Drawing.Size(200, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 219;
//
@@ -495,16 +502,15 @@
//
this.txt_lastupdateBy.Location = new System.Drawing.Point(360, 12);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
- this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(200, 28);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(200, 24);
this.txt_lastupdateBy.StyleController = this.layoutMx1;
this.txt_lastupdateBy.TabIndex = 228;
this.txt_lastupdateBy.Tag = "readonly";
//
// txt_isZxbg
//
- this.txt_isZxbg.Location = new System.Drawing.Point(288, 108);
+ this.txt_isZxbg.Location = new System.Drawing.Point(288, 107);
this.txt_isZxbg.Name = "txt_isZxbg";
this.txt_isZxbg.Properties.Caption = "鏁寸嚎鎶ュ伐";
this.txt_isZxbg.Size = new System.Drawing.Size(272, 24);
@@ -564,7 +570,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1126, 148);
+ this.Root.Size = new System.Drawing.Size(1126, 147);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -572,14 +578,14 @@
this.layoutControlItem1.Control = this.txt_dptId;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem1.Text = "鎵�鍦ㄩ儴闂�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_lineNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
@@ -589,7 +595,7 @@
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_name;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 63);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
@@ -599,7 +605,7 @@
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_remark;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 95);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
@@ -612,14 +618,14 @@
this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem5.Text = "鏇存柊鑰�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_lastupdateDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 32);
+ this.layoutControlItem6.Location = new System.Drawing.Point(276, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
@@ -630,7 +636,7 @@
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_lineType;
- this.layoutControlItem7.Location = new System.Drawing.Point(276, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(276, 63);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
@@ -641,7 +647,7 @@
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_isZxbg;
- this.layoutControlItem8.Location = new System.Drawing.Point(276, 96);
+ this.layoutControlItem8.Location = new System.Drawing.Point(276, 95);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
@@ -698,7 +704,7 @@
}
#endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
@@ -738,5 +744,8 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
--
Gitblit v1.9.3