From 714cba76f99b7a6959b8420cd5a6c54396e0d111 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期三, 18 六月 2025 15:24:11 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 174 ++++++++-- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 25 + DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 725 +++++++++++++++++++++++--------------------- DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs | 5 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 1 5 files changed, 543 insertions(+), 387 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs index 9f88c87..e85a287 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs @@ -40,6 +40,7 @@ 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.XtraLayout.RowDefinition rowDefinition7 = 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(); @@ -86,6 +87,15 @@ this.txt_qt016 = new DevExpress.XtraEditors.TextEdit(); this.txt_qt002 = new DevExpress.XtraEditors.TextEdit(); this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit(); + this.txt_qt031 = new DevExpress.XtraEditors.TextEdit(); + this.txt_qt030 = new DevExpress.XtraEditors.TextEdit(); + this.txt_qt029 = new DevExpress.XtraEditors.CheckEdit(); + this.txt_qt028 = new DevExpress.XtraEditors.TextEdit(); + this.txt_qt027 = new DevExpress.XtraEditors.TextEdit(); + this.txt_qt034 = new DevExpress.XtraEditors.TextEdit(); + this.txt_qt026 = new DevExpress.XtraEditors.CheckEdit(); + this.txt_qt033 = new DevExpress.XtraEditors.TextEdit(); + this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -95,6 +105,21 @@ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + 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.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -122,30 +147,8 @@ 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(); + this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit(); + this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -172,6 +175,15 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt027.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt026.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); @@ -181,6 +193,21 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).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.layoutControlItem22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -190,30 +217,8 @@ ((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(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -560,7 +565,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 = 195; + this.splitMx1.SplitterPosition = 247; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -588,6 +593,7 @@ this.layoutMx1.Controls.Add(this.txt_qt026); this.layoutMx1.Controls.Add(this.txt_qt033); this.layoutMx1.Controls.Add(this.txt_qt032); + this.layoutMx1.Controls.Add(this.txt_qt035); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem14}); @@ -595,7 +601,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, 195); + this.layoutMx1.Size = new System.Drawing.Size(1126, 247); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -611,7 +617,7 @@ // txt_qt008 // this.txt_qt008.IsReadly = false; - this.txt_qt008.Location = new System.Drawing.Point(390, 99); + this.txt_qt008.Location = new System.Drawing.Point(390, 108); this.txt_qt008.Margin = new System.Windows.Forms.Padding(0); this.txt_qt008.Name = "txt_qt008"; this.txt_qt008.Size = new System.Drawing.Size(170, 24); @@ -621,15 +627,16 @@ // this.ucLookHuoZhu1.HzId = null; this.ucLookHuoZhu1.IsReadly = false; - this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 70); + this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 76); + this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0); this.ucLookHuoZhu1.Name = "ucLookHuoZhu1"; this.ucLookHuoZhu1.OrgId = null; - this.ucLookHuoZhu1.Size = new System.Drawing.Size(272, 54); + this.ucLookHuoZhu1.Size = new System.Drawing.Size(272, 60); this.ucLookHuoZhu1.TabIndex = 318; // // txt_qt010 // - this.txt_qt010.Location = new System.Drawing.Point(114, 157); + this.txt_qt010.Location = new System.Drawing.Point(114, 172); this.txt_qt010.Name = "txt_qt010"; this.txt_qt010.Properties.Appearance.Options.UseFont = true; this.txt_qt010.Size = new System.Drawing.Size(446, 24); @@ -639,7 +646,7 @@ // txt_qt009 // this.txt_qt009.IsReadly = false; - this.txt_qt009.Location = new System.Drawing.Point(390, 128); + this.txt_qt009.Location = new System.Drawing.Point(390, 140); this.txt_qt009.Name = "txt_qt009"; this.txt_qt009.Size = new System.Drawing.Size(170, 24); this.txt_qt009.TabIndex = 316; @@ -647,7 +654,7 @@ // txt_qt013 // this.txt_qt013.IsReadly = false; - this.txt_qt013.Location = new System.Drawing.Point(390, 41); + this.txt_qt013.Location = new System.Drawing.Point(390, 44); this.txt_qt013.Name = "txt_qt013"; this.txt_qt013.Size = new System.Drawing.Size(170, 24); this.txt_qt013.TabIndex = 304; @@ -684,7 +691,7 @@ // txt_qt024 // this.txt_qt024.IsReadly = false; - this.txt_qt024.Location = new System.Drawing.Point(114, 128); + this.txt_qt024.Location = new System.Drawing.Point(114, 140); this.txt_qt024.Name = "txt_qt024"; this.txt_qt024.Size = new System.Drawing.Size(170, 24); this.txt_qt024.TabIndex = 309; @@ -692,7 +699,7 @@ // txt_qt020 // this.txt_qt020.EditValue = "璇烽�夋嫨"; - this.txt_qt020.Location = new System.Drawing.Point(390, 70); + this.txt_qt020.Location = new System.Drawing.Point(390, 76); 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)}); @@ -708,7 +715,7 @@ // txt_qt023 // this.txt_qt023.IsReadly = false; - this.txt_qt023.Location = new System.Drawing.Point(114, 41); + this.txt_qt023.Location = new System.Drawing.Point(114, 44); this.txt_qt023.Name = "txt_qt023"; this.txt_qt023.Size = new System.Drawing.Size(170, 24); this.txt_qt023.TabIndex = 307; @@ -725,7 +732,7 @@ // // txt_qt002 // - this.txt_qt002.Location = new System.Drawing.Point(942, 41); + this.txt_qt002.Location = new System.Drawing.Point(942, 44); this.txt_qt002.Name = "txt_qt002"; this.txt_qt002.Properties.Appearance.Options.UseFont = true; this.txt_qt002.Size = new System.Drawing.Size(172, 24); @@ -735,13 +742,97 @@ // // txt_qt015 // - this.txt_qt015.Location = new System.Drawing.Point(840, 70); + this.txt_qt015.Location = new System.Drawing.Point(840, 76); this.txt_qt015.Name = "txt_qt015"; this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��"; this.txt_qt015.Size = new System.Drawing.Size(274, 24); this.txt_qt015.StyleController = this.layoutMx1; this.txt_qt015.TabIndex = 310; this.txt_qt015.Tag = "readonly"; + // + // txt_qt031 + // + this.txt_qt031.Location = new System.Drawing.Point(942, 108); + 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"; + // + // txt_qt030 + // + this.txt_qt030.Location = new System.Drawing.Point(942, 140); + 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"; + // + // txt_qt029 + // + this.txt_qt029.Location = new System.Drawing.Point(840, 172); + 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"; + // + // txt_qt028 + // + this.txt_qt028.Location = new System.Drawing.Point(666, 108); + 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"; + // + // txt_qt027 + // + this.txt_qt027.Location = new System.Drawing.Point(666, 140); + 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"; + // + // 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, 172); + 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"; + // + // txt_qt033 + // + this.txt_qt033.Location = new System.Drawing.Point(666, 44); + 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"; + // + // txt_qt032 + // + this.txt_qt032.Location = new System.Drawing.Point(564, 76); + 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"; // // layoutControlItem14 // @@ -781,7 +872,8 @@ this.layoutControlItem12, this.layoutControlItem11, this.layoutControlItem22, - this.layoutControlItem23}); + this.layoutControlItem23, + this.layoutControlItem24}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -809,14 +901,17 @@ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition6.Height = 100D; rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition7.Height = 100D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4, rowDefinition5, - rowDefinition6}); - this.Root.Size = new System.Drawing.Size(1126, 195); + rowDefinition6, + rowDefinition7}); + this.Root.Size = new System.Drawing.Size(1126, 247); this.Root.TextVisible = false; // // layoutControlItem1 @@ -824,7 +919,7 @@ 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(276, 29); + this.layoutControlItem1.Size = new System.Drawing.Size(276, 32); this.layoutControlItem1.Text = "鍗曟嵁缂栧彿"; this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // @@ -834,17 +929,17 @@ this.layoutControlItem2.Location = new System.Drawing.Point(276, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem2.Size = new System.Drawing.Size(276, 32); this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷"; this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_qt023; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 29); + this.layoutControlItem4.Location = new System.Drawing.Point(0, 32); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 29); + this.layoutControlItem4.Size = new System.Drawing.Size(276, 32); this.layoutControlItem4.Text = "搴撳瓨缁勭粐"; this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // @@ -854,29 +949,29 @@ this.layoutControlItem6.Location = new System.Drawing.Point(828, 0); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem6.Size = new System.Drawing.Size(278, 29); + this.layoutControlItem6.Size = new System.Drawing.Size(278, 32); this.layoutControlItem6.Text = "瀹℃牳浜哄憳"; this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_qt002; - this.layoutControlItem7.Location = new System.Drawing.Point(828, 29); + this.layoutControlItem7.Location = new System.Drawing.Point(828, 32); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(278, 29); + this.layoutControlItem7.Size = new System.Drawing.Size(278, 32); this.layoutControlItem7.Text = "瀹℃牳鏃堕棿"; this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_qt015; - this.layoutControlItem8.Location = new System.Drawing.Point(828, 58); + this.layoutControlItem8.Location = new System.Drawing.Point(828, 64); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(278, 29); + this.layoutControlItem8.Size = new System.Drawing.Size(278, 32); this.layoutControlItem8.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem8.TextVisible = false; @@ -884,14 +979,177 @@ // layoutControlItem9 // this.layoutControlItem9.Control = this.ucLookHuoZhu1; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 58); + this.layoutControlItem9.Location = new System.Drawing.Point(0, 64); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(276, 58); + this.layoutControlItem9.Size = new System.Drawing.Size(276, 64); this.layoutControlItem9.Text = "璐т富绫诲瀷"; this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem9.TextVisible = false; + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_qt031; + this.layoutControlItem15.Location = new System.Drawing.Point(828, 96); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem15.Size = new System.Drawing.Size(278, 32); + this.layoutControlItem15.Text = "璐㈠姟瀹℃牳浜哄憳"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.txt_qt030; + this.layoutControlItem16.Location = new System.Drawing.Point(828, 128); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem16.Size = new System.Drawing.Size(278, 32); + this.layoutControlItem16.Text = "璐㈠姟瀹℃牳鏃堕棿"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.txt_qt029; + this.layoutControlItem17.Location = new System.Drawing.Point(828, 160); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem17.Size = new System.Drawing.Size(278, 32); + this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem17.TextVisible = false; + // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txt_qt028; + this.layoutControlItem18.Location = new System.Drawing.Point(552, 96); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem18.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem18.Text = "鍞悗瀹℃牳浜哄憳"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem19 + // + this.layoutControlItem19.Control = this.txt_qt027; + this.layoutControlItem19.Location = new System.Drawing.Point(552, 128); + this.layoutControlItem19.Name = "layoutControlItem19"; + this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem19.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem19.Text = "鍞悗瀹℃牳鏃堕棿"; + this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem21 + // + this.layoutControlItem21.Control = this.txt_qt026; + this.layoutControlItem21.Location = new System.Drawing.Point(552, 160); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem21.Size = new System.Drawing.Size(276, 32); + 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, 160); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem13.Size = new System.Drawing.Size(552, 32); + 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, 32); + 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, 128); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem5.Size = new System.Drawing.Size(276, 32); + 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, 32); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem10.Size = new System.Drawing.Size(276, 32); + 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, 64); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem3.Size = new System.Drawing.Size(276, 32); + 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, 96); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem12.Size = new System.Drawing.Size(276, 32); + 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, 128); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem11.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem22 + // + this.layoutControlItem22.Control = this.txt_qt033; + this.layoutControlItem22.Location = new System.Drawing.Point(552, 32); + this.layoutControlItem22.Name = "layoutControlItem22"; + this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem22.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem22.Text = "閲囪喘瀹℃牳鏃堕棿"; + this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem23 + // + this.layoutControlItem23.Control = this.txt_qt032; + this.layoutControlItem23.Location = new System.Drawing.Point(552, 64); + this.layoutControlItem23.Name = "layoutControlItem23"; + this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem23.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem23.TextVisible = false; // // tabMx // @@ -899,7 +1157,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, 363); + this.tabMx.Size = new System.Drawing.Size(1126, 311); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -908,7 +1166,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 331); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 279); this.tabMxPage1.Text = "鐢宠鏄庣粏"; // // gcMx1 @@ -920,7 +1178,7 @@ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, this.repositoryItemSearchLookUpEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 331); + this.gcMx1.Size = new System.Drawing.Size(1124, 279); this.gcMx1.TabIndex = 1; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1198,252 +1456,25 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // - // txt_qt031 + // txt_qt035 // - 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"; + this.txt_qt035.Location = new System.Drawing.Point(114, 204); + this.txt_qt035.Name = "txt_qt035"; + this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txt_qt035.Size = new System.Drawing.Size(170, 24); + this.txt_qt035.StyleController = this.layoutMx1; + this.txt_qt035.TabIndex = 330; // - // layoutControlItem15 + // layoutControlItem24 // - 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; + this.layoutControlItem24.Control = this.txt_qt035; + this.layoutControlItem24.Location = new System.Drawing.Point(0, 192); + this.layoutControlItem24.Name = "layoutControlItem24"; + this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem24.Size = new System.Drawing.Size(276, 35); + this.layoutControlItem24.Text = "鏉ユ簮鍗曞彿"; + this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); // // Frm_MesItemQt // @@ -1481,6 +1512,15 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt027.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt026.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); @@ -1490,6 +1530,21 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).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.layoutControlItem22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1499,30 +1554,8 @@ ((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(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); this.ResumeLayout(false); } @@ -1628,5 +1661,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; + private DevExpress.XtraEditors.ButtonEdit txt_qt035; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs index 63938b9..76229d8 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs @@ -339,6 +339,7 @@ inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬 inKcfx = inKcfx,//搴撳瓨鏂瑰悜 inFlck = inFlck,//鍙戞枡浠撳簱 + inSource = txt_qt035.EditValue,//宸ュ崟鍙� list = new List<dynamic>(), }; gvMx1.CloseEditor(); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs index 729a205..2eb8c05 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs @@ -195,12 +195,15 @@ tlMenu.ParentFieldName = "pid"; tlMenu.EndUpdate(); //this.tlMenu.CollapseAll(); - this.tlMenu.ExpandAll(); + // this.tlMenu.ExpandAll(); + this.tlMenu.ExpandToLevel(0); } catch (Exception ex) { MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } + + } } diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs index ac8f7de..2ca888c 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs @@ -60,6 +60,11 @@ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -187,6 +192,10 @@ this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptBl = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); @@ -208,6 +217,8 @@ this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit(); + this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -306,11 +317,15 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptBl)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).BeginInit(); this.xtraTabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -693,6 +708,7 @@ this.layoutMx1.Controls.Add(this.txt_qt034); this.layoutMx1.Controls.Add(this.txt_qt033); this.layoutMx1.Controls.Add(this.txt_qt032); + this.layoutMx1.Controls.Add(this.txt_qt035); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem12}); @@ -944,7 +960,8 @@ this.layoutControlItem10, this.layoutControlItem9, this.layoutControlItem11, - this.layoutControlItem21}); + this.layoutControlItem21, + this.layoutControlItem35}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1237,7 +1254,7 @@ this.split99.Panel2.Text = "Panel2"; this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split99.Size = new System.Drawing.Size(1330, 334); - this.split99.SplitterPosition = 102; + this.split99.SplitterPosition = 125; this.split99.TabIndex = 3; // // layout99 @@ -1260,7 +1277,7 @@ this.layout99.Name = "layout99"; this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(104, 578, 812, 452); this.layout99.Root = this.layoutControlGroup1; - this.layout99.Size = new System.Drawing.Size(1330, 102); + this.layout99.Size = new System.Drawing.Size(1330, 125); this.layout99.TabIndex = 0; this.layout99.Text = "layoutControl1"; // @@ -1268,12 +1285,12 @@ // this.layoutControl1.Controls.Add(this.txt_iCount_1); this.layoutControl1.Controls.Add(this.txt_yuliang_1); - this.layoutControl1.Location = new System.Drawing.Point(682, 72); + this.layoutControl1.Location = new System.Drawing.Point(682, 68); this.layoutControl1.Margin = new System.Windows.Forms.Padding(0); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 222, 812, 500); this.layoutControl1.Root = this.layoutControlGroup2; - this.layoutControl1.Size = new System.Drawing.Size(336, 31); + this.layoutControl1.Size = new System.Drawing.Size(336, 29); this.layoutControl1.TabIndex = 476; this.layoutControl1.Text = "layoutControl1"; // @@ -1317,7 +1334,7 @@ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition7}); this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup2.Size = new System.Drawing.Size(336, 31); + this.layoutControlGroup2.Size = new System.Drawing.Size(336, 29); this.layoutControlGroup2.TextVisible = false; // // layoutControlItem33 @@ -1325,7 +1342,7 @@ this.layoutControlItem33.Control = this.txt_iCount_1; this.layoutControlItem33.Location = new System.Drawing.Point(0, 0); this.layoutControlItem33.Name = "layoutControlItem33"; - this.layoutControlItem33.Size = new System.Drawing.Size(168, 31); + this.layoutControlItem33.Size = new System.Drawing.Size(168, 29); this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��"; this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18); // @@ -1335,7 +1352,7 @@ this.layoutControlItem34.Location = new System.Drawing.Point(168, 0); this.layoutControlItem34.Name = "layoutControlItem34"; this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem34.Size = new System.Drawing.Size(168, 31); + this.layoutControlItem34.Size = new System.Drawing.Size(168, 29); this.layoutControlItem34.Text = "鎵撳嵃浣欐暟"; this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18); // @@ -1351,12 +1368,13 @@ // // ucBtnPrint1 // + this.ucBtnPrint1.allClickKey = null; this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(1019, 41); + this.ucBtnPrint1.Location = new System.Drawing.Point(1019, 39); this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = null; - this.ucBtnPrint1.Size = new System.Drawing.Size(334, 31); + this.ucBtnPrint1.Size = new System.Drawing.Size(334, 29); this.ucBtnPrint1.TabIndex = 230; // // radOut @@ -1385,7 +1403,7 @@ // // txt_psnQty_1 // - this.txt_psnQty_1.Location = new System.Drawing.Point(786, 43); + this.txt_psnQty_1.Location = new System.Drawing.Point(786, 41); this.txt_psnQty_1.Name = "txt_psnQty_1"; this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24); @@ -1394,7 +1412,7 @@ // // txtWlmc // - this.txtWlmc.Location = new System.Drawing.Point(114, 43); + this.txtWlmc.Location = new System.Drawing.Point(114, 41); this.txtWlmc.Name = "txtWlmc"; this.txtWlmc.Properties.Appearance.Options.UseFont = true; this.txtWlmc.Properties.ReadOnly = true; @@ -1404,7 +1422,7 @@ // // txtWlgg // - this.txtWlgg.Location = new System.Drawing.Point(114, 74); + this.txtWlgg.Location = new System.Drawing.Point(114, 70); this.txtWlgg.Name = "txtWlgg"; this.txtWlgg.Properties.Appearance.Options.UseFont = true; this.txtWlgg.Properties.ReadOnly = true; @@ -1436,7 +1454,7 @@ // // txt_yQty // - this.txt_yQty.Location = new System.Drawing.Point(450, 43); + this.txt_yQty.Location = new System.Drawing.Point(450, 41); this.txt_yQty.Name = "txt_yQty"; this.txt_yQty.Properties.Appearance.Options.UseFont = true; this.txt_yQty.Properties.ReadOnly = true; @@ -1496,7 +1514,7 @@ rowDefinition8, rowDefinition9, rowDefinition10}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1364, 113); + this.layoutControlGroup1.Size = new System.Drawing.Size(1364, 107); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem22 @@ -1504,28 +1522,28 @@ this.layoutControlItem22.Control = this.txtWlid; this.layoutControlItem22.Location = new System.Drawing.Point(0, 0); this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.Size = new System.Drawing.Size(336, 31); + this.layoutControlItem22.Size = new System.Drawing.Size(336, 29); this.layoutControlItem22.Text = "鐗╂枡缂栫爜"; this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem23 // this.layoutControlItem23.Control = this.txtWlmc; - this.layoutControlItem23.Location = new System.Drawing.Point(0, 31); + this.layoutControlItem23.Location = new System.Drawing.Point(0, 29); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem23.Size = new System.Drawing.Size(336, 31); + this.layoutControlItem23.Size = new System.Drawing.Size(336, 29); this.layoutControlItem23.Text = "鐗╂枡鍚嶇О"; this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem24 // this.layoutControlItem24.Control = this.txtWlgg; - this.layoutControlItem24.Location = new System.Drawing.Point(0, 62); + this.layoutControlItem24.Location = new System.Drawing.Point(0, 58); this.layoutControlItem24.Name = "layoutControlItem24"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem24.Size = new System.Drawing.Size(672, 31); + this.layoutControlItem24.Size = new System.Drawing.Size(672, 29); this.layoutControlItem24.Text = "鐗╂枡瑙勬牸"; this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); // @@ -1535,18 +1553,18 @@ this.layoutControlItem25.Location = new System.Drawing.Point(336, 0); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem25.Size = new System.Drawing.Size(336, 31); + this.layoutControlItem25.Size = new System.Drawing.Size(336, 29); this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺"; this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_yQty; - this.layoutControlItem26.Location = new System.Drawing.Point(336, 31); + this.layoutControlItem26.Location = new System.Drawing.Point(336, 29); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem26.Size = new System.Drawing.Size(336, 31); + this.layoutControlItem26.Size = new System.Drawing.Size(336, 29); this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺"; this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); // @@ -1556,18 +1574,18 @@ this.layoutControlItem27.Location = new System.Drawing.Point(672, 0); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem27.Size = new System.Drawing.Size(336, 31); + this.layoutControlItem27.Size = new System.Drawing.Size(336, 29); this.layoutControlItem27.Text = "鍙墦鍗版�绘暟"; this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem28 // this.layoutControlItem28.Control = this.txt_psnQty_1; - this.layoutControlItem28.Location = new System.Drawing.Point(672, 31); + this.layoutControlItem28.Location = new System.Drawing.Point(672, 29); this.layoutControlItem28.Name = "layoutControlItem28"; this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem28.Size = new System.Drawing.Size(336, 31); + this.layoutControlItem28.Size = new System.Drawing.Size(336, 29); this.layoutControlItem28.Text = "姣忓紶鏉$爜鏁伴噺"; this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); // @@ -1580,7 +1598,7 @@ this.layoutControlItem29.Name = "layoutControlItem29"; this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem29.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); - this.layoutControlItem29.Size = new System.Drawing.Size(336, 31); + this.layoutControlItem29.Size = new System.Drawing.Size(336, 29); this.layoutControlItem29.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem29.Text = "鑷姩璁$畻"; this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0); @@ -1589,12 +1607,12 @@ // layoutControlItem30 // this.layoutControlItem30.Control = this.ucBtnPrint1; - this.layoutControlItem30.Location = new System.Drawing.Point(1008, 31); + this.layoutControlItem30.Location = new System.Drawing.Point(1008, 29); this.layoutControlItem30.Name = "layoutControlItem30"; this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); - this.layoutControlItem30.Size = new System.Drawing.Size(336, 31); + this.layoutControlItem30.Size = new System.Drawing.Size(336, 29); this.layoutControlItem30.Text = "鎵撳嵃鎸夐挳"; this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem30.TextVisible = false; @@ -1602,12 +1620,12 @@ // layoutControlItem32 // this.layoutControlItem32.Control = this.layoutControl1; - this.layoutControlItem32.Location = new System.Drawing.Point(672, 62); + this.layoutControlItem32.Location = new System.Drawing.Point(672, 58); this.layoutControlItem32.Name = "layoutControlItem32"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem32.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlItem32.Size = new System.Drawing.Size(336, 31); + this.layoutControlItem32.Size = new System.Drawing.Size(336, 29); this.layoutControlItem32.Text = "鎵撳嵃寮犳暟"; this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem32.TextVisible = false; @@ -1620,8 +1638,10 @@ this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, - this.repositoryItemSearchLookUpEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1330, 220); + this.repositoryItemSearchLookUpEdit1, + this.rptBl, + this.repositoryItemMemoEdit1}); + this.gcMx1.Size = new System.Drawing.Size(1330, 197); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1642,6 +1662,8 @@ this.gvMx1qd008, this.gvMx1qd009, this.gvMxDel, + this.gridColumn29, + this.gridColumn28, this.gridColumn12}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; @@ -1845,7 +1867,7 @@ this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 6; + this.gridColumn15.VisibleIndex = 8; this.gridColumn15.Width = 94; // // gridColumn16 @@ -1855,7 +1877,7 @@ this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 7; + this.gridColumn16.VisibleIndex = 9; this.gridColumn16.Width = 94; // // gvMx1qd008 @@ -1869,7 +1891,7 @@ this.gvMx1qd008.OptionsColumn.ReadOnly = true; this.gvMx1qd008.Tag = "query_a.qd008"; this.gvMx1qd008.Visible = true; - this.gvMx1qd008.VisibleIndex = 8; + this.gvMx1qd008.VisibleIndex = 10; this.gvMx1qd008.Width = 94; // // gvMx1qd009 @@ -1883,7 +1905,7 @@ this.gvMx1qd009.OptionsColumn.ReadOnly = true; this.gvMx1qd009.Tag = "query_a.qd009"; this.gvMx1qd009.Visible = true; - this.gvMx1qd009.VisibleIndex = 9; + this.gvMx1qd009.VisibleIndex = 11; this.gvMx1qd009.Width = 94; // // gvMxDel @@ -1893,7 +1915,7 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 10; + this.gvMxDel.VisibleIndex = 12; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 @@ -1906,6 +1928,46 @@ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); + // + // gridColumn29 + // + this.gridColumn29.Caption = "閫夋嫨"; + this.gridColumn29.ColumnEdit = this.rptBl; + this.gridColumn29.MinWidth = 25; + this.gridColumn29.Name = "gridColumn29"; + this.gridColumn29.Visible = true; + this.gridColumn29.VisibleIndex = 6; + this.gridColumn29.Width = 94; + // + // rptBl + // + this.rptBl.AutoHeight = false; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; + this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.rptBl.Name = "rptBl"; + this.rptBl.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick); + // + // gridColumn28 + // + this.gridColumn28.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn28.AppearanceCell.Options.UseForeColor = true; + this.gridColumn28.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn28.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn28.Caption = "涓嶈壇绫诲埆"; + this.gridColumn28.ColumnEdit = this.repositoryItemMemoEdit1; + this.gridColumn28.FieldName = "qd012"; + this.gridColumn28.MinWidth = 25; + this.gridColumn28.Name = "gridColumn28"; + this.gridColumn28.Tag = "edit"; + this.gridColumn28.Visible = true; + this.gridColumn28.VisibleIndex = 7; + this.gridColumn28.Width = 94; + // + // repositoryItemMemoEdit1 + // + this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1"; // // gridColumn12 // @@ -2110,10 +2172,10 @@ // rptChongDa // this.rptChongDa.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16; - editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16; + editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.rptChongDa.Name = "rptChongDa"; this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); @@ -2128,6 +2190,26 @@ this.picCheckBox.TabIndex = 5; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; + // + // txt_qt035 + // + this.txt_qt035.Location = new System.Drawing.Point(114, 155); + this.txt_qt035.Name = "txt_qt035"; + this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txt_qt035.Size = new System.Drawing.Size(222, 24); + this.txt_qt035.StyleController = this.layoutMx1; + this.txt_qt035.TabIndex = 340; + // + // layoutControlItem35 + // + this.layoutControlItem35.Control = this.txt_qt035; + this.layoutControlItem35.Location = new System.Drawing.Point(0, 143); + this.layoutControlItem35.Name = "layoutControlItem35"; + this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem35.Size = new System.Drawing.Size(328, 29); + this.layoutControlItem35.Text = "鏉ユ簮鍗曞彿"; + this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18); // // Frm_MesItemQtrk // @@ -2237,11 +2319,15 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptBl)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit(); this.xtraTabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); this.ResumeLayout(false); } @@ -2394,5 +2480,11 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl; + private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1; + private DevExpress.XtraEditors.ButtonEdit txt_qt035; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs index 4b22ad8..0aa0e40 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs @@ -1,4 +1,5 @@ using DevExpress.XtraEditors; +using Gs.DevApp.DevFrm.Work; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -373,6 +374,7 @@ kcfx = kcfx,//搴撳瓨鏂瑰悜 hzlx = inHzlx,//璐т富绫诲瀷 inHz = inHz,//璐т富 + inSource = txt_qt035.EditValue,//宸ュ崟鍙� list = new List<dynamic>(), }; gvMx1.CloseEditor(); @@ -400,6 +402,7 @@ ItemId = (row["itemId"].ToString()), Sqsl = (row["qd007"].ToString()), Bz = (row["qd010"].ToString()), + Bllb = (row["qd012"].ToString()), }); } } @@ -816,5 +819,27 @@ } } } + + private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + var rowhandle = gvMx1.FocusedRowHandle; + if (rowhandle < 0) + return; + UcDictionarySelect frm = new UcDictionarySelect("寮傚父鎻忚堪", " a.s_type='QC寮傚父鎻忚堪' and a.pid<>'00000000-0000-0000-0000-000000000000'"); + frm.UpdateParent += (ss, ee) => + { + System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder(); + var lst = ee.DynamicList; + foreach (dynamic dym in lst) + { + if (stringBuilder.Length > 0) + stringBuilder.Append("|"); + stringBuilder.Append(dym.dicTxt); + } + gvMx1.SetFocusedRowCellValue("qd012", stringBuilder.ToString()); + // this.TextTxt = ; + }; + frm.ShowDialog(); + } } } \ No newline at end of file -- Gitblit v1.9.3