From b7d9f2e23cbda587d814c7d07c1664c053c83dcb Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 12 八月 2025 13:58:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 343 ++++++++++++++++++++++++++++----------------------------
1 files changed, 171 insertions(+), 172 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index 7c6de9b..3f72eda 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -31,13 +31,14 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ 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();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -58,16 +59,17 @@
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.txt_fmanager = new DevExpress.XtraEditors.TextEdit();
- this.txt_depextr3 = new DevExpress.XtraEditors.TextEdit();
- this.txt_depextr1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_departmentid = new DevExpress.XtraEditors.TextEdit();
this.txt_departmentname = new DevExpress.XtraEditors.TextEdit();
this.txt_departmentcode = new DevExpress.XtraEditors.TextEdit();
- this.txt_departmentid = new DevExpress.XtraEditors.TextEdit();
- this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_depextr3 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fmanager = new DevExpress.XtraEditors.TextEdit();
+ this.txt_depextr1 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -77,7 +79,8 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -94,16 +97,17 @@
this.splitMx1.Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
this.splitMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depextr3.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depextr1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depextr3.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depextr1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -113,7 +117,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -154,31 +157,32 @@
// 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";
//
- // split1.split1_Panel1
+ // split1.Panel1
//
this.split1.Panel1.Controls.Add(this.gcMain1);
this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
//
- // split1.split1_Panel2
+ // split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1147, 595);
- this.split1.SplitterPosition = 583;
+ this.split1.SplitterPosition = 12;
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";
- this.gcMain1.Size = new System.Drawing.Size(1147, 544);
+ this.gcMain1.Size = new System.Drawing.Size(1147, 532);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -187,7 +191,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[] {
@@ -201,7 +204,8 @@
this.gv_depextr4,
this.gv_remark,
this.gv_parentId,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -215,7 +219,6 @@
//
// gv_factory
//
- this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_factory.AppearanceCell.Options.UseFont = true;
this.gv_factory.Caption = "浣跨敤缁勭粐";
this.gv_factory.FieldName = "fSubsidiary";
@@ -231,7 +234,6 @@
//
// gv_departmentid
//
- this.gv_departmentid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_departmentid.AppearanceCell.Options.UseFont = true;
this.gv_departmentid.Caption = "閮ㄩ棬ID";
this.gv_departmentid.FieldName = "departmentid";
@@ -240,11 +242,12 @@
this.gv_departmentid.OptionsColumn.AllowEdit = false;
this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentid.Tag = "query_a.departmentid";
+ this.gv_departmentid.Visible = true;
+ this.gv_departmentid.VisibleIndex = 9;
this.gv_departmentid.Width = 94;
//
// gv_departmentcode
//
- this.gv_departmentcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_departmentcode.AppearanceCell.Options.UseFont = true;
this.gv_departmentcode.Caption = "閮ㄩ棬缂栧彿";
this.gv_departmentcode.FieldName = "departmentcode";
@@ -259,7 +262,6 @@
//
// gv_departmentname
//
- this.gv_departmentname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_departmentname.AppearanceCell.Options.UseFont = true;
this.gv_departmentname.Caption = "閮ㄩ棬鍚嶇О";
this.gv_departmentname.FieldName = "departmentname";
@@ -274,7 +276,6 @@
//
// gv_depextr1
//
- this.gv_depextr1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depextr1.AppearanceCell.Options.UseFont = true;
this.gv_depextr1.Caption = "閮ㄩ棬灞炴��";
this.gv_depextr1.FieldName = "depextr1";
@@ -289,7 +290,6 @@
//
// gv_depextr2
//
- this.gv_depextr2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depextr2.AppearanceCell.Options.UseFont = true;
this.gv_depextr2.Caption = "閮ㄩ棬鍒嗙粍";
this.gv_depextr2.FieldName = "depextr2";
@@ -304,7 +304,6 @@
//
// gv_depextr3
//
- this.gv_depextr3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depextr3.AppearanceCell.Options.UseFont = true;
this.gv_depextr3.Caption = "WIP浠撳簱";
this.gv_depextr3.FieldName = "depextr3";
@@ -319,7 +318,6 @@
//
// gv_depextr4
//
- this.gv_depextr4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depextr4.AppearanceCell.Options.UseFont = true;
this.gv_depextr4.Caption = "绂佺敤鐘舵��";
this.gv_depextr4.FieldName = "depextr4";
@@ -334,7 +332,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";
@@ -349,7 +346,6 @@
//
// gv_parentId
//
- this.gv_parentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_parentId.AppearanceCell.Options.UseFont = true;
this.gv_parentId.Caption = "涓婄骇閮ㄩ棬";
this.gv_parentId.FieldName = "fParentID";
@@ -370,14 +366,14 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 9;
+ this.gridColumn1.VisibleIndex = 10;
this.gridColumn1.Width = 180;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 544);
+ this.pageBar1.Location = new System.Drawing.Point(0, 532);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
@@ -399,106 +395,18 @@
this.splitMx1.Location = new System.Drawing.Point(0, 0);
this.splitMx1.Name = "splitMx1";
//
- // splitMx1.splitMx1_Panel1
+ // splitMx1.Panel1
//
this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
this.splitMx1.Panel1.Text = "Panel1";
//
- // splitMx1.splitMx1_Panel2
+ // splitMx1.Panel2
//
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1147, 595);
this.splitMx1.SplitterPosition = 99;
this.splitMx1.TabIndex = 0;
- //
- // lbGuid
- //
- this.lbGuid.Location = new System.Drawing.Point(687, 131);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(221, 56);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Text = "lbGuid";
- this.lbGuid.Visible = false;
- //
- // txt_productionWorkshop
- //
- this.txt_productionWorkshop.Location = new System.Drawing.Point(534, 51);
- this.txt_productionWorkshop.Name = "txt_productionWorkshop";
- this.txt_productionWorkshop.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true;
- this.txt_productionWorkshop.Size = new System.Drawing.Size(149, 28);
- this.txt_productionWorkshop.StyleController = this.layoutMx1;
- this.txt_productionWorkshop.TabIndex = 285;
- //
- // txt_remark
- //
- this.txt_remark.Location = new System.Drawing.Point(759, 51);
- 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(149, 28);
- this.txt_remark.StyleController = this.layoutMx1;
- this.txt_remark.TabIndex = 273;
- //
- // txt_fmanager
- //
- this.txt_fmanager.Location = new System.Drawing.Point(534, 12);
- this.txt_fmanager.Name = "txt_fmanager";
- this.txt_fmanager.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fmanager.Properties.Appearance.Options.UseFont = true;
- this.txt_fmanager.Size = new System.Drawing.Size(149, 28);
- this.txt_fmanager.StyleController = this.layoutMx1;
- this.txt_fmanager.TabIndex = 243;
- //
- // txt_depextr3
- //
- this.txt_depextr3.Location = new System.Drawing.Point(759, 12);
- this.txt_depextr3.Name = "txt_depextr3";
- this.txt_depextr3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depextr3.Properties.Appearance.Options.UseFont = true;
- this.txt_depextr3.Size = new System.Drawing.Size(149, 28);
- this.txt_depextr3.StyleController = this.layoutMx1;
- this.txt_depextr3.TabIndex = 226;
- //
- // txt_depextr1
- //
- this.txt_depextr1.Location = new System.Drawing.Point(309, 51);
- this.txt_depextr1.Name = "txt_depextr1";
- this.txt_depextr1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depextr1.Properties.Appearance.Options.UseFont = true;
- this.txt_depextr1.Size = new System.Drawing.Size(149, 28);
- this.txt_depextr1.StyleController = this.layoutMx1;
- this.txt_depextr1.TabIndex = 219;
- //
- // txt_departmentname
- //
- this.txt_departmentname.Location = new System.Drawing.Point(84, 51);
- this.txt_departmentname.Name = "txt_departmentname";
- this.txt_departmentname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_departmentname.Properties.Appearance.Options.UseFont = true;
- this.txt_departmentname.Size = new System.Drawing.Size(149, 28);
- this.txt_departmentname.StyleController = this.layoutMx1;
- this.txt_departmentname.TabIndex = 217;
- //
- // txt_departmentcode
- //
- this.txt_departmentcode.Location = new System.Drawing.Point(309, 12);
- this.txt_departmentcode.Name = "txt_departmentcode";
- this.txt_departmentcode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_departmentcode.Properties.Appearance.Options.UseFont = true;
- this.txt_departmentcode.Size = new System.Drawing.Size(149, 28);
- this.txt_departmentcode.StyleController = this.layoutMx1;
- this.txt_departmentcode.TabIndex = 216;
- //
- // txt_departmentid
- //
- this.txt_departmentid.Location = new System.Drawing.Point(84, 12);
- this.txt_departmentid.Name = "txt_departmentid";
- this.txt_departmentid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_departmentid.Properties.Appearance.Options.UseFont = true;
- this.txt_departmentid.Size = new System.Drawing.Size(149, 28);
- this.txt_departmentid.StyleController = this.layoutMx1;
- this.txt_departmentid.TabIndex = 213;
//
// layoutMx1
//
@@ -522,6 +430,99 @@
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(687, 131);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(221, 56);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
+ this.lbGuid.Visible = false;
+ //
+ // txt_productionWorkshop
+ //
+ this.txt_productionWorkshop.Location = new System.Drawing.Point(534, 51);
+ this.txt_productionWorkshop.Name = "txt_productionWorkshop";
+ this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true;
+ this.txt_productionWorkshop.Size = new System.Drawing.Size(149, 24);
+ this.txt_productionWorkshop.StyleController = this.layoutMx1;
+ this.txt_productionWorkshop.TabIndex = 285;
+ //
+ // txt_remark
+ //
+ this.txt_remark.Location = new System.Drawing.Point(759, 51);
+ this.txt_remark.Name = "txt_remark";
+ this.txt_remark.Properties.Appearance.Options.UseFont = true;
+ this.txt_remark.Size = new System.Drawing.Size(149, 24);
+ this.txt_remark.StyleController = this.layoutMx1;
+ this.txt_remark.TabIndex = 273;
+ //
+ // txt_departmentid
+ //
+ this.txt_departmentid.Location = new System.Drawing.Point(84, 12);
+ this.txt_departmentid.Name = "txt_departmentid";
+ this.txt_departmentid.Properties.Appearance.Options.UseFont = true;
+ this.txt_departmentid.Size = new System.Drawing.Size(149, 24);
+ this.txt_departmentid.StyleController = this.layoutMx1;
+ this.txt_departmentid.TabIndex = 213;
+ //
+ // txt_departmentname
+ //
+ this.txt_departmentname.Location = new System.Drawing.Point(84, 51);
+ this.txt_departmentname.Name = "txt_departmentname";
+ this.txt_departmentname.Properties.Appearance.Options.UseFont = true;
+ this.txt_departmentname.Size = new System.Drawing.Size(149, 24);
+ this.txt_departmentname.StyleController = this.layoutMx1;
+ this.txt_departmentname.TabIndex = 217;
+ //
+ // txt_departmentcode
+ //
+ this.txt_departmentcode.Location = new System.Drawing.Point(309, 12);
+ this.txt_departmentcode.Name = "txt_departmentcode";
+ this.txt_departmentcode.Properties.Appearance.Options.UseFont = true;
+ this.txt_departmentcode.Size = new System.Drawing.Size(149, 24);
+ this.txt_departmentcode.StyleController = this.layoutMx1;
+ this.txt_departmentcode.TabIndex = 216;
+ //
+ // txt_depextr3
+ //
+ this.txt_depextr3.Location = new System.Drawing.Point(759, 12);
+ this.txt_depextr3.Name = "txt_depextr3";
+ this.txt_depextr3.Properties.Appearance.Options.UseFont = true;
+ this.txt_depextr3.Size = new System.Drawing.Size(149, 24);
+ this.txt_depextr3.StyleController = this.layoutMx1;
+ this.txt_depextr3.TabIndex = 226;
+ //
+ // txt_fmanager
+ //
+ this.txt_fmanager.Location = new System.Drawing.Point(534, 12);
+ this.txt_fmanager.Name = "txt_fmanager";
+ this.txt_fmanager.Properties.Appearance.Options.UseFont = true;
+ this.txt_fmanager.Size = new System.Drawing.Size(149, 24);
+ this.txt_fmanager.StyleController = this.layoutMx1;
+ this.txt_fmanager.TabIndex = 243;
+ //
+ // txt_depextr1
+ //
+ this.txt_depextr1.Location = new System.Drawing.Point(309, 51);
+ this.txt_depextr1.Name = "txt_depextr1";
+ this.txt_depextr1.Properties.Appearance.Options.UseFont = true;
+ this.txt_depextr1.Size = new System.Drawing.Size(149, 24);
+ this.txt_depextr1.StyleController = this.layoutMx1;
+ this.txt_depextr1.TabIndex = 219;
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.lbGuid;
+ this.layoutControlItem11.Location = new System.Drawing.Point(675, 119);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(225, 60);
+ this.layoutControlItem11.Text = "lbGuid";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -537,29 +538,29 @@
this.layoutControlItem10});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.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;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition6,
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4,
+ columnDefinition5});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition3,
- rowDefinition4});
+ rowDefinition1,
+ rowDefinition2});
this.Root.Size = new System.Drawing.Size(1147, 99);
this.Root.TextVisible = false;
//
@@ -645,17 +646,13 @@
this.layoutControlItem10.Text = "WIP浠撳簱";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem11
+ // gridColumn2
//
- this.layoutControlItem11.Control = this.lbGuid;
- this.layoutControlItem11.Location = new System.Drawing.Point(675, 119);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(225, 60);
- this.layoutControlItem11.Text = "lbGuid";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem11.TextVisible = false;
+ this.gridColumn2.Caption = "涓婚敭Guid";
+ this.gridColumn2.FieldName = "guid";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Width = 94;
//
// Frm_Department
//
@@ -682,16 +679,17 @@
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
this.splitMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depextr3.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depextr1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depextr3.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depextr1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -701,7 +699,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
this.ResumeLayout(false);
}
@@ -746,5 +743,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
--
Gitblit v1.9.3