From f090facc03df282747691d6295229a25583f9712 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 22 四月 2025 08:09:25 +0800 Subject: [PATCH] iqc --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 250 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 150 insertions(+), 100 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs index 5c12355..6e9ab50 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs @@ -40,11 +40,12 @@ 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.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -80,10 +81,12 @@ this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = 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.txt_fngDesc = new Gs.DevApp.UserControl.UcDictionary(); this.btnYcReport = new DevExpress.XtraEditors.SimpleButton(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_suppName = new DevExpress.XtraEditors.TextEdit(); @@ -133,6 +136,7 @@ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -259,6 +263,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); this.xtraTabControl2.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -414,7 +419,8 @@ this.gridColumn23, this.gridColumn30, this.gridColumn5, - this.gridColumn6}); + this.gridColumn6, + this.gridColumn7}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -667,7 +673,7 @@ // gv_fngHandle // this.gv_fngHandle.AppearanceCell.Options.UseFont = true; - this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶"; + this.gv_fngHandle.Caption = "澶勭悊缁撴灉"; this.gv_fngHandle.FieldName = "fngHandle"; this.gv_fngHandle.MinWidth = 30; this.gv_fngHandle.Name = "gv_fngHandle"; @@ -685,7 +691,7 @@ this.bandedGridColumn1.Name = "bandedGridColumn1"; this.bandedGridColumn1.Tag = "org.fnamber"; this.bandedGridColumn1.Visible = true; - this.bandedGridColumn1.VisibleIndex = 21; + this.bandedGridColumn1.VisibleIndex = 22; this.bandedGridColumn1.Width = 250; // // gridColumn18 @@ -695,7 +701,7 @@ this.gridColumn18.MinWidth = 25; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; - this.gridColumn18.VisibleIndex = 22; + this.gridColumn18.VisibleIndex = 23; this.gridColumn18.Width = 94; // // gridColumn19 @@ -705,7 +711,7 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 23; + this.gridColumn19.VisibleIndex = 24; this.gridColumn19.Width = 94; // // gridColumn17 @@ -723,7 +729,7 @@ this.gridColumn23.MinWidth = 25; this.gridColumn23.Name = "gridColumn23"; this.gridColumn23.Visible = true; - this.gridColumn23.VisibleIndex = 24; + this.gridColumn23.VisibleIndex = 25; this.gridColumn23.Width = 94; // // gridColumn30 @@ -755,6 +761,16 @@ this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 4; this.gridColumn6.Width = 94; + // + // gridColumn7 + // + this.gridColumn7.Caption = "閫�鏂欐柟寮�"; + this.gridColumn7.FieldName = "fmrmode"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 21; + this.gridColumn7.Width = 94; // // pageBar1 // @@ -793,11 +809,12 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1342, 688); - this.splitMx1.SplitterPosition = 202; + this.splitMx1.SplitterPosition = 231; this.splitMx1.TabIndex = 0; // // layoutMx1 // + this.layoutMx1.Controls.Add(this.txt_fngDesc); this.layoutMx1.Controls.Add(this.btnYcReport); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_suppName); @@ -829,20 +846,31 @@ this.layoutControlItem21}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1067, 391, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(874, 322, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1342, 202); + this.layoutMx1.Size = new System.Drawing.Size(1342, 231); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; + // + // txt_fngDesc + // + this.txt_fngDesc.BtnTxt = "寮傚父澶囨敞"; + this.txt_fngDesc.Location = new System.Drawing.Point(12, 167); + this.txt_fngDesc.Name = "txt_fngDesc"; + this.txt_fngDesc.Size = new System.Drawing.Size(656, 52); + this.txt_fngDesc.TabIndex = 815; + this.txt_fngDesc.TextTxt = ""; + this.txt_fngDesc.WhereTxt = "s_type=\'IQC缂洪櫡鎻忚堪\'"; // // btnYcReport // this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16; - this.btnYcReport.Location = new System.Drawing.Point(662, 167); + this.btnYcReport.Location = new System.Drawing.Point(672, 167); this.btnYcReport.Name = "btnYcReport"; this.btnYcReport.Size = new System.Drawing.Size(116, 27); this.btnYcReport.StyleController = this.layoutMx1; this.btnYcReport.TabIndex = 814; + this.btnYcReport.Tag = "gvBtnAlawys"; this.btnYcReport.Text = "鏌ョ湅寮傚父鎶ュ憡"; // // lbGuid @@ -856,9 +884,9 @@ // // txt_suppName // - this.txt_suppName.Location = new System.Drawing.Point(409, 105); + this.txt_suppName.Location = new System.Drawing.Point(414, 105); this.txt_suppName.Name = "txt_suppName"; - this.txt_suppName.Size = new System.Drawing.Size(249, 24); + this.txt_suppName.Size = new System.Drawing.Size(254, 24); this.txt_suppName.StyleController = this.layoutMx1; this.txt_suppName.TabIndex = 801; this.txt_suppName.Tag = "readonly"; @@ -868,17 +896,18 @@ this.txt_remarks.Location = new System.Drawing.Point(84, 136); this.txt_remarks.Name = "txt_remarks"; this.txt_remarks.Properties.Appearance.Options.UseFont = true; - this.txt_remarks.Size = new System.Drawing.Size(574, 24); + this.txt_remarks.Size = new System.Drawing.Size(584, 24); this.txt_remarks.StyleController = this.layoutMx1; this.txt_remarks.TabIndex = 797; + this.txt_remarks.Tag = "readonly"; // // txt_fcheckResu // - this.txt_fcheckResu.Location = new System.Drawing.Point(734, 105); + this.txt_fcheckResu.Location = new System.Drawing.Point(744, 105); this.txt_fcheckResu.Name = "txt_fcheckResu"; this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true; - this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24); + this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24); this.txt_fcheckResu.StyleController = this.layoutMx1; this.txt_fcheckResu.TabIndex = 798; this.txt_fcheckResu.Tag = "readonly"; @@ -888,7 +917,7 @@ this.txt_itemName.Location = new System.Drawing.Point(84, 43); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Properties.Appearance.Options.UseFont = true; - this.txt_itemName.Size = new System.Drawing.Size(249, 24); + this.txt_itemName.Size = new System.Drawing.Size(254, 24); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 800; this.txt_itemName.Tag = "readonly"; @@ -898,27 +927,27 @@ this.txt_releaseNo.Location = new System.Drawing.Point(84, 12); this.txt_releaseNo.Name = "txt_releaseNo"; this.txt_releaseNo.Properties.Appearance.Options.UseFont = true; - this.txt_releaseNo.Size = new System.Drawing.Size(249, 24); + this.txt_releaseNo.Size = new System.Drawing.Size(254, 24); this.txt_releaseNo.StyleController = this.layoutMx1; this.txt_releaseNo.TabIndex = 213; this.txt_releaseNo.Tag = "readonly"; // // txt_fcheckDate // - this.txt_fcheckDate.Location = new System.Drawing.Point(734, 12); + this.txt_fcheckDate.Location = new System.Drawing.Point(744, 12); this.txt_fcheckDate.Name = "txt_fcheckDate"; this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true; - this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24); + this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24); this.txt_fcheckDate.StyleController = this.layoutMx1; this.txt_fcheckDate.TabIndex = 216; this.txt_fcheckDate.Tag = "readonly"; // // txt_lotNo // - this.txt_lotNo.Location = new System.Drawing.Point(409, 12); + this.txt_lotNo.Location = new System.Drawing.Point(414, 12); this.txt_lotNo.Name = "txt_lotNo"; this.txt_lotNo.Properties.Appearance.Options.UseFont = true; - this.txt_lotNo.Size = new System.Drawing.Size(249, 24); + this.txt_lotNo.Size = new System.Drawing.Size(254, 24); this.txt_lotNo.StyleController = this.layoutMx1; this.txt_lotNo.TabIndex = 262; this.txt_lotNo.Tag = "readonly"; @@ -928,7 +957,7 @@ this.txt_itemNo.Location = new System.Drawing.Point(84, 74); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Options.UseFont = true; - this.txt_itemNo.Size = new System.Drawing.Size(249, 24); + this.txt_itemNo.Size = new System.Drawing.Size(254, 24); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 789; this.txt_itemNo.Tag = "readonly"; @@ -937,7 +966,7 @@ // this.txt_itemModel.Location = new System.Drawing.Point(84, 105); this.txt_itemModel.Name = "txt_itemModel"; - this.txt_itemModel.Size = new System.Drawing.Size(249, 24); + this.txt_itemModel.Size = new System.Drawing.Size(254, 24); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 801; this.txt_itemModel.Tag = "readonly"; @@ -953,57 +982,57 @@ // // txt_fcheckBy // - this.txt_fcheckBy.Location = new System.Drawing.Point(734, 43); + this.txt_fcheckBy.Location = new System.Drawing.Point(744, 43); this.txt_fcheckBy.Name = "txt_fcheckBy"; this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true; - this.txt_fcheckBy.Size = new System.Drawing.Size(249, 24); + this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24); this.txt_fcheckBy.StyleController = this.layoutMx1; this.txt_fcheckBy.TabIndex = 217; this.txt_fcheckBy.Tag = "readonly"; // // txt_fbatchQty // - this.txt_fbatchQty.Location = new System.Drawing.Point(409, 74); + this.txt_fbatchQty.Location = new System.Drawing.Point(414, 74); this.txt_fbatchQty.Name = "txt_fbatchQty"; this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true; - this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24); + this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24); this.txt_fbatchQty.StyleController = this.layoutMx1; this.txt_fbatchQty.TabIndex = 222; this.txt_fbatchQty.Tag = "readonly"; // // txt_fsubmitBy // - this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 43); + this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 43); this.txt_fsubmitBy.Name = "txt_fsubmitBy"; - this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24); + this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24); this.txt_fsubmitBy.StyleController = this.layoutMx1; this.txt_fsubmitBy.TabIndex = 804; this.txt_fsubmitBy.Tag = "readonly"; // // txt_fsubmitDate // - this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 74); + this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 74); this.txt_fsubmitDate.Name = "txt_fsubmitDate"; - this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24); + this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24); this.txt_fsubmitDate.StyleController = this.layoutMx1; this.txt_fsubmitDate.TabIndex = 805; this.txt_fsubmitDate.Tag = "readonly"; // // txt_fsubmit // - this.txt_fsubmit.Location = new System.Drawing.Point(987, 12); + this.txt_fsubmit.Location = new System.Drawing.Point(1002, 12); this.txt_fsubmit.Name = "txt_fsubmit"; this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_fsubmit.Size = new System.Drawing.Size(322, 24); + this.txt_fsubmit.Size = new System.Drawing.Size(328, 24); this.txt_fsubmit.StyleController = this.layoutMx1; this.txt_fsubmit.TabIndex = 806; this.txt_fsubmit.Tag = "readonly"; // // txt_slOrg // - this.txt_slOrg.Location = new System.Drawing.Point(734, 136); + this.txt_slOrg.Location = new System.Drawing.Point(744, 136); this.txt_slOrg.Name = "txt_slOrg"; - this.txt_slOrg.Size = new System.Drawing.Size(249, 24); + this.txt_slOrg.Size = new System.Drawing.Size(254, 24); this.txt_slOrg.StyleController = this.layoutMx1; this.txt_slOrg.TabIndex = 807; this.txt_slOrg.Tag = "readonly"; @@ -1019,53 +1048,53 @@ // // txt_checkStates // - this.txt_checkStates.Location = new System.Drawing.Point(734, 74); + this.txt_checkStates.Location = new System.Drawing.Point(744, 74); this.txt_checkStates.Name = "txt_checkStates"; this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true; - this.txt_checkStates.Size = new System.Drawing.Size(249, 24); + this.txt_checkStates.Size = new System.Drawing.Size(254, 24); this.txt_checkStates.StyleController = this.layoutMx1; this.txt_checkStates.TabIndex = 809; this.txt_checkStates.Tag = "readonly"; // // txt_freceQty // - this.txt_freceQty.Location = new System.Drawing.Point(1059, 105); + this.txt_freceQty.Location = new System.Drawing.Point(1074, 105); this.txt_freceQty.Name = "txt_freceQty"; this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true; - this.txt_freceQty.Size = new System.Drawing.Size(250, 24); + this.txt_freceQty.Size = new System.Drawing.Size(256, 24); this.txt_freceQty.StyleController = this.layoutMx1; this.txt_freceQty.TabIndex = 810; this.txt_freceQty.Tag = "readonly"; // // txt_cgdNo // - this.txt_cgdNo.Location = new System.Drawing.Point(409, 43); + this.txt_cgdNo.Location = new System.Drawing.Point(414, 43); this.txt_cgdNo.Name = "txt_cgdNo"; - this.txt_cgdNo.Size = new System.Drawing.Size(249, 24); + this.txt_cgdNo.Size = new System.Drawing.Size(254, 24); this.txt_cgdNo.StyleController = this.layoutMx1; this.txt_cgdNo.TabIndex = 811; this.txt_cgdNo.Tag = "readonly"; // // txt_fngHandle // - this.txt_fngHandle.Location = new System.Drawing.Point(1059, 136); + this.txt_fngHandle.Location = new System.Drawing.Point(1074, 136); this.txt_fngHandle.Name = "txt_fngHandle"; this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true; - this.txt_fngHandle.Size = new System.Drawing.Size(250, 24); + this.txt_fngHandle.Size = new System.Drawing.Size(256, 24); this.txt_fngHandle.StyleController = this.layoutMx1; this.txt_fngHandle.TabIndex = 812; this.txt_fngHandle.Tag = "readonly"; // // txt_fmrmode // - this.txt_fmrmode.Location = new System.Drawing.Point(1059, 167); + this.txt_fmrmode.Location = new System.Drawing.Point(1074, 167); 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(250, 24); + this.txt_fmrmode.Size = new System.Drawing.Size(256, 24); this.txt_fmrmode.StyleController = this.layoutMx1; this.txt_fmrmode.TabIndex = 813; this.txt_fmrmode.Tag = "readonly"; @@ -1128,7 +1157,8 @@ this.layoutControlItem23, this.layoutControlItem25, this.layoutControlItem26, - this.layoutControlItem27}); + this.layoutControlItem27, + this.layoutControlItem28}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1156,14 +1186,17 @@ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition6.Height = 100D; rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition7.Height = 25D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.AutoSize; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4, rowDefinition5, - rowDefinition6}); - this.Root.Size = new System.Drawing.Size(1321, 206); + rowDefinition6, + rowDefinition7}); + this.Root.Size = new System.Drawing.Size(1342, 231); this.Root.TextVisible = false; // // layoutControlItem1 @@ -1171,7 +1204,7 @@ this.layoutControlItem1.Control = this.txt_releaseNo; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem1.Size = new System.Drawing.Size(330, 31); this.layoutControlItem1.Text = "妫�楠屽崟鍙�"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // @@ -1181,7 +1214,7 @@ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem4.Size = new System.Drawing.Size(330, 31); this.layoutControlItem4.Text = "鐗╂枡鍚嶇О"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // @@ -1191,7 +1224,7 @@ this.layoutControlItem5.Location = new System.Drawing.Point(0, 62); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem5.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem5.Size = new System.Drawing.Size(330, 31); this.layoutControlItem5.Text = "鐗╂枡缂栫爜"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // @@ -1201,39 +1234,39 @@ this.layoutControlItem6.Location = new System.Drawing.Point(0, 93); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem6.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem6.Size = new System.Drawing.Size(330, 31); this.layoutControlItem6.Text = "鐗╂枡瑙勬牸"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_fsubmitBy; - this.layoutControlItem15.Location = new System.Drawing.Point(975, 31); + this.layoutControlItem15.Location = new System.Drawing.Point(990, 31); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem15.Size = new System.Drawing.Size(326, 31); + this.layoutControlItem15.Size = new System.Drawing.Size(332, 31); this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡"; this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_fsubmitDate; - this.layoutControlItem16.Location = new System.Drawing.Point(975, 62); + this.layoutControlItem16.Location = new System.Drawing.Point(990, 62); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem16.Size = new System.Drawing.Size(326, 31); + this.layoutControlItem16.Size = new System.Drawing.Size(332, 31); this.layoutControlItem16.Text = "瀹℃牳浜哄憳"; this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_fsubmit; - this.layoutControlItem14.Location = new System.Drawing.Point(975, 0); + this.layoutControlItem14.Location = new System.Drawing.Point(990, 0); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem14.Size = new System.Drawing.Size(326, 31); + this.layoutControlItem14.Size = new System.Drawing.Size(332, 31); this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; @@ -1245,154 +1278,167 @@ this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem12.Size = new System.Drawing.Size(650, 31); - this.layoutControlItem12.Text = "澶囨敞璇存槑"; + this.layoutControlItem12.Size = new System.Drawing.Size(660, 31); + this.layoutControlItem12.Text = "鍒拌揣澶囨敞"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_fcheckResu; - this.layoutControlItem10.Location = new System.Drawing.Point(650, 93); + this.layoutControlItem10.Location = new System.Drawing.Point(660, 93); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem10.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem10.Size = new System.Drawing.Size(330, 31); this.layoutControlItem10.Text = "妫�楠岀粨鏋�"; this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_suppName; - this.layoutControlItem13.Location = new System.Drawing.Point(325, 93); + this.layoutControlItem13.Location = new System.Drawing.Point(330, 93); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem13.Size = new System.Drawing.Size(330, 31); this.layoutControlItem13.Text = "渚涘簲鍟�"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem22 // this.layoutControlItem22.Control = this.txt_checkStates; - this.layoutControlItem22.Location = new System.Drawing.Point(650, 62); + this.layoutControlItem22.Location = new System.Drawing.Point(660, 62); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem22.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem22.Size = new System.Drawing.Size(330, 31); this.layoutControlItem22.Text = "妫�楠岀姸鎬�"; this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_fbatchQty; - this.layoutControlItem9.Location = new System.Drawing.Point(325, 62); + this.layoutControlItem9.Location = new System.Drawing.Point(330, 62); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem9.Size = new System.Drawing.Size(330, 31); this.layoutControlItem9.Text = "鏀惰揣鏁伴噺"; this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fcheckBy; - this.layoutControlItem8.Location = new System.Drawing.Point(650, 31); + this.layoutControlItem8.Location = new System.Drawing.Point(660, 31); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem8.Size = new System.Drawing.Size(330, 31); this.layoutControlItem8.Text = "妫�楠屼汉鍛�"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_fcheckDate; - this.layoutControlItem2.Location = new System.Drawing.Point(650, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(660, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem2.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem2.Size = new System.Drawing.Size(330, 31); this.layoutControlItem2.Text = "妫�楠屾棩鏈�"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_lotNo; - this.layoutControlItem3.Location = new System.Drawing.Point(325, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(330, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem3.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem3.Size = new System.Drawing.Size(330, 31); this.layoutControlItem3.Text = "閫佹鎵瑰彿"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem24 // this.layoutControlItem24.Control = this.txt_cgdNo; - this.layoutControlItem24.Location = new System.Drawing.Point(325, 31); + this.layoutControlItem24.Location = new System.Drawing.Point(330, 31); this.layoutControlItem24.Name = "layoutControlItem24"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem24.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem24.Size = new System.Drawing.Size(330, 31); this.layoutControlItem24.Text = "閲囪喘鍗曞彿"; this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_slOrg; - this.layoutControlItem18.Location = new System.Drawing.Point(650, 124); + this.layoutControlItem18.Location = new System.Drawing.Point(660, 124); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem18.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem18.Size = new System.Drawing.Size(330, 31); this.layoutControlItem18.Text = "鏀舵枡缁勭粐"; this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem23 // this.layoutControlItem23.Control = this.txt_freceQty; - this.layoutControlItem23.Location = new System.Drawing.Point(975, 93); + this.layoutControlItem23.Location = new System.Drawing.Point(990, 93); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem23.Size = new System.Drawing.Size(326, 31); + this.layoutControlItem23.Size = new System.Drawing.Size(332, 31); this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉"; this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_fngHandle; - this.layoutControlItem25.Location = new System.Drawing.Point(975, 124); + this.layoutControlItem25.Location = new System.Drawing.Point(990, 124); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem25.Size = new System.Drawing.Size(326, 31); + this.layoutControlItem25.Size = new System.Drawing.Size(332, 31); this.layoutControlItem25.Text = "澶勭悊缁撴灉"; this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_fmrmode; - this.layoutControlItem26.Location = new System.Drawing.Point(975, 155); + this.layoutControlItem26.Location = new System.Drawing.Point(990, 155); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem26.Size = new System.Drawing.Size(326, 31); + this.layoutControlItem26.Size = new System.Drawing.Size(332, 31); this.layoutControlItem26.Text = "閫�鏂欐柟寮�"; this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem27 // this.layoutControlItem27.Control = this.btnYcReport; - this.layoutControlItem27.Location = new System.Drawing.Point(650, 155); + this.layoutControlItem27.Location = new System.Drawing.Point(660, 155); this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31); this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem27.Size = new System.Drawing.Size(325, 31); + this.layoutControlItem27.Size = new System.Drawing.Size(330, 31); this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡"; this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem27.TextVisible = false; + // + // layoutControlItem28 + // + this.layoutControlItem28.Control = this.txt_fngDesc; + this.layoutControlItem28.Location = new System.Drawing.Point(0, 155); + this.layoutControlItem28.Name = "layoutControlItem28"; + this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2; + this.layoutControlItem28.Size = new System.Drawing.Size(660, 56); + this.layoutControlItem28.Text = "寮傚父澶囨敞"; + this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem28.TextVisible = false; // // xtraTabControl2 // @@ -1400,7 +1446,7 @@ this.xtraTabControl2.Location = new System.Drawing.Point(0, 0); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.tabMxPage1; - this.xtraTabControl2.Size = new System.Drawing.Size(1342, 474); + this.xtraTabControl2.Size = new System.Drawing.Size(1342, 445); this.xtraTabControl2.TabIndex = 3; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -1411,7 +1457,7 @@ this.tabMxPage1.Controls.Add(this.splitMx2); this.tabMxPage1.Controls.Add(this.panMsg); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1340, 442); + this.tabMxPage1.Size = new System.Drawing.Size(1340, 413); this.tabMxPage1.Text = "鎶芥牱淇℃伅"; // // splitMx2 @@ -1430,7 +1476,7 @@ // this.splitMx2.Panel2.Controls.Add(this.splitYangLi); this.splitMx2.Panel2.Text = "Panel2"; - this.splitMx2.Size = new System.Drawing.Size(1340, 395); + this.splitMx2.Size = new System.Drawing.Size(1340, 366); this.splitMx2.SplitterPosition = 287; this.splitMx2.TabIndex = 3; // @@ -1695,7 +1741,7 @@ // this.splitYangLi.Panel2.Controls.Add(this.groupControl2); this.splitYangLi.Panel2.Text = "Panel2"; - this.splitYangLi.Size = new System.Drawing.Size(1340, 96); + this.splitYangLi.Size = new System.Drawing.Size(1340, 67); this.splitYangLi.SplitterPosition = 676; this.splitYangLi.TabIndex = 4; // @@ -1705,7 +1751,7 @@ this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupControl1.Location = new System.Drawing.Point(0, 0); this.groupControl1.Name = "groupControl1"; - this.groupControl1.Size = new System.Drawing.Size(676, 96); + this.groupControl1.Size = new System.Drawing.Size(676, 67); this.groupControl1.TabIndex = 3; this.groupControl1.Text = "妫�娴嬬粨鏋�"; // @@ -1715,7 +1761,7 @@ this.gcMx2.Location = new System.Drawing.Point(2, 28); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; - this.gcMx2.Size = new System.Drawing.Size(672, 66); + this.gcMx2.Size = new System.Drawing.Size(672, 37); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1803,7 +1849,7 @@ this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupControl2.Location = new System.Drawing.Point(0, 0); this.groupControl2.Name = "groupControl2"; - this.groupControl2.Size = new System.Drawing.Size(652, 96); + this.groupControl2.Size = new System.Drawing.Size(652, 67); this.groupControl2.TabIndex = 4; this.groupControl2.Text = "鏍锋湰缁撴灉"; // @@ -1813,7 +1859,7 @@ this.gcMx3.Location = new System.Drawing.Point(2, 28); this.gcMx3.MainView = this.gvMx3; this.gcMx3.Name = "gcMx3"; - this.gcMx3.Size = new System.Drawing.Size(648, 66); + this.gcMx3.Size = new System.Drawing.Size(648, 37); this.gcMx3.TabIndex = 0; this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx3}); @@ -1984,10 +2030,10 @@ columnDefinition6, columnDefinition7, columnDefinition8}); - rowDefinition7.Height = 100D; - rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition8.Height = 100D; + rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition7}); + rowDefinition8}); this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43); this.layoutControlGroup1.TextVisible = false; @@ -2037,7 +2083,7 @@ // this.tabMxPage2.Controls.Add(this.ucUpFileList1); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1340, 458); + this.tabMxPage2.Size = new System.Drawing.Size(1340, 413); this.tabMxPage2.Text = "闄勪欢淇℃伅"; // // ucUpFileList1 @@ -2047,7 +2093,7 @@ this.ucUpFileList1.Name = "ucUpFileList1"; this.ucUpFileList1.parentGroup = null; this.ucUpFileList1.pGuid = null; - this.ucUpFileList1.Size = new System.Drawing.Size(1340, 458); + this.ucUpFileList1.Size = new System.Drawing.Size(1340, 413); this.ucUpFileList1.TabIndex = 0; // // repositoryItemComboBox2 @@ -2160,6 +2206,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); this.xtraTabControl2.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2351,5 +2398,8 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraEditors.SimpleButton btnYcReport; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private UserControl.UcDictionary txt_fngDesc; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; } } \ No newline at end of file -- Gitblit v1.9.3