From 80573826d4a94f9bca0bba021295405eff813ae0 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期一, 28 四月 2025 16:49:02 +0800 Subject: [PATCH] 异常 --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 424 ++++++++--- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 8 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 14 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 74 + DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs | 138 ++- DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs | 8 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 544 +++++++++++--- DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 835 ++++++++--------------- 8 files changed, 1,177 insertions(+), 868 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs index 3fc17ad..9f88c87 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs @@ -38,6 +38,8 @@ 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.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); @@ -88,17 +90,11 @@ this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -126,6 +122,30 @@ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.txt_qt031 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt030 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt029 = new DevExpress.XtraEditors.CheckEdit(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt028 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt027 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt034 = new DevExpress.XtraEditors.TextEdit(); + this.txt_qt026 = new DevExpress.XtraEditors.CheckEdit(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt033 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -156,17 +176,11 @@ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -176,6 +190,30 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt027.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt026.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -456,6 +494,7 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.OptionsColumn.ReadOnly = true; + this.gridColumn13.Tag = "query_a.qt029"; this.gridColumn13.Visible = true; this.gridColumn13.VisibleIndex = 3; this.gridColumn13.Width = 94; @@ -467,6 +506,7 @@ this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.OptionsColumn.ReadOnly = true; + this.gridColumn14.Tag = "query_a.qt026"; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 1; this.gridColumn14.Width = 94; @@ -478,6 +518,7 @@ this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.OptionsColumn.ReadOnly = true; + this.gridColumn15.Tag = "query_a.qt032"; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 2; this.gridColumn15.Width = 94; @@ -519,7 +560,7 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 136; + this.splitMx1.SplitterPosition = 195; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -538,6 +579,15 @@ this.layoutMx1.Controls.Add(this.txt_qt016); this.layoutMx1.Controls.Add(this.txt_qt002); this.layoutMx1.Controls.Add(this.txt_qt015); + this.layoutMx1.Controls.Add(this.txt_qt031); + this.layoutMx1.Controls.Add(this.txt_qt030); + this.layoutMx1.Controls.Add(this.txt_qt029); + this.layoutMx1.Controls.Add(this.txt_qt028); + this.layoutMx1.Controls.Add(this.txt_qt027); + this.layoutMx1.Controls.Add(this.txt_qt034); + this.layoutMx1.Controls.Add(this.txt_qt026); + this.layoutMx1.Controls.Add(this.txt_qt033); + this.layoutMx1.Controls.Add(this.txt_qt032); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem14}); @@ -545,7 +595,7 @@ this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1055, 402, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 136); + this.layoutMx1.Size = new System.Drawing.Size(1126, 195); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -561,10 +611,10 @@ // txt_qt008 // this.txt_qt008.IsReadly = false; - this.txt_qt008.Location = new System.Drawing.Point(636, 41); + this.txt_qt008.Location = new System.Drawing.Point(390, 99); this.txt_qt008.Margin = new System.Windows.Forms.Padding(0); this.txt_qt008.Name = "txt_qt008"; - this.txt_qt008.Size = new System.Drawing.Size(200, 24); + this.txt_qt008.Size = new System.Drawing.Size(170, 24); this.txt_qt008.TabIndex = 320; // // ucLookHuoZhu1 @@ -579,35 +629,35 @@ // // txt_qt010 // - this.txt_qt010.Location = new System.Drawing.Point(360, 99); + this.txt_qt010.Location = new System.Drawing.Point(114, 157); this.txt_qt010.Name = "txt_qt010"; this.txt_qt010.Properties.Appearance.Options.UseFont = true; - this.txt_qt010.Size = new System.Drawing.Size(476, 24); + this.txt_qt010.Size = new System.Drawing.Size(446, 24); this.txt_qt010.StyleController = this.layoutMx1; this.txt_qt010.TabIndex = 235; // // txt_qt009 // this.txt_qt009.IsReadly = false; - this.txt_qt009.Location = new System.Drawing.Point(636, 70); + this.txt_qt009.Location = new System.Drawing.Point(390, 128); this.txt_qt009.Name = "txt_qt009"; - this.txt_qt009.Size = new System.Drawing.Size(200, 24); + this.txt_qt009.Size = new System.Drawing.Size(170, 24); this.txt_qt009.TabIndex = 316; // // txt_qt013 // this.txt_qt013.IsReadly = false; - this.txt_qt013.Location = new System.Drawing.Point(360, 70); + this.txt_qt013.Location = new System.Drawing.Point(390, 41); this.txt_qt013.Name = "txt_qt013"; - this.txt_qt013.Size = new System.Drawing.Size(200, 24); + this.txt_qt013.Size = new System.Drawing.Size(170, 24); this.txt_qt013.TabIndex = 304; // // txt_qtck // - this.txt_qtck.Location = new System.Drawing.Point(84, 12); + this.txt_qtck.Location = new System.Drawing.Point(114, 12); this.txt_qtck.Name = "txt_qtck"; this.txt_qtck.Properties.Appearance.Options.UseFont = true; - this.txt_qtck.Size = new System.Drawing.Size(200, 24); + this.txt_qtck.Size = new System.Drawing.Size(170, 24); this.txt_qtck.StyleController = this.layoutMx1; this.txt_qtck.TabIndex = 211; this.txt_qtck.Tag = "readonly"; @@ -615,7 +665,7 @@ // txt_qt019 // this.txt_qt019.EditValue = "璇烽�夋嫨"; - this.txt_qt019.Location = new System.Drawing.Point(360, 12); + this.txt_qt019.Location = new System.Drawing.Point(390, 12); this.txt_qt019.Name = "txt_qt019"; this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -627,22 +677,22 @@ "璐圭敤鐗╂枡鍑哄簱(QTCKD04_SYS)", "搴撳瓨璋冩暣(QTCKD05_SYS)"}); this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_qt019.Size = new System.Drawing.Size(200, 24); + this.txt_qt019.Size = new System.Drawing.Size(170, 24); this.txt_qt019.StyleController = this.layoutMx1; this.txt_qt019.TabIndex = 301; // // txt_qt024 // this.txt_qt024.IsReadly = false; - this.txt_qt024.Location = new System.Drawing.Point(360, 41); + this.txt_qt024.Location = new System.Drawing.Point(114, 128); this.txt_qt024.Name = "txt_qt024"; - this.txt_qt024.Size = new System.Drawing.Size(200, 24); + this.txt_qt024.Size = new System.Drawing.Size(170, 24); this.txt_qt024.TabIndex = 309; // // txt_qt020 // this.txt_qt020.EditValue = "璇烽�夋嫨"; - this.txt_qt020.Location = new System.Drawing.Point(636, 12); + this.txt_qt020.Location = new System.Drawing.Point(390, 70); this.txt_qt020.Name = "txt_qt020"; this.txt_qt020.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -651,34 +701,34 @@ "鏅��(GENERAL)", "閫�璐�(RETURN)"}); this.txt_qt020.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_qt020.Size = new System.Drawing.Size(200, 24); + this.txt_qt020.Size = new System.Drawing.Size(170, 24); this.txt_qt020.StyleController = this.layoutMx1; this.txt_qt020.TabIndex = 300; // // txt_qt023 // this.txt_qt023.IsReadly = false; - this.txt_qt023.Location = new System.Drawing.Point(84, 41); + this.txt_qt023.Location = new System.Drawing.Point(114, 41); this.txt_qt023.Name = "txt_qt023"; - this.txt_qt023.Size = new System.Drawing.Size(200, 24); + this.txt_qt023.Size = new System.Drawing.Size(170, 24); this.txt_qt023.TabIndex = 307; // // txt_qt016 // - this.txt_qt016.Location = new System.Drawing.Point(912, 12); + this.txt_qt016.Location = new System.Drawing.Point(942, 12); this.txt_qt016.Name = "txt_qt016"; this.txt_qt016.Properties.Appearance.Options.UseFont = true; - this.txt_qt016.Size = new System.Drawing.Size(202, 24); + this.txt_qt016.Size = new System.Drawing.Size(172, 24); this.txt_qt016.StyleController = this.layoutMx1; this.txt_qt016.TabIndex = 262; this.txt_qt016.Tag = "readonly"; // // txt_qt002 // - this.txt_qt002.Location = new System.Drawing.Point(912, 41); + this.txt_qt002.Location = new System.Drawing.Point(942, 41); this.txt_qt002.Name = "txt_qt002"; this.txt_qt002.Properties.Appearance.Options.UseFont = true; - this.txt_qt002.Size = new System.Drawing.Size(202, 24); + this.txt_qt002.Size = new System.Drawing.Size(172, 24); this.txt_qt002.StyleController = this.layoutMx1; this.txt_qt002.TabIndex = 216; this.txt_qt002.Tag = "readonly"; @@ -712,17 +762,26 @@ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1, this.layoutControlItem2, - this.layoutControlItem3, this.layoutControlItem4, - this.layoutControlItem5, this.layoutControlItem6, this.layoutControlItem7, this.layoutControlItem8, - this.layoutControlItem10, - this.layoutControlItem13, this.layoutControlItem9, + this.layoutControlItem15, + this.layoutControlItem16, + this.layoutControlItem17, + this.layoutControlItem18, + this.layoutControlItem19, + this.layoutControlItem21, + this.layoutControlItem13, + this.layoutControlItem20, + this.layoutControlItem5, + this.layoutControlItem10, + this.layoutControlItem3, + this.layoutControlItem12, this.layoutControlItem11, - this.layoutControlItem12}); + this.layoutControlItem22, + this.layoutControlItem23}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -746,12 +805,18 @@ 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; + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, - rowDefinition4}); - this.Root.Size = new System.Drawing.Size(1126, 136); + rowDefinition4, + rowDefinition5, + rowDefinition6}); + this.Root.Size = new System.Drawing.Size(1126, 195); this.Root.TextVisible = false; // // layoutControlItem1 @@ -761,7 +826,7 @@ this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(276, 29); this.layoutControlItem1.Text = "鍗曟嵁缂栧彿"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem2 // @@ -771,17 +836,7 @@ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(276, 29); this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.txt_qt020; - this.layoutControlItem3.Location = new System.Drawing.Point(552, 0); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(276, 29); - this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem4 // @@ -791,18 +846,7 @@ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem4.Size = new System.Drawing.Size(276, 29); this.layoutControlItem4.Text = "搴撳瓨缁勭粐"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.txt_qt024; - this.layoutControlItem5.Location = new System.Drawing.Point(276, 29); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(276, 29); - this.layoutControlItem5.Text = "棰嗙敤缁勭粐"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem6 // @@ -811,8 +855,8 @@ this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem6.Size = new System.Drawing.Size(278, 29); - this.layoutControlItem6.Text = "瀹℃牳浜�"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem6.Text = "瀹℃牳浜哄憳"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem7 // @@ -822,8 +866,8 @@ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem7.Size = new System.Drawing.Size(278, 29); - this.layoutControlItem7.Text = "瀹℃牳鏃ユ湡"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem7.Text = "瀹℃牳鏃堕棿"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem8 // @@ -837,29 +881,6 @@ this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem8.TextVisible = false; // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_qt013; - this.layoutControlItem10.Location = new System.Drawing.Point(276, 58); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem10.Size = new System.Drawing.Size(276, 29); - this.layoutControlItem10.Text = "瀹㈡埛"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.txt_qt010; - this.layoutControlItem13.Location = new System.Drawing.Point(276, 87); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(552, 29); - this.layoutControlItem13.Text = "鐢宠澶囨敞"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); - // // layoutControlItem9 // this.layoutControlItem9.Control = this.ucLookHuoZhu1; @@ -872,35 +893,13 @@ this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem9.TextVisible = false; // - // layoutControlItem11 - // - this.layoutControlItem11.Control = this.txt_qt009; - this.layoutControlItem11.Location = new System.Drawing.Point(552, 58); - this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(276, 29); - this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_qt008; - this.layoutControlItem12.Location = new System.Drawing.Point(552, 29); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem12.Size = new System.Drawing.Size(276, 29); - this.layoutControlItem12.Text = "鍙戞枡浠撳簱"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); - // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; 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(1126, 422); + this.tabMx.Size = new System.Drawing.Size(1126, 363); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -909,7 +908,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 390); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 331); this.tabMxPage1.Text = "鐢宠鏄庣粏"; // // gcMx1 @@ -921,7 +920,7 @@ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, this.repositoryItemSearchLookUpEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 390); + this.gcMx1.Size = new System.Drawing.Size(1124, 331); this.gcMx1.TabIndex = 1; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1199,6 +1198,253 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // + // txt_qt031 + // + this.txt_qt031.Location = new System.Drawing.Point(942, 99); + this.txt_qt031.Name = "txt_qt031"; + this.txt_qt031.Size = new System.Drawing.Size(172, 24); + this.txt_qt031.StyleController = this.layoutMx1; + this.txt_qt031.TabIndex = 321; + this.txt_qt031.Tag = "readonly"; + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_qt031; + this.layoutControlItem15.Location = new System.Drawing.Point(828, 87); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem15.Size = new System.Drawing.Size(278, 29); + this.layoutControlItem15.Text = "璐㈠姟瀹℃牳浜哄憳"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); + // + // txt_qt030 + // + this.txt_qt030.Location = new System.Drawing.Point(942, 128); + this.txt_qt030.Name = "txt_qt030"; + this.txt_qt030.Size = new System.Drawing.Size(172, 24); + this.txt_qt030.StyleController = this.layoutMx1; + this.txt_qt030.TabIndex = 322; + this.txt_qt030.Tag = "readonly"; + // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.txt_qt030; + this.layoutControlItem16.Location = new System.Drawing.Point(828, 116); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem16.Size = new System.Drawing.Size(278, 29); + this.layoutControlItem16.Text = "璐㈠姟瀹℃牳鏃堕棿"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); + // + // txt_qt029 + // + this.txt_qt029.Location = new System.Drawing.Point(840, 157); + this.txt_qt029.Name = "txt_qt029"; + this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��"; + this.txt_qt029.Size = new System.Drawing.Size(274, 24); + this.txt_qt029.StyleController = this.layoutMx1; + this.txt_qt029.TabIndex = 323; + this.txt_qt029.Tag = "readonly"; + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.txt_qt029; + this.layoutControlItem17.Location = new System.Drawing.Point(828, 145); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem17.Size = new System.Drawing.Size(278, 30); + this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem17.TextVisible = false; + // + // txt_qt028 + // + this.txt_qt028.Location = new System.Drawing.Point(666, 99); + this.txt_qt028.Name = "txt_qt028"; + this.txt_qt028.Size = new System.Drawing.Size(170, 24); + this.txt_qt028.StyleController = this.layoutMx1; + this.txt_qt028.TabIndex = 324; + this.txt_qt028.Tag = "readonly"; + // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txt_qt028; + this.layoutControlItem18.Location = new System.Drawing.Point(552, 87); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem18.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem18.Text = "鍞悗瀹℃牳浜哄憳"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); + // + // txt_qt027 + // + this.txt_qt027.Location = new System.Drawing.Point(666, 128); + this.txt_qt027.Name = "txt_qt027"; + this.txt_qt027.Size = new System.Drawing.Size(170, 24); + this.txt_qt027.StyleController = this.layoutMx1; + this.txt_qt027.TabIndex = 325; + this.txt_qt027.Tag = "readonly"; + // + // layoutControlItem19 + // + this.layoutControlItem19.Control = this.txt_qt027; + this.layoutControlItem19.Location = new System.Drawing.Point(552, 116); + this.layoutControlItem19.Name = "layoutControlItem19"; + this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem19.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem19.Text = "鍞悗瀹℃牳鏃堕棿"; + this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); + // + // txt_qt034 + // + this.txt_qt034.Location = new System.Drawing.Point(666, 12); + this.txt_qt034.Name = "txt_qt034"; + this.txt_qt034.Size = new System.Drawing.Size(170, 24); + this.txt_qt034.StyleController = this.layoutMx1; + this.txt_qt034.TabIndex = 326; + this.txt_qt034.Tag = "readonly"; + // + // txt_qt026 + // + this.txt_qt026.Location = new System.Drawing.Point(564, 157); + this.txt_qt026.Name = "txt_qt026"; + this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鏍囪瘑"; + this.txt_qt026.Size = new System.Drawing.Size(272, 24); + this.txt_qt026.StyleController = this.layoutMx1; + this.txt_qt026.TabIndex = 327; + this.txt_qt026.Tag = "readonly"; + // + // layoutControlItem21 + // + this.layoutControlItem21.Control = this.txt_qt026; + this.layoutControlItem21.Location = new System.Drawing.Point(552, 145); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem21.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem21.TextVisible = false; + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txt_qt010; + this.layoutControlItem13.Location = new System.Drawing.Point(0, 145); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem13.Size = new System.Drawing.Size(552, 30); + this.layoutControlItem13.Text = "鐢宠澶囨敞"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.txt_qt034; + this.layoutControlItem20.Location = new System.Drawing.Point(552, 0); + this.layoutControlItem20.Name = "layoutControlItem20"; + this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem20.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem20.Text = "閲囪喘瀹℃牳浜哄憳"; + this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txt_qt024; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 116); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem5.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem5.Text = "棰嗙敤缁勭粐"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_qt013; + this.layoutControlItem10.Location = new System.Drawing.Point(276, 29); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem10.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem10.Text = "瀹㈡埛"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_qt020; + this.layoutControlItem3.Location = new System.Drawing.Point(276, 58); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem3.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_qt008; + this.layoutControlItem12.Location = new System.Drawing.Point(276, 87); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem12.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem12.Text = "鍙戞枡浠撳簱"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_qt009; + this.layoutControlItem11.Location = new System.Drawing.Point(276, 116); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem11.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); + // + // txt_qt033 + // + this.txt_qt033.Location = new System.Drawing.Point(666, 41); + this.txt_qt033.Name = "txt_qt033"; + this.txt_qt033.Size = new System.Drawing.Size(170, 24); + this.txt_qt033.StyleController = this.layoutMx1; + this.txt_qt033.TabIndex = 328; + this.txt_qt033.Tag = "readonly"; + // + // layoutControlItem22 + // + this.layoutControlItem22.Control = this.txt_qt033; + this.layoutControlItem22.Location = new System.Drawing.Point(552, 29); + this.layoutControlItem22.Name = "layoutControlItem22"; + this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem22.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem22.Text = "閲囪喘瀹℃牳鏃堕棿"; + this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); + // + // txt_qt032 + // + this.txt_qt032.Location = new System.Drawing.Point(564, 70); + this.txt_qt032.Name = "txt_qt032"; + this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鏍囪瘑"; + this.txt_qt032.Size = new System.Drawing.Size(272, 24); + this.txt_qt032.StyleController = this.layoutMx1; + this.txt_qt032.TabIndex = 329; + this.txt_qt032.Tag = "readonly"; + // + // layoutControlItem23 + // + this.layoutControlItem23.Control = this.txt_qt032; + this.layoutControlItem23.Location = new System.Drawing.Point(552, 58); + this.layoutControlItem23.Name = "layoutControlItem23"; + this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem23.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem23.TextVisible = false; + // // Frm_MesItemQt // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1239,17 +1485,11 @@ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1259,6 +1499,30 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt027.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt026.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); this.ResumeLayout(false); } @@ -1304,16 +1568,12 @@ private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraEditors.CheckEdit txt_qt015; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; @@ -1340,11 +1600,33 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; + private DevExpress.XtraEditors.TextEdit txt_qt031; + private DevExpress.XtraEditors.TextEdit txt_qt030; + private DevExpress.XtraEditors.CheckEdit txt_qt029; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; + private DevExpress.XtraEditors.TextEdit txt_qt028; + private DevExpress.XtraEditors.TextEdit txt_qt027; + private DevExpress.XtraEditors.TextEdit txt_qt034; + private DevExpress.XtraEditors.CheckEdit txt_qt026; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; + private DevExpress.XtraEditors.TextEdit txt_qt033; + private DevExpress.XtraEditors.CheckEdit txt_qt032; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs index ce76d58..f4b0ee1 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs @@ -126,18 +126,22 @@ // // wizardControl1 // + this.wizardControl1.CancelText = "鍙栨秷"; this.wizardControl1.Controls.Add(this.welcomeWizardPage1); this.wizardControl1.Controls.Add(this.wizardPage1); this.wizardControl1.Controls.Add(this.completionWizardPage1); this.wizardControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardControl1.FinishText = "&淇濆瓨"; this.wizardControl1.ImageOptions.ImageWidth = 100; this.wizardControl1.Margin = new System.Windows.Forms.Padding(4); this.wizardControl1.MinimumSize = new System.Drawing.Size(133, 138); this.wizardControl1.Name = "wizardControl1"; + this.wizardControl1.NextText = "&涓嬩竴姝� >"; this.wizardControl1.Pages.AddRange(new DevExpress.XtraWizard.BaseWizardPage[] { this.welcomeWizardPage1, this.wizardPage1, this.completionWizardPage1}); + this.wizardControl1.PreviousText = "< &涓婁竴姝�"; this.wizardControl1.Size = new System.Drawing.Size(1038, 718); this.wizardControl1.Text = ""; // @@ -737,10 +741,10 @@ // // completionWizardPage1 // - this.completionWizardPage1.FinishText = "鏈�鍚庝竴姝ワ紝鐐瑰嚮鈥淔inish鈥濅繚瀛樺鍒朵俊鎭�"; + this.completionWizardPage1.FinishText = "鏈�鍚庝竴姝ワ紝鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�"; this.completionWizardPage1.Margin = new System.Windows.Forms.Padding(4); this.completionWizardPage1.Name = "completionWizardPage1"; - this.completionWizardPage1.ProceedText = "鐐瑰嚮鈥淔inish鈥濅繚瀛樹俊鎭�"; + this.completionWizardPage1.ProceedText = "鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�"; this.completionWizardPage1.Size = new System.Drawing.Size(898, 553); this.completionWizardPage1.Text = "淇濆瓨淇℃伅"; // diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs index 2a8c044..aaece56 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs @@ -57,28 +57,18 @@ this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn15 = 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(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.lbGuid = new System.Windows.Forms.Label(); - this.txt_remark = new DevExpress.XtraEditors.TextEdit(); - this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); - this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.txt_fType = new DevExpress.XtraEditors.TextEdit(); this.txt_itemNo = new DevExpress.XtraEditors.TextEdit(); this.txt_itemName = new DevExpress.XtraEditors.TextEdit(); @@ -86,40 +76,29 @@ this.txt_dhdNo = new DevExpress.XtraEditors.TextEdit(); this.txt_gysNo = new DevExpress.XtraEditors.TextEdit(); this.txt_gysName = new DevExpress.XtraEditors.TextEdit(); - this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit(); - this.txt_chooseQty = new DevExpress.XtraEditors.TextEdit(); this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit(); this.txt_guid = new DevExpress.XtraEditors.TextEdit(); this.txt_fBillNo = new DevExpress.XtraEditors.TextEdit(); - this.txt_chooseGoodQty = new DevExpress.XtraEditors.TextEdit(); - this.txt_chooseBadQty = new DevExpress.XtraEditors.TextEdit(); - this.txt_workLine = new DevExpress.XtraEditors.TextEdit(); - this.txt_jydNo = new DevExpress.XtraEditors.TextEdit(); + this.txt_dhdDate = new DevExpress.XtraEditors.TextEdit(); this.txt_handResult = new DevExpress.XtraEditors.TextEdit(); this.txt_handSuggestion = new DevExpress.XtraEditors.TextEdit(); + this.txt_fngDesc = new DevExpress.XtraEditors.MemoEdit(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -127,12 +106,16 @@ this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.caaGuid = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa005 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); @@ -161,9 +144,6 @@ this.splitMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit(); @@ -171,40 +151,29 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_chooseGoodQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_chooseBadQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_workLine.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_jydNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_dhdDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -305,20 +274,13 @@ this.gv_checkUser, this.gv_checkDate, this.gv_pba005, - this.gv_pba006, - this.gv_pba009, - this.gridColumn5, - this.gridColumn3, - this.gridColumn6, - this.gridColumn7, this.gridColumn8, this.gridColumn9, this.gridColumn10, this.gridColumn11, this.gridColumn12, this.gridColumn13, - this.gridColumn14, - this.gridColumn15}); + this.gridColumn3}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -404,68 +366,6 @@ this.gv_pba005.VisibleIndex = 5; this.gv_pba005.Width = 94; // - // gv_pba006 - // - this.gv_pba006.AppearanceCell.Options.UseFont = true; - this.gv_pba006.Caption = "澶勭悊缁撴灉"; - this.gv_pba006.FieldName = "handSuggestion"; - this.gv_pba006.Name = "gv_pba006"; - this.gv_pba006.OptionsColumn.AllowEdit = false; - this.gv_pba006.Tag = "query_a.pba006"; - this.gv_pba006.Visible = true; - this.gv_pba006.VisibleIndex = 7; - this.gv_pba006.Width = 180; - // - // gv_pba009 - // - this.gv_pba009.AppearanceCell.Options.UseFont = true; - this.gv_pba009.Caption = "閫夊埆绫诲埆"; - this.gv_pba009.FieldName = "chooseType"; - this.gv_pba009.Name = "gv_pba009"; - this.gv_pba009.OptionsColumn.AllowEdit = false; - this.gv_pba009.Tag = "query_a.pba009"; - this.gv_pba009.Visible = true; - this.gv_pba009.VisibleIndex = 9; - this.gv_pba009.Width = 100; - // - // gridColumn5 - // - this.gridColumn5.Caption = "閫夊埆鏁伴噺"; - this.gridColumn5.FieldName = "chooseQty"; - this.gridColumn5.MinWidth = 25; - this.gridColumn5.Name = "gridColumn5"; - this.gridColumn5.Width = 94; - // - // gridColumn3 - // - this.gridColumn3.Caption = "閫夊埆鑹搧鏁�"; - this.gridColumn3.FieldName = "chooseGoodQty"; - this.gridColumn3.MinWidth = 25; - this.gridColumn3.Name = "gridColumn3"; - this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 10; - this.gridColumn3.Width = 94; - // - // gridColumn6 - // - this.gridColumn6.Caption = "閫夊埆涓嶈壇鍝佹暟"; - this.gridColumn6.FieldName = "chooseBadQty"; - this.gridColumn6.MinWidth = 25; - this.gridColumn6.Name = "gridColumn6"; - this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 11; - this.gridColumn6.Width = 94; - // - // gridColumn7 - // - this.gridColumn7.Caption = "鍒ゅ畾缁撴灉"; - this.gridColumn7.FieldName = "handResult"; - this.gridColumn7.MinWidth = 25; - this.gridColumn7.Name = "gridColumn7"; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 6; - this.gridColumn7.Width = 94; - // // gridColumn8 // this.gridColumn8.Caption = "鐗╂枡缂栫爜"; @@ -473,7 +373,7 @@ this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 12; + this.gridColumn8.VisibleIndex = 6; this.gridColumn8.Width = 94; // // gridColumn9 @@ -483,7 +383,7 @@ this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 13; + this.gridColumn9.VisibleIndex = 7; this.gridColumn9.Width = 94; // // gridColumn10 @@ -493,7 +393,7 @@ this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 14; + this.gridColumn10.VisibleIndex = 8; this.gridColumn10.Width = 94; // // gridColumn11 @@ -503,7 +403,7 @@ this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 15; + this.gridColumn11.VisibleIndex = 9; this.gridColumn11.Width = 94; // // gridColumn12 @@ -513,7 +413,7 @@ this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 16; + this.gridColumn12.VisibleIndex = 10; this.gridColumn12.Width = 94; // // gridColumn13 @@ -523,28 +423,18 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 17; + this.gridColumn13.VisibleIndex = 11; this.gridColumn13.Width = 94; // - // gridColumn14 + // gridColumn3 // - this.gridColumn14.Caption = "妫�楠屽崟鍙�"; - this.gridColumn14.FieldName = "jydNo"; - this.gridColumn14.MinWidth = 25; - this.gridColumn14.Name = "gridColumn14"; - this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 18; - this.gridColumn14.Width = 94; - // - // gridColumn15 - // - this.gridColumn15.Caption = "澶勭悊鏂瑰紡"; - this.gridColumn15.FieldName = "fmrmode"; - this.gridColumn15.MinWidth = 25; - this.gridColumn15.Name = "gridColumn15"; - this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 8; - this.gridColumn15.Width = 94; + this.gridColumn3.Caption = "鐗╂枡ID"; + this.gridColumn3.FieldName = "itemId"; + this.gridColumn3.MinWidth = 25; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 12; + this.gridColumn3.Width = 94; // // pageBar1 // @@ -583,15 +473,12 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 202; + this.splitMx1.SplitterPosition = 185; this.splitMx1.TabIndex = 0; // // layoutMx1 // this.layoutMx1.Controls.Add(this.lbGuid); - this.layoutMx1.Controls.Add(this.txt_remark); - this.layoutMx1.Controls.Add(this.txt_createBy); - this.layoutMx1.Controls.Add(this.txt_createDate); this.layoutMx1.Controls.Add(this.txt_fType); this.layoutMx1.Controls.Add(this.txt_itemNo); this.layoutMx1.Controls.Add(this.txt_itemName); @@ -599,26 +486,22 @@ this.layoutMx1.Controls.Add(this.txt_dhdNo); this.layoutMx1.Controls.Add(this.txt_gysNo); this.layoutMx1.Controls.Add(this.txt_gysName); - this.layoutMx1.Controls.Add(this.txt_fbatchQty); - this.layoutMx1.Controls.Add(this.txt_chooseQty); this.layoutMx1.Controls.Add(this.txt_fmrmode); this.layoutMx1.Controls.Add(this.txt_guid); this.layoutMx1.Controls.Add(this.txt_fBillNo); - this.layoutMx1.Controls.Add(this.txt_chooseGoodQty); - this.layoutMx1.Controls.Add(this.txt_chooseBadQty); - this.layoutMx1.Controls.Add(this.txt_workLine); - this.layoutMx1.Controls.Add(this.txt_jydNo); + this.layoutMx1.Controls.Add(this.txt_dhdDate); this.layoutMx1.Controls.Add(this.txt_handResult); this.layoutMx1.Controls.Add(this.txt_handSuggestion); + this.layoutMx1.Controls.Add(this.txt_fngDesc); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem9, this.layoutControlItem24}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(706, 510, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(598, 453, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 202); + this.layoutMx1.Size = new System.Drawing.Size(1126, 185); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -631,114 +514,69 @@ this.lbGuid.Text = "lbGuid"; this.lbGuid.Visible = false; // - // txt_remark - // - this.txt_remark.Location = new System.Drawing.Point(391, 162); - this.txt_remark.Name = "txt_remark"; - this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(445, 24); - this.txt_remark.StyleController = this.layoutMx1; - this.txt_remark.TabIndex = 240; - // - // txt_createBy - // - this.txt_createBy.Location = new System.Drawing.Point(667, 12); - this.txt_createBy.Name = "txt_createBy"; - this.txt_createBy.Properties.Appearance.Options.UseFont = true; - this.txt_createBy.Size = new System.Drawing.Size(169, 24); - this.txt_createBy.StyleController = this.layoutMx1; - this.txt_createBy.TabIndex = 273; - this.txt_createBy.Tag = "readonly"; - // - // txt_createDate - // - this.txt_createDate.Location = new System.Drawing.Point(667, 42); - this.txt_createDate.Name = "txt_createDate"; - this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(169, 24); - this.txt_createDate.StyleController = this.layoutMx1; - this.txt_createDate.TabIndex = 267; - this.txt_createDate.Tag = "readonly"; - // // txt_fType // - this.txt_fType.Location = new System.Drawing.Point(943, 102); + this.txt_fType.Location = new System.Drawing.Point(912, 96); this.txt_fType.Name = "txt_fType"; - this.txt_fType.Size = new System.Drawing.Size(171, 24); + this.txt_fType.Size = new System.Drawing.Size(181, 24); this.txt_fType.StyleController = this.layoutMx1; this.txt_fType.TabIndex = 462; // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(391, 72); + this.txt_itemNo.Location = new System.Drawing.Point(370, 12); this.txt_itemNo.Name = "txt_itemNo"; - this.txt_itemNo.Size = new System.Drawing.Size(169, 24); + this.txt_itemNo.Size = new System.Drawing.Size(180, 24); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 464; // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(667, 72); + this.txt_itemName.Location = new System.Drawing.Point(370, 68); this.txt_itemName.Name = "txt_itemName"; - this.txt_itemName.Size = new System.Drawing.Size(169, 24); + this.txt_itemName.Size = new System.Drawing.Size(451, 24); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 465; // // txt_itemModel // - this.txt_itemModel.Location = new System.Drawing.Point(391, 102); + this.txt_itemModel.Location = new System.Drawing.Point(370, 40); this.txt_itemModel.Name = "txt_itemModel"; - this.txt_itemModel.Size = new System.Drawing.Size(445, 24); + this.txt_itemModel.Size = new System.Drawing.Size(451, 24); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 466; // // txt_dhdNo // - this.txt_dhdNo.Location = new System.Drawing.Point(391, 12); + this.txt_dhdNo.Location = new System.Drawing.Point(99, 40); this.txt_dhdNo.Name = "txt_dhdNo"; - this.txt_dhdNo.Size = new System.Drawing.Size(169, 24); + this.txt_dhdNo.Size = new System.Drawing.Size(180, 24); this.txt_dhdNo.StyleController = this.layoutMx1; this.txt_dhdNo.TabIndex = 467; // // txt_gysNo // - this.txt_gysNo.Location = new System.Drawing.Point(391, 132); + this.txt_gysNo.Location = new System.Drawing.Point(99, 96); this.txt_gysNo.Name = "txt_gysNo"; - this.txt_gysNo.Size = new System.Drawing.Size(169, 24); + this.txt_gysNo.Size = new System.Drawing.Size(180, 24); this.txt_gysNo.StyleController = this.layoutMx1; this.txt_gysNo.TabIndex = 468; // // txt_gysName // - this.txt_gysName.Location = new System.Drawing.Point(667, 132); + this.txt_gysName.Location = new System.Drawing.Point(370, 96); this.txt_gysName.Name = "txt_gysName"; - this.txt_gysName.Size = new System.Drawing.Size(169, 24); + this.txt_gysName.Size = new System.Drawing.Size(451, 24); this.txt_gysName.StyleController = this.layoutMx1; this.txt_gysName.TabIndex = 469; // - // txt_fbatchQty - // - this.txt_fbatchQty.Location = new System.Drawing.Point(115, 72); - this.txt_fbatchQty.Name = "txt_fbatchQty"; - this.txt_fbatchQty.Size = new System.Drawing.Size(169, 24); - this.txt_fbatchQty.StyleController = this.layoutMx1; - this.txt_fbatchQty.TabIndex = 470; - // - // txt_chooseQty - // - this.txt_chooseQty.Location = new System.Drawing.Point(115, 102); - this.txt_chooseQty.Name = "txt_chooseQty"; - this.txt_chooseQty.Size = new System.Drawing.Size(169, 24); - this.txt_chooseQty.StyleController = this.layoutMx1; - this.txt_chooseQty.TabIndex = 471; - // // txt_fmrmode // - this.txt_fmrmode.Location = new System.Drawing.Point(943, 72); + this.txt_fmrmode.Location = new System.Drawing.Point(912, 68); this.txt_fmrmode.Name = "txt_fmrmode"; this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true; - this.txt_fmrmode.Size = new System.Drawing.Size(171, 24); + this.txt_fmrmode.Size = new System.Drawing.Size(181, 24); this.txt_fmrmode.StyleController = this.layoutMx1; this.txt_fmrmode.TabIndex = 473; // @@ -752,65 +590,49 @@ // // txt_fBillNo // - this.txt_fBillNo.Location = new System.Drawing.Point(115, 12); + this.txt_fBillNo.Location = new System.Drawing.Point(99, 12); this.txt_fBillNo.Name = "txt_fBillNo"; - this.txt_fBillNo.Size = new System.Drawing.Size(169, 24); + this.txt_fBillNo.Size = new System.Drawing.Size(180, 24); this.txt_fBillNo.StyleController = this.layoutMx1; this.txt_fBillNo.TabIndex = 478; // - // txt_chooseGoodQty + // txt_dhdDate // - this.txt_chooseGoodQty.Location = new System.Drawing.Point(115, 132); - this.txt_chooseGoodQty.Name = "txt_chooseGoodQty"; - this.txt_chooseGoodQty.Size = new System.Drawing.Size(169, 24); - this.txt_chooseGoodQty.StyleController = this.layoutMx1; - this.txt_chooseGoodQty.TabIndex = 479; - // - // txt_chooseBadQty - // - this.txt_chooseBadQty.Location = new System.Drawing.Point(115, 162); - this.txt_chooseBadQty.Name = "txt_chooseBadQty"; - this.txt_chooseBadQty.Size = new System.Drawing.Size(169, 24); - this.txt_chooseBadQty.StyleController = this.layoutMx1; - this.txt_chooseBadQty.TabIndex = 480; - // - // txt_workLine - // - this.txt_workLine.Location = new System.Drawing.Point(391, 42); - this.txt_workLine.Name = "txt_workLine"; - this.txt_workLine.Size = new System.Drawing.Size(169, 24); - this.txt_workLine.StyleController = this.layoutMx1; - this.txt_workLine.TabIndex = 481; - // - // txt_jydNo - // - this.txt_jydNo.Location = new System.Drawing.Point(115, 42); - this.txt_jydNo.Name = "txt_jydNo"; - this.txt_jydNo.Size = new System.Drawing.Size(169, 24); - this.txt_jydNo.StyleController = this.layoutMx1; - this.txt_jydNo.TabIndex = 482; + this.txt_dhdDate.Location = new System.Drawing.Point(99, 68); + this.txt_dhdDate.Name = "txt_dhdDate"; + this.txt_dhdDate.Size = new System.Drawing.Size(180, 24); + this.txt_dhdDate.StyleController = this.layoutMx1; + this.txt_dhdDate.TabIndex = 481; // // txt_handResult // - this.txt_handResult.Location = new System.Drawing.Point(943, 12); + this.txt_handResult.Location = new System.Drawing.Point(912, 12); this.txt_handResult.Name = "txt_handResult"; this.txt_handResult.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_handResult.Properties.Appearance.Options.UseForeColor = true; - this.txt_handResult.Size = new System.Drawing.Size(171, 24); + this.txt_handResult.Size = new System.Drawing.Size(181, 24); this.txt_handResult.StyleController = this.layoutMx1; this.txt_handResult.TabIndex = 483; this.txt_handResult.Tag = "readonly"; // // txt_handSuggestion // - this.txt_handSuggestion.Location = new System.Drawing.Point(943, 42); + this.txt_handSuggestion.Location = new System.Drawing.Point(912, 40); this.txt_handSuggestion.Name = "txt_handSuggestion"; this.txt_handSuggestion.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_handSuggestion.Properties.Appearance.Options.UseForeColor = true; - this.txt_handSuggestion.Size = new System.Drawing.Size(171, 24); + this.txt_handSuggestion.Size = new System.Drawing.Size(181, 24); this.txt_handSuggestion.StyleController = this.layoutMx1; this.txt_handSuggestion.TabIndex = 484; this.txt_handSuggestion.Tag = "readonly"; + // + // txt_fngDesc + // + this.txt_fngDesc.Location = new System.Drawing.Point(99, 124); + this.txt_fngDesc.Name = "txt_fngDesc"; + this.txt_fngDesc.Size = new System.Drawing.Size(994, 52); + this.txt_fngDesc.StyleController = this.layoutMx1; + this.txt_fngDesc.TabIndex = 485; // // layoutControlItem9 // @@ -840,26 +662,19 @@ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.Root.GroupBordersVisible = false; this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem17, - this.layoutControlItem18, this.layoutControlItem2, - this.layoutControlItem25, - this.layoutControlItem26, - this.layoutControlItem7, + this.layoutControlItem20, + this.layoutControlItem1, + this.layoutControlItem21, + this.layoutControlItem19, + this.layoutControlItem14, + this.layoutControlItem4, + this.layoutControlItem11, this.layoutControlItem15, this.layoutControlItem16, this.layoutControlItem13, this.layoutControlItem12, - this.layoutControlItem11, - this.layoutControlItem6, - this.layoutControlItem14, - this.layoutControlItem4, - this.layoutControlItem5, - this.layoutControlItem3, - this.layoutControlItem20, - this.layoutControlItem1, - this.layoutControlItem21, - this.layoutControlItem19}); + this.layoutControlItem3}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -894,222 +709,149 @@ rowDefinition4, rowDefinition5, rowDefinition6}); - this.Root.Size = new System.Drawing.Size(1126, 202); + this.Root.Size = new System.Drawing.Size(1105, 188); this.Root.TextVisible = false; - // - // layoutControlItem17 - // - this.layoutControlItem17.Control = this.txt_fbatchQty; - this.layoutControlItem17.Location = new System.Drawing.Point(0, 60); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem17.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem17.Text = "鏉ユ枡鏁伴噺"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem18 - // - this.layoutControlItem18.Control = this.txt_chooseQty; - this.layoutControlItem18.Location = new System.Drawing.Point(0, 90); - this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem18.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem18.Text = "閫夊埆鏁伴噺"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(91, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_fBillNo; this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem2.Size = new System.Drawing.Size(271, 28); this.layoutControlItem2.Text = "寮傚父缂栧彿"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem25 - // - this.layoutControlItem25.Control = this.txt_chooseGoodQty; - this.layoutControlItem25.Location = new System.Drawing.Point(0, 120); - this.layoutControlItem25.Name = "layoutControlItem25"; - this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem25.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem25.Text = "閫夊埆鑹搧鏁�"; - this.layoutControlItem25.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem26 - // - this.layoutControlItem26.Control = this.txt_chooseBadQty; - this.layoutControlItem26.Location = new System.Drawing.Point(0, 150); - this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem26.Size = new System.Drawing.Size(276, 32); - this.layoutControlItem26.Text = "閫夊埆涓嶈壇鍝佹暟"; - this.layoutControlItem26.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txt_remark; - this.layoutControlItem7.CustomizationFormText = "IQC澶囨敞"; - this.layoutControlItem7.Location = new System.Drawing.Point(276, 150); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem7.Size = new System.Drawing.Size(552, 32); - this.layoutControlItem7.Text = "IQC澶囨敞"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txt_gysNo; - this.layoutControlItem15.Location = new System.Drawing.Point(276, 120); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem15.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem16 - // - this.layoutControlItem16.Control = this.txt_gysName; - this.layoutControlItem16.Location = new System.Drawing.Point(552, 120); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem16.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.txt_itemModel; - this.layoutControlItem13.Location = new System.Drawing.Point(276, 90); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(552, 30); - this.layoutControlItem13.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_itemName; - this.layoutControlItem12.Location = new System.Drawing.Point(552, 60); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem12.Text = "鐗╂枡鍚嶇О"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem11 - // - this.layoutControlItem11.Control = this.txt_itemNo; - this.layoutControlItem11.Location = new System.Drawing.Point(276, 60); - this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem11.Text = "鐗╂枡缂栧彿"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_jydNo; - this.layoutControlItem6.Location = new System.Drawing.Point(0, 30); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem6.Text = "妫�楠屽崟鍙�"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem14 - // - this.layoutControlItem14.Control = this.txt_dhdNo; - this.layoutControlItem14.Location = new System.Drawing.Point(276, 0); - this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem14.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem14.Text = "鍒拌揣鍗曞彿"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.txt_workLine; - this.layoutControlItem4.Location = new System.Drawing.Point(276, 30); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem4.Text = "鍒拌揣鍗曞簭鍙�"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.txt_createBy; - this.layoutControlItem5.Location = new System.Drawing.Point(552, 0); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem5.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem5.Text = "IQC鎻愪氦浜哄憳"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(91, 18); - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.txt_createDate; - this.layoutControlItem3.Location = new System.Drawing.Point(552, 30); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem3.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem3.Text = "IQC鎻愪氦鏃ユ湡 "; - this.layoutControlItem3.TextSize = new System.Drawing.Size(91, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem20 // this.layoutControlItem20.Control = this.txt_fmrmode; this.layoutControlItem20.CustomizationFormText = "澶勭悊鏂瑰紡"; - this.layoutControlItem20.Location = new System.Drawing.Point(828, 60); + this.layoutControlItem20.Location = new System.Drawing.Point(813, 56); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem20.Size = new System.Drawing.Size(278, 30); + this.layoutControlItem20.Size = new System.Drawing.Size(272, 28); this.layoutControlItem20.Text = "閫�鏂欐柟寮�"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(91, 18); + this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem1 // this.layoutControlItem1.Control = this.txt_fType; - this.layoutControlItem1.Location = new System.Drawing.Point(828, 90); + this.layoutControlItem1.Location = new System.Drawing.Point(813, 84); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem1.Size = new System.Drawing.Size(278, 30); + this.layoutControlItem1.Size = new System.Drawing.Size(272, 28); this.layoutControlItem1.Text = "寮傚父绫诲瀷"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(91, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem21 // this.layoutControlItem21.Control = this.txt_handResult; - this.layoutControlItem21.Location = new System.Drawing.Point(828, 0); + this.layoutControlItem21.Location = new System.Drawing.Point(813, 0); this.layoutControlItem21.Name = "layoutControlItem21"; this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem21.Size = new System.Drawing.Size(278, 30); + this.layoutControlItem21.Size = new System.Drawing.Size(272, 28); this.layoutControlItem21.Text = "鍒ゅ畾缁撴灉"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(91, 18); + this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem19 // this.layoutControlItem19.Control = this.txt_handSuggestion; - this.layoutControlItem19.Location = new System.Drawing.Point(828, 30); + this.layoutControlItem19.Location = new System.Drawing.Point(813, 28); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem19.Size = new System.Drawing.Size(278, 30); + this.layoutControlItem19.Size = new System.Drawing.Size(272, 28); this.layoutControlItem19.Text = "澶勭悊缁撴灉"; - this.layoutControlItem19.TextSize = new System.Drawing.Size(91, 18); + this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem14 + // + this.layoutControlItem14.Control = this.txt_dhdNo; + this.layoutControlItem14.Location = new System.Drawing.Point(0, 28); + this.layoutControlItem14.Name = "layoutControlItem14"; + this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem14.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem14.Text = "鍒拌揣鍗曞彿"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_dhdDate; + this.layoutControlItem4.Location = new System.Drawing.Point(0, 56); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem4.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem4.Text = "鍒拌揣鍗曟棩鏈�"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_itemNo; + this.layoutControlItem11.Location = new System.Drawing.Point(271, 0); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem11.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem11.Text = "鐗╂枡缂栧彿"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_gysNo; + this.layoutControlItem15.Location = new System.Drawing.Point(0, 84); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem15.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.txt_gysName; + this.layoutControlItem16.Location = new System.Drawing.Point(271, 84); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem16.Size = new System.Drawing.Size(542, 28); + this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txt_itemModel; + this.layoutControlItem13.Location = new System.Drawing.Point(271, 28); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem13.Size = new System.Drawing.Size(542, 28); + this.layoutControlItem13.Text = "鐗╂枡瑙勬牸"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_itemName; + this.layoutControlItem12.Location = new System.Drawing.Point(271, 56); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem12.Size = new System.Drawing.Size(542, 28); + this.layoutControlItem12.Text = "鐗╂枡鍚嶇О"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_fngDesc; + this.layoutControlItem3.Location = new System.Drawing.Point(0, 112); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 4; + this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2; + this.layoutControlItem3.Size = new System.Drawing.Size(1085, 56); + this.layoutControlItem3.Text = "涓嶅悎鏍兼弿杩�"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); // // tabMx // @@ -1117,7 +859,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(1126, 356); + this.tabMx.Size = new System.Drawing.Size(1126, 373); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -1126,8 +868,8 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 324); - this.tabMxPage1.Text = "閫夊埆鏄庣粏"; + this.tabMxPage1.Size = new System.Drawing.Size(1124, 341); + this.tabMxPage1.Text = "寮傚父鏄庣粏"; // // gcMx1 // @@ -1141,7 +883,7 @@ this.repositoryItemButtonEdit1, this.rptJYBZ, this.repositoryItemDateEdit3}); - this.gcMx1.Size = new System.Drawing.Size(1124, 324); + this.gcMx1.Size = new System.Drawing.Size(1124, 341); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1155,12 +897,16 @@ this.gvMx1guid, this.caaGuid, this.gvMx1daa002, - this.gvMx1daa010, + this.gridColumn5, + this.gridColumn6, this.gvMx1daa005, - this.gvMx1daa003, + this.gridColumn7, this.gvMx1daa004, this.gvMx1daa008, - this.gvMx1reporttime}); + this.gvMx1reporttime, + this.gridColumn14, + this.gridColumn15, + this.gridColumn16}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1200,18 +946,25 @@ this.gvMx1daa002.VisibleIndex = 0; this.gvMx1daa002.Width = 50; // - // gvMx1daa010 + // gridColumn5 // - this.gvMx1daa010.AppearanceCell.Options.UseFont = true; - this.gvMx1daa010.Caption = "鎵规"; - this.gvMx1daa010.FieldName = "batch"; - this.gvMx1daa010.MinWidth = 50; - this.gvMx1daa010.Name = "gvMx1daa010"; - this.gvMx1daa010.OptionsColumn.ReadOnly = true; - this.gvMx1daa010.Tag = "query_a.daa010"; - this.gvMx1daa010.Visible = true; - this.gvMx1daa010.VisibleIndex = 1; - this.gvMx1daa010.Width = 50; + this.gridColumn5.Caption = "妫�楠屽崟鍙�"; + this.gridColumn5.FieldName = "releaseNo"; + this.gridColumn5.MinWidth = 25; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 1; + this.gridColumn5.Width = 94; + // + // gridColumn6 + // + this.gridColumn6.Caption = "妫�楠屾棩鏈�"; + this.gridColumn6.FieldName = "jyDate"; + this.gridColumn6.MinWidth = 25; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 4; + this.gridColumn6.Width = 94; // // gvMx1daa005 // @@ -1226,18 +979,15 @@ this.gvMx1daa005.VisibleIndex = 2; this.gvMx1daa005.Width = 50; // - // gvMx1daa003 + // gridColumn7 // - this.gvMx1daa003.AppearanceCell.Options.UseFont = true; - this.gvMx1daa003.Caption = "涓嶈壇椤圭洰"; - this.gvMx1daa003.FieldName = "badItem"; - this.gvMx1daa003.MinWidth = 50; - this.gvMx1daa003.Name = "gvMx1daa003"; - this.gvMx1daa003.OptionsColumn.ReadOnly = true; - this.gvMx1daa003.Tag = "query_a.daa003"; - this.gvMx1daa003.Visible = true; - this.gvMx1daa003.VisibleIndex = 3; - this.gvMx1daa003.Width = 50; + this.gridColumn7.Caption = "鎶芥牱鏁�"; + this.gridColumn7.FieldName = "chouQty"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 3; + this.gridColumn7.Width = 94; // // gvMx1daa004 // @@ -1249,7 +999,7 @@ this.gvMx1daa004.OptionsColumn.ReadOnly = true; this.gvMx1daa004.Tag = "query_a.daa004"; this.gvMx1daa004.Visible = true; - this.gvMx1daa004.VisibleIndex = 4; + this.gvMx1daa004.VisibleIndex = 5; this.gvMx1daa004.Width = 50; // // gvMx1daa008 @@ -1263,20 +1013,50 @@ this.gvMx1daa008.OptionsColumn.ReadOnly = true; this.gvMx1daa008.Tag = "query_a.daa008"; this.gvMx1daa008.Visible = true; - this.gvMx1daa008.VisibleIndex = 5; + this.gvMx1daa008.VisibleIndex = 6; this.gvMx1daa008.Width = 50; // // gvMx1reporttime // this.gvMx1reporttime.AppearanceCell.Options.UseFont = true; - this.gvMx1reporttime.Caption = "澶囨敞"; - this.gvMx1reporttime.FieldName = "remark"; + this.gvMx1reporttime.Caption = "閫夊埆绫诲瀷"; + this.gvMx1reporttime.FieldName = "chooseType"; this.gvMx1reporttime.MinWidth = 50; this.gvMx1reporttime.Name = "gvMx1reporttime"; this.gvMx1reporttime.Tag = "edit"; this.gvMx1reporttime.Visible = true; - this.gvMx1reporttime.VisibleIndex = 6; + this.gvMx1reporttime.VisibleIndex = 7; this.gvMx1reporttime.Width = 102; + // + // gridColumn14 + // + this.gridColumn14.Caption = "澶勭疆鎰忚"; + this.gridColumn14.FieldName = "handResult"; + this.gridColumn14.MinWidth = 25; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 8; + this.gridColumn14.Width = 94; + // + // gridColumn15 + // + this.gridColumn15.Caption = "閫夊埆鏁伴噺"; + this.gridColumn15.FieldName = "chooseQty"; + this.gridColumn15.MinWidth = 25; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Visible = true; + this.gridColumn15.VisibleIndex = 9; + this.gridColumn15.Width = 94; + // + // gridColumn16 + // + this.gridColumn16.Caption = "涓嶅悎鏍兼弿杩�"; + this.gridColumn16.FieldName = "fngDesc"; + this.gridColumn16.MinWidth = 25; + this.gridColumn16.Name = "gridColumn16"; + this.gridColumn16.Visible = true; + this.gridColumn16.VisibleIndex = 10; + this.gridColumn16.Width = 94; // // repositoryItemDateEdit1 // @@ -1377,9 +1157,6 @@ this.splitMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit(); @@ -1387,40 +1164,29 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_chooseGoodQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_chooseBadQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_workLine.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_jydNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_dhdDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1455,17 +1221,12 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser; private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate; private DevExpress.XtraGrid.Columns.GridColumn gv_pba005; - private DevExpress.XtraGrid.Columns.GridColumn gv_pba006; - private DevExpress.XtraGrid.Columns.GridColumn gv_pba009; private UserControls.Data.UcPageBar pageBar1; private DevExpress.XtraTab.XtraTabPage xtraTabPage2; private DevExpress.XtraEditors.SplitContainerControl splitMx1; private DevExpress.XtraLayout.LayoutControl layoutMx1; private DevExpress.XtraLayout.LayoutControlGroup Root; private System.Windows.Forms.Label lbGuid; - private DevExpress.XtraEditors.TextEdit txt_createBy; - private DevExpress.XtraEditors.TextEdit txt_createDate; - private DevExpress.XtraEditors.TextEdit txt_remark; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; @@ -1477,15 +1238,12 @@ private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit3; private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002; private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa005; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003; private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010; private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa008; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ; private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime; private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraEditors.TextEdit txt_fType; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; @@ -1495,49 +1253,40 @@ private DevExpress.XtraEditors.TextEdit txt_dhdNo; private DevExpress.XtraEditors.TextEdit txt_gysNo; private DevExpress.XtraEditors.TextEdit txt_gysName; - private DevExpress.XtraEditors.TextEdit txt_fbatchQty; - private DevExpress.XtraEditors.TextEdit txt_chooseQty; private DevExpress.XtraEditors.TextEdit txt_fmrmode; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraEditors.TextEdit txt_guid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; private DevExpress.XtraEditors.TextEdit txt_fBillNo; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; - private DevExpress.XtraEditors.TextEdit txt_chooseGoodQty; - private DevExpress.XtraEditors.TextEdit txt_chooseBadQty; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; private DevExpress.Utils.ToolTipController tips; - private DevExpress.XtraEditors.TextEdit txt_workLine; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; - private DevExpress.XtraEditors.TextEdit txt_jydNo; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraEditors.TextEdit txt_dhdDate; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraEditors.TextEdit txt_handResult; private DevExpress.XtraEditors.TextEdit txt_handSuggestion; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraEditors.MemoEdit txt_fngDesc; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs index c01eed0..a607404 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs @@ -19,7 +19,7 @@ public void Initialize(string param) { // 浣跨敤param杩涜鍒濆鍖栧伐浣� - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1,0); + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); getModel(param); } @@ -46,6 +46,7 @@ getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; } + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); @@ -139,7 +140,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -174,7 +175,6 @@ { ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } - } private void getModel(string strGuid) { @@ -239,27 +239,73 @@ /// <param name="inFieldValue"></param> private void _toolCk(int _inFieldValue) { + //toolBarMenu1.guidKey = ""; + //string rowGuid, rowName; + //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, + // lbGuid, txt_fBillNo, gridView1, "fBillNo"); + //toolBarMenu1.guidKey = rowGuid; + //if (string.IsNullOrEmpty(rowGuid)) + //{ + // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + // return; + //} + //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵")) + // return; + //var frm = new MesQcExceptionalShow(rowGuid); + //frm.UpdateParent += (s, e) => + //{ + // int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + // gridView1.FocusedRowHandle = rowHandle; + // UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString()); + //}; + //frm.ShowDialog(); + string strMsg = ""; + switch (_inFieldValue) + { + case 1: + strMsg = "瀹℃牳"; + break; + case 0: + strMsg = "鍙嶅鏍�"; + break; + }; toolBarMenu1.guidKey = ""; string rowGuid, rowName; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_fBillNo, gridView1, "fBillNo"); - toolBarMenu1.guidKey = rowGuid; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "fBillNo"); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵")) + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) return; - var frm = new MesQcExceptionalShow(rowGuid); - frm.UpdateParent += (s, e) => + var _obj = new { - int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); - gridView1.FocusedRowHandle = rowHandle; - UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString()); + guid = rowGuid, + inFieldValue = _inFieldValue, }; - frm.ShowDialog(); + try + { + var strJson = UtilityHelper.HttpPost("", + _webServiceName + "EditModelSubmit", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) + { + if (xtraTabControl1.SelectedTabPageIndex == 1) + { + getModel(lbGuid.Text.Trim()); + } + int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + gridView1.FocusedRowHandle = rowHandle; + UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } } - } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs index b360c9c..e17c320 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs @@ -38,6 +38,8 @@ 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.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); @@ -71,6 +73,8 @@ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -101,7 +105,6 @@ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -172,8 +175,19 @@ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt030 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt029 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt028 = new DevExpress.XtraEditors.CheckEdit(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt034 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt033 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -212,7 +226,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); @@ -241,6 +254,19 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -376,7 +402,7 @@ this.gv_qtck.OptionsColumn.AllowEdit = false; this.gv_qtck.Tag = "query_a.qtck"; this.gv_qtck.Visible = true; - this.gv_qtck.VisibleIndex = 1; + this.gv_qtck.VisibleIndex = 3; this.gv_qtck.Width = 180; // // gv_qt003 @@ -389,7 +415,7 @@ this.gv_qt003.OptionsColumn.AllowEdit = false; this.gv_qt003.Tag = "query_a.qt003"; this.gv_qt003.Visible = true; - this.gv_qt003.VisibleIndex = 2; + this.gv_qt003.VisibleIndex = 4; this.gv_qt003.Width = 94; // // gv_qt019 @@ -402,7 +428,7 @@ this.gv_qt019.OptionsColumn.AllowEdit = false; this.gv_qt019.Tag = "query_a.qt019"; this.gv_qt019.Visible = true; - this.gv_qt019.VisibleIndex = 3; + this.gv_qt019.VisibleIndex = 5; this.gv_qt019.Width = 94; // // gv_qt005 @@ -415,7 +441,7 @@ this.gv_qt005.OptionsColumn.AllowEdit = false; this.gv_qt005.Tag = "query_a.qt005"; this.gv_qt005.Visible = true; - this.gv_qt005.VisibleIndex = 4; + this.gv_qt005.VisibleIndex = 6; this.gv_qt005.Width = 94; // // gv_qt001 @@ -428,7 +454,7 @@ this.gv_qt001.OptionsColumn.AllowEdit = false; this.gv_qt001.Tag = "query_a.qt001"; this.gv_qt001.Visible = true; - this.gv_qt001.VisibleIndex = 5; + this.gv_qt001.VisibleIndex = 7; this.gv_qt001.Width = 200; // // gv_qt016 @@ -441,7 +467,7 @@ this.gv_qt016.OptionsColumn.AllowEdit = false; this.gv_qt016.Tag = "query_a.qt016"; this.gv_qt016.Visible = true; - this.gv_qt016.VisibleIndex = 6; + this.gv_qt016.VisibleIndex = 8; this.gv_qt016.Width = 94; // // gv_qt002 @@ -454,7 +480,7 @@ this.gv_qt002.OptionsColumn.AllowEdit = false; this.gv_qt002.Tag = "query_a.qt002"; this.gv_qt002.Visible = true; - this.gv_qt002.VisibleIndex = 7; + this.gv_qt002.VisibleIndex = 9; this.gv_qt002.Width = 180; // // gv_qt010 @@ -467,7 +493,7 @@ this.gv_qt010.OptionsColumn.AllowEdit = false; this.gv_qt010.Tag = "query_a.qt010"; this.gv_qt010.Visible = true; - this.gv_qt010.VisibleIndex = 8; + this.gv_qt010.VisibleIndex = 10; this.gv_qt010.Width = 94; // // gridColumn13 @@ -477,7 +503,7 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 9; + this.gridColumn13.VisibleIndex = 11; this.gridColumn13.Width = 94; // // gridColumn14 @@ -487,7 +513,7 @@ this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 10; + this.gridColumn14.VisibleIndex = 12; this.gridColumn14.Width = 94; // // gridColumn21 @@ -497,7 +523,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; - this.gridColumn21.VisibleIndex = 11; + this.gridColumn21.VisibleIndex = 13; this.gridColumn21.Width = 94; // // gridColumn22 @@ -507,7 +533,7 @@ this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; - this.gridColumn22.VisibleIndex = 12; + this.gridColumn22.VisibleIndex = 14; this.gridColumn22.Width = 94; // // gridColumn23 @@ -517,7 +543,7 @@ this.gridColumn23.MinWidth = 25; this.gridColumn23.Name = "gridColumn23"; this.gridColumn23.Visible = true; - this.gridColumn23.VisibleIndex = 13; + this.gridColumn23.VisibleIndex = 15; this.gridColumn23.Width = 94; // // gridColumn24 @@ -527,7 +553,7 @@ this.gridColumn24.MinWidth = 25; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; - this.gridColumn24.VisibleIndex = 14; + this.gridColumn24.VisibleIndex = 16; this.gridColumn24.Width = 94; // // gridColumn25 @@ -537,6 +563,28 @@ this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Width = 94; + // + // gridColumn26 + // + this.gridColumn26.Caption = "璐㈠姟瀹℃牳"; + this.gridColumn26.FieldName = "isCwChk"; + this.gridColumn26.MinWidth = 25; + this.gridColumn26.Name = "gridColumn26"; + this.gridColumn26.Tag = "query_a.qt028"; + this.gridColumn26.Visible = true; + this.gridColumn26.VisibleIndex = 2; + this.gridColumn26.Width = 94; + // + // gridColumn27 + // + this.gridColumn27.Caption = "閲囪喘瀹℃牳"; + this.gridColumn27.FieldName = "isCgChk"; + this.gridColumn27.MinWidth = 25; + this.gridColumn27.Name = "gridColumn27"; + this.gridColumn27.Tag = "query_a.qt032"; + this.gridColumn27.Visible = true; + this.gridColumn27.VisibleIndex = 1; + this.gridColumn27.Width = 94; // // pageBar1 // @@ -575,7 +623,7 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1167, 570); - this.splitMx1.SplitterPosition = 144; + this.splitMx1.SplitterPosition = 192; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -595,6 +643,12 @@ this.layoutMx1.Controls.Add(this.txt_qt015); this.layoutMx1.Controls.Add(this.txt_qt005); this.layoutMx1.Controls.Add(this.txt_qt001); + this.layoutMx1.Controls.Add(this.txt_qt030); + this.layoutMx1.Controls.Add(this.txt_qt029); + this.layoutMx1.Controls.Add(this.txt_qt028); + this.layoutMx1.Controls.Add(this.txt_qt034); + this.layoutMx1.Controls.Add(this.txt_qt033); + this.layoutMx1.Controls.Add(this.txt_qt032); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem12}); @@ -602,15 +656,15 @@ this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(289, 480, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1167, 144); + this.layoutMx1.Size = new System.Drawing.Size(1167, 192); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_qt003 // - this.txt_qt003.Location = new System.Drawing.Point(657, 74); + this.txt_qt003.Location = new System.Drawing.Point(687, 68); this.txt_qt003.Name = "txt_qt003"; - this.txt_qt003.Size = new System.Drawing.Size(211, 24); + this.txt_qt003.Size = new System.Drawing.Size(181, 24); this.txt_qt003.TabIndex = 333; this.txt_qt003.TextTxt = "鍏跺畠鍏ュ簱(QTRKD01_SYS)"; this.txt_qt003.WhereTxt = "s_type=\'鍏跺畠鍏ュ簱鍗曟嵁绫诲瀷\'"; @@ -626,10 +680,10 @@ // // txt_qt010 // - this.txt_qt010.Location = new System.Drawing.Point(657, 105); + this.txt_qt010.Location = new System.Drawing.Point(114, 126); this.txt_qt010.Name = "txt_qt010"; this.txt_qt010.Properties.Appearance.Options.UseFont = true; - this.txt_qt010.Size = new System.Drawing.Size(498, 24); + this.txt_qt010.Size = new System.Drawing.Size(467, 24); this.txt_qt010.StyleController = this.layoutMx1; this.txt_qt010.TabIndex = 240; // @@ -637,27 +691,28 @@ // this.ucLookHuoZhu1.HzId = null; this.ucLookHuoZhu1.IsReadly = false; - this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 74); + this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 68); + this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0); this.ucLookHuoZhu1.Name = "ucLookHuoZhu1"; this.ucLookHuoZhu1.OrgId = null; - this.ucLookHuoZhu1.Size = new System.Drawing.Size(282, 58); + this.ucLookHuoZhu1.Size = new System.Drawing.Size(282, 54); this.ucLookHuoZhu1.TabIndex = 329; // // txt_qt008 // this.txt_qt008.IsReadly = false; - this.txt_qt008.Location = new System.Drawing.Point(370, 105); + this.txt_qt008.Location = new System.Drawing.Point(400, 97); this.txt_qt008.Margin = new System.Windows.Forms.Padding(0); this.txt_qt008.Name = "txt_qt008"; - this.txt_qt008.Size = new System.Drawing.Size(211, 24); + this.txt_qt008.Size = new System.Drawing.Size(181, 24); this.txt_qt008.TabIndex = 301; // // txt_qt016 // - this.txt_qt016.Location = new System.Drawing.Point(944, 12); + this.txt_qt016.Location = new System.Drawing.Point(974, 12); this.txt_qt016.Name = "txt_qt016"; this.txt_qt016.Properties.Appearance.Options.UseFont = true; - this.txt_qt016.Size = new System.Drawing.Size(211, 24); + this.txt_qt016.Size = new System.Drawing.Size(181, 24); this.txt_qt016.StyleController = this.layoutMx1; this.txt_qt016.TabIndex = 267; this.txt_qt016.Tag = "readonly"; @@ -665,44 +720,44 @@ // txt_qt018 // this.txt_qt018.IsReadly = false; - this.txt_qt018.Location = new System.Drawing.Point(370, 74); + this.txt_qt018.Location = new System.Drawing.Point(400, 68); this.txt_qt018.Margin = new System.Windows.Forms.Padding(0); this.txt_qt018.Name = "txt_qt018"; - this.txt_qt018.Size = new System.Drawing.Size(211, 24); + this.txt_qt018.Size = new System.Drawing.Size(181, 24); this.txt_qt018.TabIndex = 302; // // txt_qt022 // this.txt_qt022.IsReadly = false; - this.txt_qt022.Location = new System.Drawing.Point(84, 43); + this.txt_qt022.Location = new System.Drawing.Point(114, 40); this.txt_qt022.Name = "txt_qt022"; - this.txt_qt022.Size = new System.Drawing.Size(210, 24); + this.txt_qt022.Size = new System.Drawing.Size(180, 24); this.txt_qt022.TabIndex = 326; // // txt_qt009 // this.txt_qt009.IsReadly = false; - this.txt_qt009.Location = new System.Drawing.Point(370, 43); + this.txt_qt009.Location = new System.Drawing.Point(400, 40); this.txt_qt009.Name = "txt_qt009"; - this.txt_qt009.Size = new System.Drawing.Size(211, 24); + this.txt_qt009.Size = new System.Drawing.Size(181, 24); this.txt_qt009.TabIndex = 304; // // txt_qtck // - this.txt_qtck.Location = new System.Drawing.Point(84, 12); + this.txt_qtck.Location = new System.Drawing.Point(114, 12); this.txt_qtck.Name = "txt_qtck"; this.txt_qtck.Properties.Appearance.Options.UseFont = true; - this.txt_qtck.Size = new System.Drawing.Size(210, 24); + this.txt_qtck.Size = new System.Drawing.Size(180, 24); this.txt_qtck.StyleController = this.layoutMx1; this.txt_qtck.TabIndex = 213; this.txt_qtck.Tag = "readonly"; // // txt_qt002 // - this.txt_qt002.Location = new System.Drawing.Point(944, 43); + this.txt_qt002.Location = new System.Drawing.Point(974, 40); this.txt_qt002.Name = "txt_qt002"; this.txt_qt002.Properties.Appearance.Options.UseFont = true; - this.txt_qt002.Size = new System.Drawing.Size(211, 24); + this.txt_qt002.Size = new System.Drawing.Size(181, 24); this.txt_qt002.StyleController = this.layoutMx1; this.txt_qt002.TabIndex = 217; this.txt_qt002.Tag = "readonly"; @@ -710,7 +765,7 @@ // txt_qt019 // this.txt_qt019.EditValue = "璇烽�夋嫨"; - this.txt_qt019.Location = new System.Drawing.Point(370, 12); + this.txt_qt019.Location = new System.Drawing.Point(400, 12); this.txt_qt019.Name = "txt_qt019"; this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -719,13 +774,13 @@ "鏅��(GENERAL)", "閫�璐�(RETURN)"}); this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_qt019.Size = new System.Drawing.Size(211, 24); + this.txt_qt019.Size = new System.Drawing.Size(181, 24); this.txt_qt019.StyleController = this.layoutMx1; this.txt_qt019.TabIndex = 299; // // txt_qt015 // - this.txt_qt015.Location = new System.Drawing.Point(872, 74); + this.txt_qt015.Location = new System.Drawing.Point(872, 68); this.txt_qt015.Name = "txt_qt015"; this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��"; this.txt_qt015.Size = new System.Drawing.Size(283, 24); @@ -735,20 +790,20 @@ // // txt_qt005 // - this.txt_qt005.Location = new System.Drawing.Point(657, 12); + this.txt_qt005.Location = new System.Drawing.Point(687, 12); this.txt_qt005.Name = "txt_qt005"; this.txt_qt005.Properties.Appearance.Options.UseFont = true; - this.txt_qt005.Size = new System.Drawing.Size(211, 24); + this.txt_qt005.Size = new System.Drawing.Size(181, 24); this.txt_qt005.StyleController = this.layoutMx1; this.txt_qt005.TabIndex = 331; this.txt_qt005.Tag = "readonly"; // // txt_qt001 // - this.txt_qt001.Location = new System.Drawing.Point(657, 43); + this.txt_qt001.Location = new System.Drawing.Point(687, 40); this.txt_qt001.Name = "txt_qt001"; this.txt_qt001.Properties.Appearance.Options.UseFont = true; - this.txt_qt001.Size = new System.Drawing.Size(211, 24); + this.txt_qt001.Size = new System.Drawing.Size(181, 24); this.txt_qt001.StyleController = this.layoutMx1; this.txt_qt001.TabIndex = 332; this.txt_qt001.Tag = "readonly"; @@ -779,11 +834,17 @@ this.layoutControlItem10, this.layoutControlItem11, this.layoutControlItem6, - this.layoutControlItem13, this.layoutControlItem3, this.layoutControlItem14, this.layoutControlItem15, - this.layoutControlItem2}); + this.layoutControlItem2, + this.layoutControlItem13, + this.layoutControlItem16, + this.layoutControlItem17, + this.layoutControlItem18, + this.layoutControlItem19, + this.layoutControlItem20, + this.layoutControlItem21}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -807,12 +868,18 @@ 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; + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, - rowDefinition4}); - this.Root.Size = new System.Drawing.Size(1167, 144); + rowDefinition4, + rowDefinition5, + rowDefinition6}); + this.Root.Size = new System.Drawing.Size(1167, 192); this.Root.TextVisible = false; // // layoutControlItem1 @@ -820,53 +887,53 @@ this.layoutControlItem1.Control = this.txt_qtck; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(286, 31); + this.layoutControlItem1.Size = new System.Drawing.Size(286, 28); this.layoutControlItem1.Text = "鐢宠鍗曞彿"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_qt022; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 31); + this.layoutControlItem4.Location = new System.Drawing.Point(0, 28); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(286, 31); + this.layoutControlItem4.Size = new System.Drawing.Size(286, 28); this.layoutControlItem4.Text = "搴撳瓨缁勭粐"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_qt009; - this.layoutControlItem5.Location = new System.Drawing.Point(286, 31); + this.layoutControlItem5.Location = new System.Drawing.Point(286, 28); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(287, 31); + this.layoutControlItem5.Size = new System.Drawing.Size(287, 28); this.layoutControlItem5.Text = "閫夋嫨閮ㄩ棬"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_qt018; this.layoutControlItem7.CustomizationFormText = "閫変緵搴斿晢"; - this.layoutControlItem7.Location = new System.Drawing.Point(286, 62); + this.layoutControlItem7.Location = new System.Drawing.Point(286, 56); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(287, 31); + this.layoutControlItem7.Size = new System.Drawing.Size(287, 29); this.layoutControlItem7.Text = "閫変緵搴斿晢"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_qt008; - this.layoutControlItem8.Location = new System.Drawing.Point(286, 93); + this.layoutControlItem8.Location = new System.Drawing.Point(286, 85); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem8.Size = new System.Drawing.Size(287, 31); + this.layoutControlItem8.Size = new System.Drawing.Size(287, 29); this.layoutControlItem8.Text = "鏀舵枡浠撳簱"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem9 // @@ -874,29 +941,29 @@ this.layoutControlItem9.Location = new System.Drawing.Point(860, 0); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem9.Size = new System.Drawing.Size(287, 31); + this.layoutControlItem9.Size = new System.Drawing.Size(287, 28); this.layoutControlItem9.Text = "瀹℃牳浜哄憳"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_qt002; - this.layoutControlItem10.Location = new System.Drawing.Point(860, 31); + this.layoutControlItem10.Location = new System.Drawing.Point(860, 28); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem10.Size = new System.Drawing.Size(287, 31); + this.layoutControlItem10.Size = new System.Drawing.Size(287, 28); this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_qt015; - this.layoutControlItem11.Location = new System.Drawing.Point(860, 62); + this.layoutControlItem11.Location = new System.Drawing.Point(860, 56); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(287, 31); + this.layoutControlItem11.Size = new System.Drawing.Size(287, 29); this.layoutControlItem11.Text = "瀹℃牳鐘舵��"; this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; @@ -905,25 +972,13 @@ // this.layoutControlItem6.Control = this.ucLookHuoZhu1; this.layoutControlItem6.CustomizationFormText = "閫夋嫨璐т富"; - this.layoutControlItem6.Location = new System.Drawing.Point(0, 62); + this.layoutControlItem6.Location = new System.Drawing.Point(0, 56); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem6.OptionsTableLayoutItem.RowSpan = 2; - this.layoutControlItem6.Size = new System.Drawing.Size(286, 62); + this.layoutControlItem6.Size = new System.Drawing.Size(286, 58); this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem6.TextVisible = false; - // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.txt_qt010; - this.layoutControlItem13.Location = new System.Drawing.Point(573, 93); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(574, 31); - this.layoutControlItem13.Text = "鐢宠澶囨敞"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // @@ -931,9 +986,9 @@ this.layoutControlItem3.Location = new System.Drawing.Point(286, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem3.Size = new System.Drawing.Size(287, 31); + this.layoutControlItem3.Size = new System.Drawing.Size(287, 28); this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem14 // @@ -942,31 +997,31 @@ this.layoutControlItem14.Location = new System.Drawing.Point(573, 0); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem14.Size = new System.Drawing.Size(287, 31); + this.layoutControlItem14.Size = new System.Drawing.Size(287, 28); this.layoutControlItem14.Text = "鐢宠浜哄憳"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_qt001; - this.layoutControlItem15.Location = new System.Drawing.Point(573, 31); + this.layoutControlItem15.Location = new System.Drawing.Point(573, 28); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem15.Size = new System.Drawing.Size(287, 31); + this.layoutControlItem15.Size = new System.Drawing.Size(287, 28); this.layoutControlItem15.Text = "鐢宠鏃堕棿"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_qt003; - this.layoutControlItem2.Location = new System.Drawing.Point(573, 62); + this.layoutControlItem2.Location = new System.Drawing.Point(573, 56); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem2.Size = new System.Drawing.Size(287, 31); + this.layoutControlItem2.Size = new System.Drawing.Size(287, 29); this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // // tabMx // @@ -974,7 +1029,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(1167, 414); + this.tabMx.Size = new System.Drawing.Size(1167, 366); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -985,7 +1040,7 @@ this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Controls.Add(this.panelMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1165, 382); + this.tabMxPage1.Size = new System.Drawing.Size(1165, 334); this.tabMxPage1.Text = "鐗╂枡鏄庣粏"; // // gcMx1 @@ -997,7 +1052,7 @@ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, this.repositoryItemSearchLookUpEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1165, 280); + this.gcMx1.Size = new System.Drawing.Size(1165, 232); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1701,23 +1756,138 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // - // gridColumn26 + // layoutControlItem13 // - this.gridColumn26.Caption = "gridColumn26"; - this.gridColumn26.MinWidth = 25; - this.gridColumn26.Name = "gridColumn26"; - this.gridColumn26.Visible = true; - this.gridColumn26.VisibleIndex = 15; - this.gridColumn26.Width = 94; + this.layoutControlItem13.Control = this.txt_qt010; + this.layoutControlItem13.Location = new System.Drawing.Point(0, 114); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem13.Size = new System.Drawing.Size(573, 29); + this.layoutControlItem13.Text = "鐢宠澶囨敞"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); // - // gridColumn27 + // txt_qt030 // - this.gridColumn27.Caption = "gridColumn27"; - this.gridColumn27.MinWidth = 25; - this.gridColumn27.Name = "gridColumn27"; - this.gridColumn27.Visible = true; - this.gridColumn27.VisibleIndex = 16; - this.gridColumn27.Width = 94; + this.txt_qt030.Location = new System.Drawing.Point(974, 97); + this.txt_qt030.Name = "txt_qt030"; + this.txt_qt030.Size = new System.Drawing.Size(181, 24); + this.txt_qt030.StyleController = this.layoutMx1; + this.txt_qt030.TabIndex = 334; + this.txt_qt030.Tag = "readonly"; + // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.txt_qt030; + this.layoutControlItem16.Location = new System.Drawing.Point(860, 85); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem16.Size = new System.Drawing.Size(287, 29); + this.layoutControlItem16.Text = "璐㈠姟瀹℃牳浜哄憳"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); + // + // txt_qt029 + // + this.txt_qt029.Location = new System.Drawing.Point(974, 126); + this.txt_qt029.Name = "txt_qt029"; + this.txt_qt029.Size = new System.Drawing.Size(181, 24); + this.txt_qt029.StyleController = this.layoutMx1; + this.txt_qt029.TabIndex = 335; + this.txt_qt029.Tag = "readonly"; + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.txt_qt029; + this.layoutControlItem17.Location = new System.Drawing.Point(860, 114); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem17.Size = new System.Drawing.Size(287, 29); + this.layoutControlItem17.Text = "璐㈠姟瀹℃牳鏃堕棿"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); + // + // txt_qt028 + // + this.txt_qt028.Location = new System.Drawing.Point(872, 155); + this.txt_qt028.Name = "txt_qt028"; + this.txt_qt028.Properties.Caption = "璐㈠姟瀹℃牳鏍囪瘑"; + this.txt_qt028.Size = new System.Drawing.Size(283, 24); + this.txt_qt028.StyleController = this.layoutMx1; + this.txt_qt028.TabIndex = 336; + this.txt_qt028.Tag = "readonly"; + // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txt_qt028; + this.layoutControlItem18.Location = new System.Drawing.Point(860, 143); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem18.Size = new System.Drawing.Size(287, 29); + this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem18.TextVisible = false; + // + // txt_qt034 + // + this.txt_qt034.Location = new System.Drawing.Point(687, 97); + this.txt_qt034.Name = "txt_qt034"; + this.txt_qt034.Size = new System.Drawing.Size(181, 24); + this.txt_qt034.StyleController = this.layoutMx1; + this.txt_qt034.TabIndex = 337; + this.txt_qt034.Tag = "readonly"; + // + // layoutControlItem19 + // + this.layoutControlItem19.Control = this.txt_qt034; + this.layoutControlItem19.Location = new System.Drawing.Point(573, 85); + this.layoutControlItem19.Name = "layoutControlItem19"; + this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem19.Size = new System.Drawing.Size(287, 29); + this.layoutControlItem19.Text = "閲囪喘瀹℃牳浜哄憳"; + this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); + // + // txt_qt033 + // + this.txt_qt033.Location = new System.Drawing.Point(687, 126); + this.txt_qt033.Name = "txt_qt033"; + this.txt_qt033.Size = new System.Drawing.Size(181, 24); + this.txt_qt033.StyleController = this.layoutMx1; + this.txt_qt033.TabIndex = 338; + this.txt_qt033.Tag = "readonly"; + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.txt_qt033; + this.layoutControlItem20.Location = new System.Drawing.Point(573, 114); + this.layoutControlItem20.Name = "layoutControlItem20"; + this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem20.Size = new System.Drawing.Size(287, 29); + this.layoutControlItem20.Text = "閲囪喘瀹℃牳鏃堕棿"; + this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); + // + // txt_qt032 + // + this.txt_qt032.Location = new System.Drawing.Point(585, 155); + this.txt_qt032.Name = "txt_qt032"; + this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鏍囪瘑"; + this.txt_qt032.Size = new System.Drawing.Size(283, 24); + this.txt_qt032.StyleController = this.layoutMx1; + this.txt_qt032.TabIndex = 339; + this.txt_qt032.Tag = "readonly"; + // + // layoutControlItem21 + // + this.layoutControlItem21.Control = this.txt_qt032; + this.layoutControlItem21.Location = new System.Drawing.Point(573, 143); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem21.Size = new System.Drawing.Size(287, 29); + this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem21.TextVisible = false; // // Frm_MesItemQtrk // @@ -1767,7 +1937,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); @@ -1797,6 +1966,19 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); this.ResumeLayout(false); } @@ -1906,7 +2088,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraEditors.TextEdit txt_qt005; private DevExpress.XtraEditors.TextEdit txt_qt001; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; @@ -1927,5 +2108,18 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; private DevExpress.XtraGrid.Columns.GridColumn gridColumn26; private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; + private DevExpress.XtraEditors.TextEdit txt_qt030; + private DevExpress.XtraEditors.TextEdit txt_qt029; + private DevExpress.XtraEditors.CheckEdit txt_qt028; + private DevExpress.XtraEditors.TextEdit txt_qt034; + private DevExpress.XtraEditors.TextEdit txt_qt033; + private DevExpress.XtraEditors.CheckEdit txt_qt032; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs index a16d1af..73fc510 100644 --- a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs @@ -28,31 +28,37 @@ /// </summary> private void InitializeComponent() { + DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); this.txt_hzabc = new DevExpress.XtraEditors.SearchLookUpEdit(); this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView(); this.txt_hzlxabc = new DevExpress.XtraEditors.ComboBoxEdit(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); - this.panel2 = new System.Windows.Forms.Panel(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.txt_hzabc.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_hzlxabc.Properties)).BeginInit(); - this.panel1.SuspendLayout(); - this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); this.SuspendLayout(); // // txt_hzabc // - this.txt_hzabc.Dock = System.Windows.Forms.DockStyle.Fill; this.txt_hzabc.EditValue = "璇烽�夋嫨璐т富"; - this.txt_hzabc.Location = new System.Drawing.Point(68, 0); + this.txt_hzabc.Location = new System.Drawing.Point(92, 39); this.txt_hzabc.Name = "txt_hzabc"; this.txt_hzabc.Properties.Appearance.Options.UseFont = true; this.txt_hzabc.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_hzabc.Properties.PopupView = this.searchLookUpEdit1View; - this.txt_hzabc.Size = new System.Drawing.Size(209, 24); + this.txt_hzabc.Size = new System.Drawing.Size(310, 24); + this.txt_hzabc.StyleController = this.layoutControl1; this.txt_hzabc.TabIndex = 312; // // searchLookUpEdit1View @@ -65,9 +71,8 @@ // // txt_hzlxabc // - this.txt_hzlxabc.Dock = System.Windows.Forms.DockStyle.Fill; this.txt_hzlxabc.EditValue = "璇烽�夋嫨璐т富绫诲瀷"; - this.txt_hzlxabc.Location = new System.Drawing.Point(68, 0); + this.txt_hzlxabc.Location = new System.Drawing.Point(92, 0); this.txt_hzlxabc.Name = "txt_hzlxabc"; this.txt_hzlxabc.Properties.Appearance.Options.UseFont = true; this.txt_hzlxabc.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { @@ -78,67 +83,86 @@ "渚涘簲鍟�(BD_Supplier)", "瀹㈡埛(BD_Customer)"}); this.txt_hzlxabc.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_hzlxabc.Size = new System.Drawing.Size(209, 24); + this.txt_hzlxabc.Size = new System.Drawing.Size(310, 24); + this.txt_hzlxabc.StyleController = this.layoutControl1; this.txt_hzlxabc.TabIndex = 313; // - // label1 + // layoutControl1 // - this.label1.AutoSize = true; - this.label1.Dock = System.Windows.Forms.DockStyle.Left; - this.label1.Location = new System.Drawing.Point(0, 0); - this.label1.Name = "label1"; - this.label1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.label1.Size = new System.Drawing.Size(68, 18); - this.label1.TabIndex = 314; - this.label1.Text = "璐т富绫诲瀷"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.layoutControl1.Controls.Add(this.txt_hzlxabc); + this.layoutControl1.Controls.Add(this.txt_hzabc); + this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutControl1.Location = new System.Drawing.Point(0, 0); + this.layoutControl1.Margin = new System.Windows.Forms.Padding(0); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(577, 454, 812, 500); + this.layoutControl1.Root = this.Root; + this.layoutControl1.Size = new System.Drawing.Size(402, 78); + this.layoutControl1.TabIndex = 318; + this.layoutControl1.Text = "layoutControl1"; // - // label2 + // Root // - this.label2.AutoSize = true; - this.label2.Dock = System.Windows.Forms.DockStyle.Left; - this.label2.Location = new System.Drawing.Point(0, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(68, 18); - this.label2.TabIndex = 0; - this.label2.Text = "閫夋嫨璐т富"; + this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.Root.GroupBordersVisible = false; + this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem1, + this.layoutControlItem2}); + this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.Root.Name = "Root"; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; + this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition1}); + 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[] { + rowDefinition1, + rowDefinition2}); + this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + this.Root.Size = new System.Drawing.Size(402, 78); + this.Root.TextVisible = false; // - // panel1 + // layoutControlItem1 // - this.panel1.Controls.Add(this.txt_hzlxabc); - this.panel1.Controls.Add(this.label1); - this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(277, 33); - this.panel1.TabIndex = 316; + this.layoutControlItem1.Control = this.txt_hzabc; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 39); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + this.layoutControlItem1.Size = new System.Drawing.Size(402, 39); + this.layoutControlItem1.Text = "閫夋嫨璐т富 "; + this.layoutControlItem1.TextSize = new System.Drawing.Size(80, 18); // - // panel2 + // layoutControlItem2 // - this.panel2.Controls.Add(this.txt_hzabc); - this.panel2.Controls.Add(this.label2); - this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 33); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(277, 30); - this.panel2.TabIndex = 317; + this.layoutControlItem2.Control = this.txt_hzlxabc; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + this.layoutControlItem2.Size = new System.Drawing.Size(402, 39); + this.layoutControlItem2.Text = "璐т富绫诲瀷 "; + this.layoutControlItem2.TextSize = new System.Drawing.Size(80, 18); // // UcLookHuoZhu // this.Appearance.Options.UseFont = true; this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.panel2); - this.Controls.Add(this.panel1); + this.Controls.Add(this.layoutControl1); + this.Margin = new System.Windows.Forms.Padding(0); this.Name = "UcLookHuoZhu"; - this.Size = new System.Drawing.Size(277, 63); + this.Size = new System.Drawing.Size(402, 78); ((System.ComponentModel.ISupportInitialize)(this.txt_hzabc.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_hzlxabc.Properties)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); this.ResumeLayout(false); } @@ -148,9 +172,9 @@ private DevExpress.XtraEditors.SearchLookUpEdit txt_hzabc; private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View; private DevExpress.XtraEditors.ComboBoxEdit txt_hzlxabc; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Panel panel2; + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup Root; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; } } diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs index dc4b90d..a872307 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs @@ -574,7 +574,7 @@ // this.barDockControlBottom.CausesValidation = false; this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.barDockControlBottom.Location = new System.Drawing.Point(0, 69); + this.barDockControlBottom.Location = new System.Drawing.Point(0, 276); this.barDockControlBottom.Manager = this.barManager1; this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0); // @@ -584,7 +584,7 @@ this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left; this.barDockControlLeft.Location = new System.Drawing.Point(0, 142); this.barDockControlLeft.Manager = this.barManager1; - this.barDockControlLeft.Size = new System.Drawing.Size(0, 0); + this.barDockControlLeft.Size = new System.Drawing.Size(0, 134); // // barDockControlRight // @@ -592,7 +592,7 @@ this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; this.barDockControlRight.Location = new System.Drawing.Point(1543, 142); this.barDockControlRight.Manager = this.barManager1; - this.barDockControlRight.Size = new System.Drawing.Size(0, 0); + this.barDockControlRight.Size = new System.Drawing.Size(0, 134); // // UcToolBarMenu // @@ -603,7 +603,7 @@ this.Controls.Add(this.barDockControlBottom); this.Controls.Add(this.barDockControlTop); this.Name = "UcToolBarMenu"; - this.Size = new System.Drawing.Size(1543, 69); + this.Size = new System.Drawing.Size(1543, 276); ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index 87a4934..ad85a95 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -62,6 +62,7 @@ btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick; btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick; btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick; + btnOa.ItemClick += BtnOa_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) if (item is BarLargeButtonItem largeButtonItem) @@ -69,7 +70,8 @@ lst.Add(item.Caption); actions = lst; } - + + /// <summary> /// 鍒濆鍖栨寜閽姸鎬� /// </summary> @@ -458,6 +460,10 @@ if (btnQueryClick != null) btnQueryClick(this, e); } + private void BtnOa_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnOaClick != null) btnOaClick(this, e); + } private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e) { if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?")) @@ -1030,7 +1036,11 @@ /// 鐢熸垚棣栨 /// </summary> public event EventHandler btnShouJianClick; - //public event EventHandler btnLayoutClick; + + /// <summary> + /// 鍙戦�丱A + /// </summary> + public event EventHandler btnOaClick; #endregion -- Gitblit v1.9.3