From 1544b9ba3902d93a3d701db3656227cc3b46dce8 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期五, 01 八月 2025 14:45:09 +0800 Subject: [PATCH] 过站bug --- DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 546 +++++++++++++++++++++++++++--------------------------- 1 files changed, 276 insertions(+), 270 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs index 9f8dcb8..931ac0a 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs @@ -37,7 +37,6 @@ 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(); DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); @@ -72,7 +71,6 @@ this.txt_fBegDate = new DevExpress.XtraEditors.DateEdit(); this.txt_fEndDate = new DevExpress.XtraEditors.DateEdit(); this.txt_orgName = new DevExpress.XtraEditors.TextEdit(); - this.txt_fType = new DevExpress.XtraEditors.ComboBoxEdit(); this.btnSelect = new DevExpress.XtraEditors.SimpleButton(); this.txt_guid = new DevExpress.XtraEditors.TextEdit(); this.txt_lastUpdateBy = new DevExpress.XtraEditors.TextEdit(); @@ -80,34 +78,31 @@ this.txt_checkBy = new DevExpress.XtraEditors.TextEdit(); this.txt_checkDate = new DevExpress.XtraEditors.TextEdit(); this.txt_isCheck = new DevExpress.XtraEditors.CheckEdit(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.btnCopy = new DevExpress.XtraEditors.SimpleButton(); this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -119,6 +114,11 @@ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); + this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -152,35 +152,29 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties.CalendarTimeProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_orgName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -191,6 +185,11 @@ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -204,7 +203,7 @@ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; - this.toolBarMenu1.Size = new System.Drawing.Size(1238, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(1305, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = "xlsOut_items{}"; @@ -227,7 +226,7 @@ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1238, 664); + this.xtraTabControl1.Size = new System.Drawing.Size(1305, 664); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -236,7 +235,7 @@ // this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1236, 632); + this.xtraTabPage1.Size = new System.Drawing.Size(1303, 632); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -256,7 +255,7 @@ this.split1.Panel2.Controls.Add(this.splitMx1); this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1236, 632); + this.split1.Size = new System.Drawing.Size(1303, 632); this.split1.SplitterPosition = 516; this.split1.TabIndex = 0; // @@ -374,8 +373,8 @@ 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(708, 632); - this.splitMx1.SplitterPosition = 189; + this.splitMx1.Size = new System.Drawing.Size(775, 632); + this.splitMx1.SplitterPosition = 147; this.splitMx1.TabIndex = 1; // // layoutMx1 @@ -393,7 +392,6 @@ this.layoutMx1.Controls.Add(this.txt_fBegDate); this.layoutMx1.Controls.Add(this.txt_fEndDate); this.layoutMx1.Controls.Add(this.txt_orgName); - this.layoutMx1.Controls.Add(this.txt_fType); this.layoutMx1.Controls.Add(this.btnSelect); this.layoutMx1.Controls.Add(this.txt_guid); this.layoutMx1.Controls.Add(this.txt_lastUpdateBy); @@ -401,16 +399,20 @@ this.layoutMx1.Controls.Add(this.txt_checkBy); this.layoutMx1.Controls.Add(this.txt_checkDate); this.layoutMx1.Controls.Add(this.txt_isCheck); + this.layoutMx1.Controls.Add(this.btnCopy); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem16, this.layoutControlItem24, - this.layoutControlItem2}); + this.layoutControlItem16, + this.layoutControlItem9, + this.layoutControlItem4, + this.layoutControlItem7, + this.layoutControlItem25}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(39, 252, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(131, 442, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(708, 189); + this.layoutMx1.Size = new System.Drawing.Size(775, 147); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -425,40 +427,40 @@ // // txt_fMaxWeight // - this.txt_fMaxWeight.Location = new System.Drawing.Point(498, 12); + this.txt_fMaxWeight.Location = new System.Drawing.Point(537, 12); this.txt_fMaxWeight.Name = "txt_fMaxWeight"; this.txt_fMaxWeight.Properties.Appearance.Options.UseFont = true; - this.txt_fMaxWeight.Size = new System.Drawing.Size(62, 24); + this.txt_fMaxWeight.Size = new System.Drawing.Size(75, 24); this.txt_fMaxWeight.StyleController = this.layoutMx1; this.txt_fMaxWeight.TabIndex = 378; this.txt_fMaxWeight.Tag = "fissueType"; // // txt_fMinWeight // - this.txt_fMinWeight.Location = new System.Drawing.Point(498, 43); + this.txt_fMinWeight.Location = new System.Drawing.Point(537, 43); this.txt_fMinWeight.Name = "txt_fMinWeight"; this.txt_fMinWeight.Properties.Appearance.Options.UseFont = true; - this.txt_fMinWeight.Size = new System.Drawing.Size(62, 24); + this.txt_fMinWeight.Size = new System.Drawing.Size(75, 24); this.txt_fMinWeight.StyleController = this.layoutMx1; this.txt_fMinWeight.TabIndex = 370; this.txt_fMinWeight.Tag = "finishRate"; // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(84, 74); + this.txt_itemName.Location = new System.Drawing.Point(84, 75); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Properties.Appearance.Options.UseFont = true; - this.txt_itemName.Size = new System.Drawing.Size(200, 27); + this.txt_itemName.Size = new System.Drawing.Size(226, 28); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 216; this.txt_itemName.Tag = "readonly"; // // txt_itemModel // - this.txt_itemModel.Location = new System.Drawing.Point(99, 108); + this.txt_itemModel.Location = new System.Drawing.Point(84, 107); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Properties.Appearance.Options.UseFont = true; - this.txt_itemModel.Size = new System.Drawing.Size(215, 28); + this.txt_itemModel.Size = new System.Drawing.Size(226, 28); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 219; this.txt_itemModel.Tag = "readonly"; @@ -468,37 +470,37 @@ this.txt_itemNo.Location = new System.Drawing.Point(84, 43); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Options.UseFont = true; - this.txt_itemNo.Size = new System.Drawing.Size(200, 24); + this.txt_itemNo.Size = new System.Drawing.Size(226, 24); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 213; this.txt_itemNo.Tag = "readonly"; // // txt_fSumPeople // - this.txt_fSumPeople.Location = new System.Drawing.Point(360, 74); + this.txt_fSumPeople.Location = new System.Drawing.Point(386, 74); this.txt_fSumPeople.Name = "txt_fSumPeople"; this.txt_fSumPeople.Properties.Appearance.Options.UseFont = true; - this.txt_fSumPeople.Size = new System.Drawing.Size(62, 24); + this.txt_fSumPeople.Size = new System.Drawing.Size(75, 24); this.txt_fSumPeople.StyleController = this.layoutMx1; this.txt_fSumPeople.TabIndex = 231; this.txt_fSumPeople.Tag = "itemVersion"; // // txt_fCapacity // - this.txt_fCapacity.Location = new System.Drawing.Point(498, 74); + this.txt_fCapacity.Location = new System.Drawing.Point(386, 43); this.txt_fCapacity.Name = "txt_fCapacity"; this.txt_fCapacity.Properties.Appearance.Options.UseFont = true; - this.txt_fCapacity.Size = new System.Drawing.Size(62, 24); + this.txt_fCapacity.Size = new System.Drawing.Size(75, 24); this.txt_fCapacity.StyleController = this.layoutMx1; this.txt_fCapacity.TabIndex = 319; this.txt_fCapacity.Tag = "bomNo"; // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(84, 105); + this.txt_remark.Location = new System.Drawing.Point(386, 75); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(200, 24); + this.txt_remark.Size = new System.Drawing.Size(226, 24); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 258; this.txt_remark.Tag = "lowLimt"; @@ -506,28 +508,28 @@ // txt_fJingDu // this.txt_fJingDu.EditValue = "PSC娴�"; - this.txt_fJingDu.Location = new System.Drawing.Point(360, 43); + this.txt_fJingDu.Location = new System.Drawing.Point(386, 12); this.txt_fJingDu.Name = "txt_fJingDu"; this.txt_fJingDu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_fJingDu.Properties.Items.AddRange(new object[] { - "PSC娴�", + "PCS娴�", "LOT娴�"}); this.txt_fJingDu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_fJingDu.Size = new System.Drawing.Size(62, 24); + this.txt_fJingDu.Size = new System.Drawing.Size(75, 24); this.txt_fJingDu.StyleController = this.layoutMx1; this.txt_fJingDu.TabIndex = 413; // // txt_fBegDate // this.txt_fBegDate.EditValue = null; - this.txt_fBegDate.Location = new System.Drawing.Point(360, 105); + this.txt_fBegDate.Location = new System.Drawing.Point(386, 105); this.txt_fBegDate.Name = "txt_fBegDate"; this.txt_fBegDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_fBegDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txt_fBegDate.Size = new System.Drawing.Size(200, 24); + this.txt_fBegDate.Size = new System.Drawing.Size(226, 24); this.txt_fBegDate.StyleController = this.layoutMx1; this.txt_fBegDate.TabIndex = 414; // @@ -548,33 +550,17 @@ // this.txt_orgName.Location = new System.Drawing.Point(84, 12); this.txt_orgName.Name = "txt_orgName"; - this.txt_orgName.Size = new System.Drawing.Size(200, 24); + this.txt_orgName.Size = new System.Drawing.Size(226, 24); this.txt_orgName.StyleController = this.layoutMx1; this.txt_orgName.TabIndex = 417; this.txt_orgName.Tag = "readonly"; - // - // txt_fType - // - this.txt_fType.EditValue = "-璇烽�夋嫨-"; - this.txt_fType.Location = new System.Drawing.Point(360, 12); - this.txt_fType.Name = "txt_fType"; - this.txt_fType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txt_fType.Properties.Items.AddRange(new object[] { - "-璇烽�夋嫨-", - "F-閲忎骇", - "S-璇曚綔"}); - this.txt_fType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_fType.Size = new System.Drawing.Size(62, 24); - this.txt_fType.StyleController = this.layoutMx1; - this.txt_fType.TabIndex = 418; // // btnSelect // this.btnSelect.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question; this.btnSelect.Appearance.Options.UseBackColor = true; this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16; - this.btnSelect.Location = new System.Drawing.Point(12, 136); + this.btnSelect.Location = new System.Drawing.Point(314, 107); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(96, 27); this.btnSelect.StyleController = this.layoutMx1; @@ -583,68 +569,69 @@ // // txt_guid // - this.txt_guid.Location = new System.Drawing.Point(274, 204); + this.txt_guid.Location = new System.Drawing.Point(664, 43); this.txt_guid.Name = "txt_guid"; - this.txt_guid.Size = new System.Drawing.Size(84, 24); + this.txt_guid.Size = new System.Drawing.Size(62, 24); this.txt_guid.StyleController = this.layoutMx1; this.txt_guid.TabIndex = 420; // // txt_lastUpdateBy // - this.txt_lastUpdateBy.Location = new System.Drawing.Point(636, 12); + this.txt_lastUpdateBy.Location = new System.Drawing.Point(688, 12); this.txt_lastUpdateBy.Name = "txt_lastUpdateBy"; - this.txt_lastUpdateBy.Size = new System.Drawing.Size(62, 24); + this.txt_lastUpdateBy.Size = new System.Drawing.Size(75, 24); this.txt_lastUpdateBy.StyleController = this.layoutMx1; this.txt_lastUpdateBy.TabIndex = 421; this.txt_lastUpdateBy.Tag = "readonly"; // // txt_lastUpdateDate // - this.txt_lastUpdateDate.Location = new System.Drawing.Point(636, 43); + this.txt_lastUpdateDate.Location = new System.Drawing.Point(688, 43); this.txt_lastUpdateDate.Name = "txt_lastUpdateDate"; - this.txt_lastUpdateDate.Size = new System.Drawing.Size(62, 24); + this.txt_lastUpdateDate.Size = new System.Drawing.Size(75, 24); this.txt_lastUpdateDate.StyleController = this.layoutMx1; this.txt_lastUpdateDate.TabIndex = 422; this.txt_lastUpdateDate.Tag = "readonly"; // // txt_checkBy // - this.txt_checkBy.Location = new System.Drawing.Point(636, 74); + this.txt_checkBy.Location = new System.Drawing.Point(688, 75); this.txt_checkBy.Name = "txt_checkBy"; - this.txt_checkBy.Size = new System.Drawing.Size(62, 24); + this.txt_checkBy.Size = new System.Drawing.Size(75, 24); this.txt_checkBy.StyleController = this.layoutMx1; this.txt_checkBy.TabIndex = 423; this.txt_checkBy.Tag = "readonly"; // // txt_checkDate // - this.txt_checkDate.Location = new System.Drawing.Point(636, 105); + this.txt_checkDate.Location = new System.Drawing.Point(688, 107); this.txt_checkDate.Name = "txt_checkDate"; - this.txt_checkDate.Size = new System.Drawing.Size(62, 24); + this.txt_checkDate.Size = new System.Drawing.Size(75, 24); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 424; this.txt_checkDate.Tag = "readonly"; // // txt_isCheck // - this.txt_isCheck.Location = new System.Drawing.Point(564, 136); + this.txt_isCheck.Location = new System.Drawing.Point(465, 107); this.txt_isCheck.Name = "txt_isCheck"; this.txt_isCheck.Properties.Caption = "瀹℃牳鐘舵��"; - this.txt_isCheck.Size = new System.Drawing.Size(134, 24); + this.txt_isCheck.Size = new System.Drawing.Size(147, 24); this.txt_isCheck.StyleController = this.layoutMx1; this.txt_isCheck.TabIndex = 425; this.txt_isCheck.Tag = "readonly"; // - // layoutControlItem16 + // btnCopy // - this.layoutControlItem16.Control = this.txt_guid; - this.layoutControlItem16.Location = new System.Drawing.Point(175, 192); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem16.Size = new System.Drawing.Size(175, 32); - this.layoutControlItem16.Text = "浜у搧GUID"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18); + this.btnCopy.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; + this.btnCopy.Appearance.Options.UseBackColor = true; + this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copy_16x16; + this.btnCopy.Location = new System.Drawing.Point(465, 107); + this.btnCopy.Name = "btnCopy"; + this.btnCopy.Size = new System.Drawing.Size(147, 27); + this.btnCopy.StyleController = this.layoutMx1; + this.btnCopy.TabIndex = 426; + this.btnCopy.Text = "澶嶅埗鍒板叾瀹冧骇鍝�"; // // layoutControlItem24 // @@ -658,16 +645,51 @@ this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem24.TextVisible = false; // - // layoutControlItem2 + // layoutControlItem16 // - this.layoutControlItem2.Control = this.txt_itemModel; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 96); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem2.Size = new System.Drawing.Size(306, 32); - this.layoutControlItem2.Text = "瑙勬牸鍨嬪彿"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem16.Control = this.txt_guid; + this.layoutControlItem16.Location = new System.Drawing.Point(576, 31); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 4; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem16.Size = new System.Drawing.Size(144, 31); + this.layoutControlItem16.Text = "浜у搧GUID"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txt_fEndDate; + this.layoutControlItem9.Location = new System.Drawing.Point(276, 124); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem9.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem9.Text = "澶辨晥鏃ユ湡"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_fBegDate; + this.layoutControlItem4.Location = new System.Drawing.Point(302, 93); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem4.Size = new System.Drawing.Size(302, 31); + this.layoutControlItem4.Text = "鐢熸晥鏃ユ湡"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txt_fSumPeople; + this.layoutControlItem7.Location = new System.Drawing.Point(302, 62); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem7.Size = new System.Drawing.Size(151, 31); + this.layoutControlItem7.Text = "鎬诲畾鍛�"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // Root // @@ -678,20 +700,17 @@ this.layoutControlItem5, this.layoutControlItem14, this.layoutControlItem20, - this.layoutControlItem21, - this.layoutControlItem6, - this.layoutControlItem3, - this.layoutControlItem7, - this.layoutControlItem25, this.layoutControlItem18, this.layoutControlItem19, this.layoutControlItem23, this.layoutControlItem22, + this.layoutControlItem21, + this.layoutControlItem3, this.layoutControlItem8, - this.layoutControlItem9, - this.layoutControlItem4, this.layoutControlItem12, - this.layoutControlItem15}); + this.layoutControlItem10, + this.layoutControlItem15, + this.layoutControlItem2}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -718,25 +737,22 @@ 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[] { rowDefinition1, rowDefinition2, rowDefinition3, - rowDefinition4, - rowDefinition5}); - this.Root.Size = new System.Drawing.Size(710, 175); + rowDefinition4}); + this.Root.Size = new System.Drawing.Size(775, 147); this.Root.TextVisible = false; // // layoutControlItem1 // this.layoutControlItem1.Control = this.txt_itemName; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 62); + this.layoutControlItem1.Location = new System.Drawing.Point(0, 63); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem1.Size = new System.Drawing.Size(276, 31); + this.layoutControlItem1.Size = new System.Drawing.Size(302, 32); this.layoutControlItem1.Text = "鐗╂枡鍚嶇О"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // @@ -747,7 +763,7 @@ this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(276, 31); + this.layoutControlItem5.Size = new System.Drawing.Size(302, 32); this.layoutControlItem5.Text = "鐗╂枡缂栫爜"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // @@ -757,7 +773,7 @@ this.layoutControlItem14.Location = new System.Drawing.Point(0, 0); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem14.Size = new System.Drawing.Size(276, 31); + this.layoutControlItem14.Size = new System.Drawing.Size(302, 31); this.layoutControlItem14.Text = "浣跨敤缁勭粐"; this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); // @@ -765,171 +781,88 @@ // this.layoutControlItem20.Control = this.txt_lastUpdateBy; this.layoutControlItem20.CustomizationFormText = "鏇存柊浜哄憳"; - this.layoutControlItem20.Location = new System.Drawing.Point(552, 0); + this.layoutControlItem20.Location = new System.Drawing.Point(604, 0); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 4; - this.layoutControlItem20.Size = new System.Drawing.Size(138, 31); + this.layoutControlItem20.Size = new System.Drawing.Size(151, 31); this.layoutControlItem20.Text = "鏇存柊浜哄憳"; this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem21 - // - this.layoutControlItem21.Control = this.txt_lastUpdateDate; - this.layoutControlItem21.Location = new System.Drawing.Point(552, 31); - this.layoutControlItem21.Name = "layoutControlItem21"; - this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4; - this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem21.Size = new System.Drawing.Size(138, 31); - this.layoutControlItem21.Text = "鏇存柊鏃堕棿"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_fType; - this.layoutControlItem6.Location = new System.Drawing.Point(276, 0); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem6.Size = new System.Drawing.Size(138, 31); - this.layoutControlItem6.Text = "鐢熶骇绫诲瀷"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.txt_fJingDu; - this.layoutControlItem3.Location = new System.Drawing.Point(276, 31); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem3.Size = new System.Drawing.Size(138, 31); - this.layoutControlItem3.Text = "绠$悊绮惧害"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txt_fSumPeople; - this.layoutControlItem7.Location = new System.Drawing.Point(276, 62); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(138, 31); - this.layoutControlItem7.Text = "鎬诲畾鍛�"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem25 - // - this.layoutControlItem25.Control = this.txt_isCheck; - this.layoutControlItem25.Location = new System.Drawing.Point(552, 124); - this.layoutControlItem25.Name = "layoutControlItem25"; - this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4; - this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem25.Size = new System.Drawing.Size(138, 31); - this.layoutControlItem25.Text = "瀹℃牳鐘舵��"; - this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem25.TextVisible = false; // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_fMaxWeight; - this.layoutControlItem18.Location = new System.Drawing.Point(414, 0); + this.layoutControlItem18.Location = new System.Drawing.Point(453, 0); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem18.Size = new System.Drawing.Size(138, 31); + this.layoutControlItem18.Size = new System.Drawing.Size(151, 31); this.layoutControlItem18.Text = "閲嶉噺涓婇檺"; this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem19 // this.layoutControlItem19.Control = this.txt_fMinWeight; - this.layoutControlItem19.Location = new System.Drawing.Point(414, 31); + this.layoutControlItem19.Location = new System.Drawing.Point(453, 31); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem19.Size = new System.Drawing.Size(138, 31); + this.layoutControlItem19.Size = new System.Drawing.Size(151, 32); this.layoutControlItem19.Text = "閲嶉噺涓嬮檺"; this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem23 // this.layoutControlItem23.Control = this.txt_checkDate; - this.layoutControlItem23.Location = new System.Drawing.Point(552, 93); + this.layoutControlItem23.Location = new System.Drawing.Point(604, 95); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 4; this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem23.Size = new System.Drawing.Size(138, 31); + this.layoutControlItem23.Size = new System.Drawing.Size(151, 32); this.layoutControlItem23.Text = "瀹℃牳鏃堕棿"; this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem22 // this.layoutControlItem22.Control = this.txt_checkBy; - this.layoutControlItem22.Location = new System.Drawing.Point(552, 62); + this.layoutControlItem22.Location = new System.Drawing.Point(604, 63); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 4; this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem22.Size = new System.Drawing.Size(138, 31); + this.layoutControlItem22.Size = new System.Drawing.Size(151, 32); this.layoutControlItem22.Text = "瀹℃牳浜哄憳"; this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem21 + // + this.layoutControlItem21.Control = this.txt_lastUpdateDate; + this.layoutControlItem21.Location = new System.Drawing.Point(604, 31); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4; + this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem21.Size = new System.Drawing.Size(151, 32); + this.layoutControlItem21.Text = "鏇存柊鏃堕棿"; + this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_fJingDu; + this.layoutControlItem3.Location = new System.Drawing.Point(302, 0); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem3.Size = new System.Drawing.Size(151, 31); + this.layoutControlItem3.Text = "绠$悊绮惧害"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fCapacity; - this.layoutControlItem8.CustomizationFormText = "鏍囧噯浜ц兘(PCS?H)"; - this.layoutControlItem8.Location = new System.Drawing.Point(414, 62); + this.layoutControlItem8.CustomizationFormText = "鏍囧噯浜ц兘"; + this.layoutControlItem8.Location = new System.Drawing.Point(302, 31); this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(138, 31); + this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem8.Size = new System.Drawing.Size(151, 32); this.layoutControlItem8.Text = "鏍囧噯浜ц兘"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_fEndDate; - this.layoutControlItem9.Location = new System.Drawing.Point(276, 124); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem9.Size = new System.Drawing.Size(276, 31); - this.layoutControlItem9.Text = "澶辨晥鏃ユ湡"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.txt_fBegDate; - this.layoutControlItem4.Location = new System.Drawing.Point(276, 93); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 31); - this.layoutControlItem4.Text = "鐢熸晥鏃ユ湡"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_remark; - this.layoutControlItem12.Location = new System.Drawing.Point(0, 93); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem12.Size = new System.Drawing.Size(276, 31); - this.layoutControlItem12.Text = "娴佺▼鎻忚堪"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.btnSelect; - this.layoutControlItem15.Location = new System.Drawing.Point(0, 124); - this.layoutControlItem15.MaxSize = new System.Drawing.Size(100, 31); - this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem15.Size = new System.Drawing.Size(138, 31); - this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem15.Text = "閫夋嫨宸ュ簭"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem15.TextVisible = false; // // tabMx // @@ -937,7 +870,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(708, 431); + this.tabMx.Size = new System.Drawing.Size(775, 473); this.tabMx.TabIndex = 4; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -946,7 +879,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(706, 399); + this.tabMxPage1.Size = new System.Drawing.Size(773, 441); this.tabMxPage1.Text = "宸ュ簭淇℃伅"; // // gcMx1 @@ -963,7 +896,7 @@ this.repositoryItemComboBox1, this.repositoryItemComboBox2, this.rptGx}); - this.gcMx1.Size = new System.Drawing.Size(706, 399); + this.gcMx1.Size = new System.Drawing.Size(773, 441); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -976,6 +909,7 @@ this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx1daa002, this.gvMx1daa010, + this.gridColumn5, this.gvMx1daa003, this.gridColumn1, this.gvMx1daa004, @@ -1008,7 +942,7 @@ // gvMx1daa010 // this.gvMx1daa010.AppearanceCell.Options.UseFont = true; - this.gvMx1daa010.Caption = "宸ュ簭浠g爜:鍚嶇О"; + this.gvMx1daa010.Caption = "宸ュ簭浠g爜"; this.gvMx1daa010.FieldName = "processNo"; this.gvMx1daa010.MinWidth = 50; this.gvMx1daa010.Name = "gvMx1daa010"; @@ -1017,6 +951,16 @@ this.gvMx1daa010.Visible = true; this.gvMx1daa010.VisibleIndex = 1; this.gvMx1daa010.Width = 129; + // + // gridColumn5 + // + this.gridColumn5.Caption = "宸ュ簭鍚嶇О"; + this.gridColumn5.FieldName = "processName"; + this.gridColumn5.MinWidth = 25; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 2; + this.gridColumn5.Width = 94; // // gvMx1daa003 // @@ -1033,7 +977,7 @@ this.gvMx1daa003.OptionsColumn.ReadOnly = true; this.gvMx1daa003.Tag = "edit"; this.gvMx1daa003.Visible = true; - this.gvMx1daa003.VisibleIndex = 2; + this.gvMx1daa003.VisibleIndex = 3; this.gvMx1daa003.Width = 114; // // repositoryItemComboBox1 @@ -1061,7 +1005,7 @@ this.gridColumn1.OptionsColumn.ReadOnly = true; this.gridColumn1.Tag = "edit"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 3; + this.gridColumn1.VisibleIndex = 4; this.gridColumn1.Width = 92; // // repositoryItemComboBox2 @@ -1094,7 +1038,7 @@ this.gvMx1daa004.OptionsColumn.ReadOnly = true; this.gvMx1daa004.Tag = "edit"; this.gvMx1daa004.Visible = true; - this.gvMx1daa004.VisibleIndex = 4; + this.gvMx1daa004.VisibleIndex = 5; this.gvMx1daa004.Width = 150; // // rptGx @@ -1119,7 +1063,7 @@ this.gvMx1reporttime.OptionsColumn.ReadOnly = true; this.gvMx1reporttime.Tag = "edit"; this.gvMx1reporttime.Visible = true; - this.gvMx1reporttime.VisibleIndex = 5; + this.gvMx1reporttime.VisibleIndex = 6; this.gvMx1reporttime.Width = 89; // // gvMxDel @@ -1130,7 +1074,7 @@ this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.OptionsColumn.ReadOnly = true; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 6; + this.gvMxDel.VisibleIndex = 7; this.gvMxDel.Width = 65; // // repositoryItemButtonEdit1 @@ -1163,11 +1107,73 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // + // layoutControlItem25 + // + this.layoutControlItem25.Control = this.txt_isCheck; + this.layoutControlItem25.Location = new System.Drawing.Point(453, 95); + this.layoutControlItem25.Name = "layoutControlItem25"; + this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem25.Size = new System.Drawing.Size(151, 32); + this.layoutControlItem25.Text = "瀹℃牳鐘舵��"; + this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem25.TextVisible = false; + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_remark; + this.layoutControlItem12.Location = new System.Drawing.Point(302, 63); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem12.Size = new System.Drawing.Size(302, 32); + this.layoutControlItem12.Text = "娴佺▼鎻忚堪"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.btnCopy; + this.layoutControlItem10.Location = new System.Drawing.Point(453, 95); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem10.Size = new System.Drawing.Size(151, 32); + this.layoutControlItem10.Text = "澶嶅埗"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem10.TextVisible = false; + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.btnSelect; + this.layoutControlItem15.Location = new System.Drawing.Point(302, 95); + this.layoutControlItem15.MaxSize = new System.Drawing.Size(100, 31); + this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem15.Size = new System.Drawing.Size(151, 32); + this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem15.Text = "閫夋嫨宸ュ簭"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem15.TextVisible = false; + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_itemModel; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 95); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem2.Size = new System.Drawing.Size(302, 32); + this.layoutControlItem2.Text = "瑙勬牸鍨嬪彿"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // // Frm_WorkTechnique // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1238, 744); + this.ClientSize = new System.Drawing.Size(1305, 744); this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); @@ -1206,35 +1212,29 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_orgName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1245,6 +1245,11 @@ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); this.ResumeLayout(false); } @@ -1287,8 +1292,6 @@ private DevExpress.XtraEditors.DateEdit txt_fBegDate; private DevExpress.XtraEditors.DateEdit txt_fEndDate; private DevExpress.XtraEditors.TextEdit txt_orgName; - private DevExpress.XtraEditors.ComboBoxEdit txt_fType; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; @@ -1299,7 +1302,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.TextEdit txt_guid; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraEditors.TextEdit txt_lastUpdateBy; private DevExpress.XtraEditors.TextEdit txt_lastUpdateDate; private DevExpress.XtraEditors.TextEdit txt_checkBy; @@ -1309,19 +1311,23 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGx; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraEditors.SimpleButton btnCopy; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; } } \ No newline at end of file -- Gitblit v1.9.3