From 11b5d554fba0b5a74be3eceed11350d367525a91 Mon Sep 17 00:00:00 2001 From: kyy <3283105747@qq.com> Date: 星期四, 25 九月 2025 10:55:49 +0800 Subject: [PATCH] 增加需求单据号 --- DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs | 619 +++++++++++++++++++++++++++++++------------------------- 1 files changed, 342 insertions(+), 277 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs index 0d62858..0fa7b83 100644 --- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs @@ -82,6 +82,7 @@ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.rptButtonUrl = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + 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(); @@ -188,7 +189,7 @@ this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -314,9 +315,10 @@ this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); + this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; - this.toolBarMenu1.Size = new System.Drawing.Size(1344, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(1176, 62); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; @@ -324,10 +326,11 @@ // xtraTabControl1 // this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); + this.xtraTabControl1.Location = new System.Drawing.Point(0, 62); + this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1344, 720); + this.xtraTabControl1.Size = new System.Drawing.Size(1176, 560); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, @@ -336,8 +339,9 @@ // xtraTabPage1 // this.xtraTabPage1.Controls.Add(this.split1); + this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688); + this.xtraTabPage1.Size = new System.Drawing.Size(1174, 534); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -346,6 +350,7 @@ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); + this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.split1.Name = "split1"; // // split1.Panel1 @@ -358,19 +363,21 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1342, 688); + this.split1.Size = new System.Drawing.Size(1174, 534); this.split1.SplitterPosition = 0; this.split1.TabIndex = 4; // // gcMain1 // this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; + this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMain1.Name = "gcMain1"; this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.rptButtonUrl}); - this.gcMain1.Size = new System.Drawing.Size(1342, 638); + this.gcMain1.Size = new System.Drawing.Size(1174, 494); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -408,9 +415,11 @@ this.gridColumn17, this.gridColumn5, this.gridColumn6, - this.gridColumn7}); + this.gridColumn7, + this.gridColumn8}); + this.gridView1.DetailHeight = 272; this.gridView1.GridControl = this.gcMain1; - this.gridView1.IndicatorWidth = 50; + this.gridView1.IndicatorWidth = 44; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; this.gridView1.OptionsView.ShowAutoFilterRow = true; @@ -421,127 +430,127 @@ this.gv_fsubmit.AppearanceCell.Options.UseFont = true; this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑"; this.gv_fsubmit.FieldName = "fsubmitTxt"; - this.gv_fsubmit.MinWidth = 30; + this.gv_fsubmit.MinWidth = 26; this.gv_fsubmit.Name = "gv_fsubmit"; this.gv_fsubmit.OptionsColumn.AllowEdit = false; this.gv_fsubmit.Tag = "query_a.fsubmit"; this.gv_fsubmit.UnboundDataType = typeof(bool); this.gv_fsubmit.Visible = true; this.gv_fsubmit.VisibleIndex = 0; - this.gv_fsubmit.Width = 50; + this.gv_fsubmit.Width = 44; // // gv_releaseNo // this.gv_releaseNo.AppearanceCell.Options.UseFont = true; this.gv_releaseNo.Caption = "妫�楠屽崟鍙�"; this.gv_releaseNo.FieldName = "releaseNo"; - this.gv_releaseNo.MinWidth = 30; + this.gv_releaseNo.MinWidth = 26; this.gv_releaseNo.Name = "gv_releaseNo"; this.gv_releaseNo.OptionsColumn.AllowEdit = false; this.gv_releaseNo.Tag = "query_a.release_no"; this.gv_releaseNo.Visible = true; this.gv_releaseNo.VisibleIndex = 2; - this.gv_releaseNo.Width = 100; + this.gv_releaseNo.Width = 87; // // gv_lotNo // this.gv_lotNo.AppearanceCell.Options.UseFont = true; this.gv_lotNo.Caption = "宸ュ崟鍗曞彿"; this.gv_lotNo.FieldName = "lotNo"; - this.gv_lotNo.MinWidth = 30; + this.gv_lotNo.MinWidth = 26; this.gv_lotNo.Name = "gv_lotNo"; this.gv_lotNo.OptionsColumn.AllowEdit = false; this.gv_lotNo.Tag = "query_a.lot_no"; this.gv_lotNo.Visible = true; this.gv_lotNo.VisibleIndex = 3; - this.gv_lotNo.Width = 120; + this.gv_lotNo.Width = 105; // // gridColumn23 // this.gridColumn23.Caption = "浜х嚎鍚嶇О"; this.gridColumn23.FieldName = "lineName"; - this.gridColumn23.MinWidth = 25; + this.gridColumn23.MinWidth = 22; this.gridColumn23.Name = "gridColumn23"; this.gridColumn23.Visible = true; this.gridColumn23.VisibleIndex = 4; - this.gridColumn23.Width = 94; + this.gridColumn23.Width = 82; // // gv_itemId // this.gv_itemId.AppearanceCell.Options.UseFont = true; this.gv_itemId.Caption = "鐗╂枡ID"; this.gv_itemId.FieldName = "itemId"; - this.gv_itemId.MinWidth = 30; + this.gv_itemId.MinWidth = 26; this.gv_itemId.Name = "gv_itemId"; this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "query_a.item_id"; this.gv_itemId.Visible = true; this.gv_itemId.VisibleIndex = 7; - this.gv_itemId.Width = 30; + this.gv_itemId.Width = 26; // // gv_itemNo // this.gv_itemNo.AppearanceCell.Options.UseFont = true; this.gv_itemNo.Caption = "鐗╂枡缂栫爜"; this.gv_itemNo.FieldName = "itemNo2"; - this.gv_itemNo.MinWidth = 30; + this.gv_itemNo.MinWidth = 26; this.gv_itemNo.Name = "gv_itemNo"; this.gv_itemNo.OptionsColumn.AllowEdit = false; this.gv_itemNo.Tag = "query_a.item_no"; this.gv_itemNo.Visible = true; this.gv_itemNo.VisibleIndex = 8; - this.gv_itemNo.Width = 136; + this.gv_itemNo.Width = 119; // // gv_boardStyle // this.gv_boardStyle.AppearanceCell.Options.UseFont = true; this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О"; this.gv_boardStyle.FieldName = "itemName"; - this.gv_boardStyle.MinWidth = 30; + this.gv_boardStyle.MinWidth = 26; this.gv_boardStyle.Name = "gv_boardStyle"; this.gv_boardStyle.OptionsColumn.AllowEdit = false; this.gv_boardStyle.Tag = "query_a.board_style"; this.gv_boardStyle.Visible = true; this.gv_boardStyle.VisibleIndex = 9; - this.gv_boardStyle.Width = 164; + this.gv_boardStyle.Width = 143; // // gridColumn14 // this.gridColumn14.Caption = "鐗╂枡瑙勬牸"; this.gridColumn14.FieldName = "itemModel"; - this.gridColumn14.MinWidth = 30; + this.gridColumn14.MinWidth = 26; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.OptionsColumn.ReadOnly = true; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 10; - this.gridColumn14.Width = 200; + this.gridColumn14.Width = 175; // // gv_fcovertQty // this.gv_fcovertQty.AppearanceCell.Options.UseFont = true; this.gv_fcovertQty.Caption = "宸ュ崟鏁伴噺"; this.gv_fcovertQty.FieldName = "daaQty"; - this.gv_fcovertQty.MinWidth = 30; + this.gv_fcovertQty.MinWidth = 26; this.gv_fcovertQty.Name = "gv_fcovertQty"; this.gv_fcovertQty.OptionsColumn.AllowEdit = false; this.gv_fcovertQty.OptionsColumn.ReadOnly = true; this.gv_fcovertQty.Tag = "query_a.fcovert_qty"; this.gv_fcovertQty.Visible = true; this.gv_fcovertQty.VisibleIndex = 11; - this.gv_fcovertQty.Width = 60; + this.gv_fcovertQty.Width = 52; // // gv_fbatchQty // this.gv_fbatchQty.AppearanceCell.Options.UseFont = true; this.gv_fbatchQty.Caption = "鎶芥鏁伴噺"; this.gv_fbatchQty.FieldName = "fbatchQty"; - this.gv_fbatchQty.MinWidth = 30; + this.gv_fbatchQty.MinWidth = 26; this.gv_fbatchQty.Name = "gv_fbatchQty"; this.gv_fbatchQty.OptionsColumn.AllowEdit = false; this.gv_fbatchQty.Tag = "query_a.fbatch_qty"; this.gv_fbatchQty.Visible = true; this.gv_fbatchQty.VisibleIndex = 12; - this.gv_fbatchQty.Width = 80; + this.gv_fbatchQty.Width = 70; // // gv_fcheckResu // @@ -552,172 +561,171 @@ this.gv_fcheckResu.AppearanceHeader.Options.UseForeColor = true; this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�"; this.gv_fcheckResu.FieldName = "fcheckResu"; - this.gv_fcheckResu.MinWidth = 30; + this.gv_fcheckResu.MinWidth = 26; this.gv_fcheckResu.Name = "gv_fcheckResu"; this.gv_fcheckResu.OptionsColumn.AllowEdit = false; this.gv_fcheckResu.Tag = "query_a.fcheck_resu"; this.gv_fcheckResu.Visible = true; this.gv_fcheckResu.VisibleIndex = 6; - this.gv_fcheckResu.Width = 50; + this.gv_fcheckResu.Width = 44; // // gv_remarks // this.gv_remarks.AppearanceCell.Options.UseFont = true; this.gv_remarks.Caption = "澶囨敞璇存槑"; this.gv_remarks.FieldName = "remarks"; - this.gv_remarks.MinWidth = 30; + this.gv_remarks.MinWidth = 26; this.gv_remarks.Name = "gv_remarks"; this.gv_remarks.OptionsColumn.AllowEdit = false; this.gv_remarks.Tag = "query_a.remarks"; this.gv_remarks.Visible = true; this.gv_remarks.VisibleIndex = 13; - this.gv_remarks.Width = 100; + this.gv_remarks.Width = 87; // // gv_fcheckBy // this.gv_fcheckBy.AppearanceCell.Options.UseFont = true; this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�"; this.gv_fcheckBy.FieldName = "fcheckBy"; - this.gv_fcheckBy.MinWidth = 30; + this.gv_fcheckBy.MinWidth = 26; this.gv_fcheckBy.Name = "gv_fcheckBy"; this.gv_fcheckBy.OptionsColumn.AllowEdit = false; this.gv_fcheckBy.Tag = "query_a.fcheck_by"; this.gv_fcheckBy.Visible = true; this.gv_fcheckBy.VisibleIndex = 14; - this.gv_fcheckBy.Width = 118; + this.gv_fcheckBy.Width = 103; // // gv_fcheckDate // this.gv_fcheckDate.AppearanceCell.Options.UseFont = true; this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�"; this.gv_fcheckDate.FieldName = "fcheckDate"; - this.gv_fcheckDate.MinWidth = 30; + this.gv_fcheckDate.MinWidth = 26; this.gv_fcheckDate.Name = "gv_fcheckDate"; this.gv_fcheckDate.OptionsColumn.AllowEdit = false; this.gv_fcheckDate.Tag = "query_a.fcheck_date"; this.gv_fcheckDate.Visible = true; this.gv_fcheckDate.VisibleIndex = 15; - this.gv_fcheckDate.Width = 182; + this.gv_fcheckDate.Width = 159; // // gv_createBy // this.gv_createBy.AppearanceCell.Options.UseFont = true; this.gv_createBy.Caption = "鍒涘缓浜�"; this.gv_createBy.FieldName = "createBy"; - this.gv_createBy.MinWidth = 30; + this.gv_createBy.MinWidth = 26; this.gv_createBy.Name = "gv_createBy"; this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; this.gv_createBy.Visible = true; this.gv_createBy.VisibleIndex = 16; - this.gv_createBy.Width = 67; + this.gv_createBy.Width = 59; // // gridColumn15 // this.gridColumn15.Caption = "鍒涘缓鏃ユ湡"; this.gridColumn15.FieldName = "createDate"; - this.gridColumn15.MinWidth = 25; + this.gridColumn15.MinWidth = 22; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 17; - this.gridColumn15.Width = 94; + this.gridColumn15.Width = 82; // // gv_lastupdateBy // this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true; this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉"; this.gv_lastupdateBy.FieldName = "lastupdateBy"; - this.gv_lastupdateBy.MinWidth = 30; + this.gv_lastupdateBy.MinWidth = 26; this.gv_lastupdateBy.Name = "gv_lastupdateBy"; this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; this.gv_lastupdateBy.Tag = "query_a.lastupdate_by"; this.gv_lastupdateBy.Visible = true; this.gv_lastupdateBy.VisibleIndex = 18; - this.gv_lastupdateBy.Width = 60; + this.gv_lastupdateBy.Width = 52; // // gv_lastupdateDate // this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true; this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�"; this.gv_lastupdateDate.FieldName = "lastupdateDate"; - this.gv_lastupdateDate.MinWidth = 30; + this.gv_lastupdateDate.MinWidth = 26; this.gv_lastupdateDate.Name = "gv_lastupdateDate"; this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; this.gv_lastupdateDate.Tag = "query_a.lastupdate_date"; this.gv_lastupdateDate.Visible = true; this.gv_lastupdateDate.VisibleIndex = 19; - this.gv_lastupdateDate.Width = 120; + this.gv_lastupdateDate.Width = 105; // // gridColumn18 // this.gridColumn18.Caption = "瀹℃牳浜�"; this.gridColumn18.FieldName = "fsubmitBy"; - this.gridColumn18.MinWidth = 25; + this.gridColumn18.MinWidth = 22; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; this.gridColumn18.VisibleIndex = 20; - this.gridColumn18.Width = 94; + this.gridColumn18.Width = 82; // // gridColumn19 // this.gridColumn19.Caption = "瀹℃牳鏃ユ湡"; this.gridColumn19.FieldName = "fsubmitDate"; - this.gridColumn19.MinWidth = 25; + this.gridColumn19.MinWidth = 22; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; this.gridColumn19.VisibleIndex = 21; - this.gridColumn19.Width = 94; + this.gridColumn19.Width = 82; // // gridColumn30 // this.gridColumn30.Caption = "绫诲瀷"; this.gridColumn30.FieldName = "orderType"; - this.gridColumn30.MinWidth = 25; + this.gridColumn30.MinWidth = 22; this.gridColumn30.Name = "gridColumn30"; - this.gridColumn30.Width = 94; + this.gridColumn30.Width = 82; // // gridColumn13 // this.gridColumn13.Caption = "浜х嚎ID"; this.gridColumn13.FieldName = "daa020"; - this.gridColumn13.MinWidth = 25; + this.gridColumn13.MinWidth = 22; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; this.gridColumn13.VisibleIndex = 22; - this.gridColumn13.Width = 94; + this.gridColumn13.Width = 82; // // gridColumn17 // this.gridColumn17.Caption = "涓婚敭Guid"; this.gridColumn17.FieldName = "guid"; - this.gridColumn17.MinWidth = 25; + this.gridColumn17.MinWidth = 22; this.gridColumn17.Name = "gridColumn17"; - this.gridColumn17.Width = 94; + this.gridColumn17.Width = 82; // // gridColumn5 // this.gridColumn5.Caption = "妫�楠岀姸鎬�"; this.gridColumn5.FieldName = "checkStates"; - this.gridColumn5.MinWidth = 25; + this.gridColumn5.MinWidth = 22; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 5; - this.gridColumn5.Width = 94; + this.gridColumn5.Width = 82; // // gridColumn6 // this.gridColumn6.Caption = "鍘绘楠�"; this.gridColumn6.ColumnEdit = this.rptButtonUrl; - this.gridColumn6.MinWidth = 25; + this.gridColumn6.MinWidth = 22; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 1; - this.gridColumn6.Width = 94; + this.gridColumn6.Width = 82; // // rptButtonUrl // this.rptButtonUrl.AutoHeight = false; - // editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.boposition2_16x162; editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.rptButtonUrl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍘绘楠�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); @@ -725,24 +733,35 @@ this.rptButtonUrl.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.rptButtonUrl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptButtonUrl_ButtonClick); // + // gridColumn7 + // + this.gridColumn7.Caption = "鐢熶骇缁勭粐"; + this.gridColumn7.FieldName = "fSubsidiary"; + this.gridColumn7.MinWidth = 22; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 23; + this.gridColumn7.Width = 82; + // // pageBar1 // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pageBar1.Location = new System.Drawing.Point(0, 638); - this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.pageBar1.Location = new System.Drawing.Point(0, 494); + this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(1342, 38); + this.pageBar1.Size = new System.Drawing.Size(1174, 30); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // // xtraTabPage2 // this.xtraTabPage2.Controls.Add(this.splitMx1); + this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.PageVisible = false; - this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688); + this.xtraTabPage2.Size = new System.Drawing.Size(1174, 534); this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; // // splitMx1 @@ -750,6 +769,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); + this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 @@ -762,8 +782,8 @@ this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.splitMx1.Size = new System.Drawing.Size(1342, 688); - this.splitMx1.SplitterPosition = 185; + this.splitMx1.Size = new System.Drawing.Size(1174, 534); + this.splitMx1.SplitterPosition = 144; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -795,216 +815,238 @@ this.layoutControlItem17, this.layoutControlItem21}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); + this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(827, 475, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1342, 185); + this.layoutMx1.Size = new System.Drawing.Size(1174, 144); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(987, 108); + this.lbGuid.Location = new System.Drawing.Point(864, 84); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(322, 28); + this.lbGuid.Size = new System.Drawing.Size(282, 22); this.lbGuid.TabIndex = 1; this.lbGuid.Text = "lbGuid"; this.lbGuid.Visible = false; // // txt_remarks // - this.txt_remarks.Location = new System.Drawing.Point(84, 124); + this.txt_remarks.Location = new System.Drawing.Point(69, 106); + this.txt_remarks.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_remarks.Name = "txt_remarks"; this.txt_remarks.Properties.Appearance.Options.UseFont = true; - this.txt_remarks.Size = new System.Drawing.Size(584, 24); + this.txt_remarks.Size = new System.Drawing.Size(516, 20); this.txt_remarks.StyleController = this.layoutMx1; this.txt_remarks.TabIndex = 797; // // txt_fcheckResu // - this.txt_fcheckResu.Location = new System.Drawing.Point(744, 124); + this.txt_fcheckResu.Location = new System.Drawing.Point(647, 106); + this.txt_fcheckResu.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); 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(254, 24); + this.txt_fcheckResu.Size = new System.Drawing.Size(227, 20); this.txt_fcheckResu.StyleController = this.layoutMx1; this.txt_fcheckResu.TabIndex = 798; this.txt_fcheckResu.Tag = "readonly"; // // txt_releaseNo // - this.txt_releaseNo.Location = new System.Drawing.Point(84, 12); + this.txt_releaseNo.Location = new System.Drawing.Point(69, 10); + this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_releaseNo.Name = "txt_releaseNo"; this.txt_releaseNo.Properties.Appearance.Options.UseFont = true; - this.txt_releaseNo.Size = new System.Drawing.Size(254, 24); + this.txt_releaseNo.Size = new System.Drawing.Size(227, 20); 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(744, 40); + this.txt_fcheckDate.Location = new System.Drawing.Point(647, 34); + this.txt_fcheckDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fcheckDate.Name = "txt_fcheckDate"; this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true; - this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24); + this.txt_fcheckDate.Size = new System.Drawing.Size(227, 20); this.txt_fcheckDate.StyleController = this.layoutMx1; this.txt_fcheckDate.TabIndex = 216; this.txt_fcheckDate.Tag = "readonly"; // // txt_lotNo1 // - this.txt_lotNo1.Location = new System.Drawing.Point(744, 12); + this.txt_lotNo1.Location = new System.Drawing.Point(647, 10); + this.txt_lotNo1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_lotNo1.Name = "txt_lotNo1"; this.txt_lotNo1.Properties.Appearance.Options.UseFont = true; - this.txt_lotNo1.Size = new System.Drawing.Size(254, 24); + this.txt_lotNo1.Size = new System.Drawing.Size(227, 20); this.txt_lotNo1.StyleController = this.layoutMx1; this.txt_lotNo1.TabIndex = 262; this.txt_lotNo1.Tag = ""; // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(414, 68); + this.txt_itemNo.Location = new System.Drawing.Point(358, 58); + this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Options.UseFont = true; - this.txt_itemNo.Size = new System.Drawing.Size(254, 24); + this.txt_itemNo.Size = new System.Drawing.Size(227, 20); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 789; this.txt_itemNo.Tag = "readonly"; // // txt_itemModel // - this.txt_itemModel.Location = new System.Drawing.Point(414, 96); + this.txt_itemModel.Location = new System.Drawing.Point(358, 82); + this.txt_itemModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_itemModel.Name = "txt_itemModel"; - this.txt_itemModel.Size = new System.Drawing.Size(254, 24); + this.txt_itemModel.Size = new System.Drawing.Size(227, 20); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 801; this.txt_itemModel.Tag = "readonly"; // // txt_fcheckBy // - this.txt_fcheckBy.Location = new System.Drawing.Point(744, 68); + this.txt_fcheckBy.Location = new System.Drawing.Point(647, 58); + this.txt_fcheckBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fcheckBy.Name = "txt_fcheckBy"; this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true; - this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24); + this.txt_fcheckBy.Size = new System.Drawing.Size(227, 20); 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(414, 12); + this.txt_fbatchQty.Location = new System.Drawing.Point(358, 10); + this.txt_fbatchQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fbatchQty.Name = "txt_fbatchQty"; this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true; - this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24); + this.txt_fbatchQty.Size = new System.Drawing.Size(227, 20); this.txt_fbatchQty.StyleController = this.layoutMx1; this.txt_fbatchQty.TabIndex = 222; this.txt_fbatchQty.Tag = ""; // // txt_fsubmitBy // - this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 96); + this.txt_fsubmitBy.Location = new System.Drawing.Point(936, 82); + this.txt_fsubmitBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fsubmitBy.Name = "txt_fsubmitBy"; - this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24); + this.txt_fsubmitBy.Size = new System.Drawing.Size(227, 20); 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(1074, 68); + this.txt_fsubmitDate.Location = new System.Drawing.Point(936, 58); + this.txt_fsubmitDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fsubmitDate.Name = "txt_fsubmitDate"; - this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24); + this.txt_fsubmitDate.Size = new System.Drawing.Size(227, 20); 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(1002, 124); + this.txt_fsubmit.Location = new System.Drawing.Point(878, 106); + this.txt_fsubmit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fsubmit.Name = "txt_fsubmit"; this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_fsubmit.Size = new System.Drawing.Size(328, 24); + this.txt_fsubmit.Size = new System.Drawing.Size(285, 20); this.txt_fsubmit.StyleController = this.layoutMx1; this.txt_fsubmit.TabIndex = 806; this.txt_fsubmit.Tag = "readonly"; // // txt_guid // - this.txt_guid.Location = new System.Drawing.Point(1065, 108); + this.txt_guid.Location = new System.Drawing.Point(932, 84); + this.txt_guid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_guid.Name = "txt_guid"; - this.txt_guid.Size = new System.Drawing.Size(244, 24); + this.txt_guid.Size = new System.Drawing.Size(214, 20); this.txt_guid.StyleController = this.layoutMx1; this.txt_guid.TabIndex = 808; this.txt_guid.Tag = "readonly"; // // txt_lotNo // - this.txt_lotNo.Location = new System.Drawing.Point(84, 40); + this.txt_lotNo.Location = new System.Drawing.Point(69, 34); + this.txt_lotNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_lotNo.Name = "txt_lotNo"; - this.txt_lotNo.Size = new System.Drawing.Size(254, 24); + this.txt_lotNo.Size = new System.Drawing.Size(227, 20); this.txt_lotNo.StyleController = this.layoutMx1; this.txt_lotNo.TabIndex = 815; this.txt_lotNo.Tag = "readonly"; // // txt_checkStates // - this.txt_checkStates.Location = new System.Drawing.Point(744, 96); + this.txt_checkStates.Location = new System.Drawing.Point(647, 82); + this.txt_checkStates.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); 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(254, 24); + this.txt_checkStates.Size = new System.Drawing.Size(227, 20); this.txt_checkStates.StyleController = this.layoutMx1; this.txt_checkStates.TabIndex = 819; this.txt_checkStates.Tag = "readonly"; // // txt_createBy // - this.txt_createBy.Location = new System.Drawing.Point(1074, 12); + this.txt_createBy.Location = new System.Drawing.Point(936, 10); + this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_createBy.Name = "txt_createBy"; - this.txt_createBy.Size = new System.Drawing.Size(256, 24); + this.txt_createBy.Size = new System.Drawing.Size(227, 20); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 822; this.txt_createBy.Tag = "readonly"; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(1074, 40); + this.txt_createDate.Location = new System.Drawing.Point(936, 34); + this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_createDate.Name = "txt_createDate"; - this.txt_createDate.Size = new System.Drawing.Size(256, 24); + this.txt_createDate.Size = new System.Drawing.Size(227, 20); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 823; this.txt_createDate.Tag = "readonly"; // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(84, 96); + this.txt_itemName.Location = new System.Drawing.Point(69, 82); + this.txt_itemName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_itemName.Name = "txt_itemName"; - this.txt_itemName.Size = new System.Drawing.Size(254, 24); + this.txt_itemName.Size = new System.Drawing.Size(227, 20); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 825; this.txt_itemName.Tag = "readonly"; // // txt_lineName // - this.txt_lineName.Location = new System.Drawing.Point(414, 40); + this.txt_lineName.Location = new System.Drawing.Point(358, 34); + this.txt_lineName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_lineName.Name = "txt_lineName"; - this.txt_lineName.Size = new System.Drawing.Size(254, 24); + this.txt_lineName.Size = new System.Drawing.Size(227, 20); this.txt_lineName.StyleController = this.layoutMx1; this.txt_lineName.TabIndex = 826; // // txt_itemId // - this.txt_itemId.Location = new System.Drawing.Point(84, 68); + this.txt_itemId.Location = new System.Drawing.Point(69, 58); + this.txt_itemId.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_itemId.Name = "txt_itemId"; - this.txt_itemId.Size = new System.Drawing.Size(254, 24); + this.txt_itemId.Size = new System.Drawing.Size(227, 20); this.txt_itemId.StyleController = this.layoutMx1; this.txt_itemId.TabIndex = 827; // // txt_fngDesc // - this.txt_fngDesc.Location = new System.Drawing.Point(84, 152); + this.txt_fngDesc.Location = new System.Drawing.Point(69, 130); + this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fngDesc.Name = "txt_fngDesc"; - this.txt_fngDesc.Size = new System.Drawing.Size(584, 24); + this.txt_fngDesc.Size = new System.Drawing.Size(516, 20); this.txt_fngDesc.StyleController = this.layoutMx1; this.txt_fngDesc.TabIndex = 828; // @@ -1029,7 +1071,7 @@ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem21.Size = new System.Drawing.Size(326, 32); this.layoutControlItem21.Text = "涓婚敭GUID"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20); + this.layoutControlItem21.TextSize = new System.Drawing.Size(44, 16); // // Root // @@ -1090,70 +1132,70 @@ rowDefinition4, rowDefinition5, rowDefinition6}); - this.Root.Size = new System.Drawing.Size(1342, 188); + this.Root.Size = new System.Drawing.Size(1174, 160); this.Root.TextVisible = false; // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_fbatchQty; - this.layoutControlItem9.Location = new System.Drawing.Point(330, 0); + this.layoutControlItem9.Location = new System.Drawing.Point(289, 0); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem9.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem9.Size = new System.Drawing.Size(289, 24); this.layoutControlItem9.Text = "鎶芥鏁伴噺"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem9.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem31 // this.layoutControlItem31.Control = this.txt_createBy; - this.layoutControlItem31.Location = new System.Drawing.Point(990, 0); + this.layoutControlItem31.Location = new System.Drawing.Point(867, 0); this.layoutControlItem31.Name = "layoutControlItem31"; this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem31.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem31.Size = new System.Drawing.Size(289, 24); this.layoutControlItem31.Text = "鍒涘缓浜哄憳"; - this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem31.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem33 // this.layoutControlItem33.Control = this.txt_createDate; - this.layoutControlItem33.Location = new System.Drawing.Point(990, 28); + this.layoutControlItem33.Location = new System.Drawing.Point(867, 24); this.layoutControlItem33.Name = "layoutControlItem33"; this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem33.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem33.Size = new System.Drawing.Size(289, 24); this.layoutControlItem33.Text = "鍒涘缓鏃堕棿"; - this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem33.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_fsubmitDate; - this.layoutControlItem16.Location = new System.Drawing.Point(990, 56); + this.layoutControlItem16.Location = new System.Drawing.Point(867, 48); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem16.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem16.Size = new System.Drawing.Size(289, 24); this.layoutControlItem16.Text = "瀹℃牳浜哄憳"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem16.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_fsubmitBy; - this.layoutControlItem15.Location = new System.Drawing.Point(990, 84); + this.layoutControlItem15.Location = new System.Drawing.Point(867, 72); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem15.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem15.Size = new System.Drawing.Size(289, 24); this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem15.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_fsubmit; - this.layoutControlItem14.Location = new System.Drawing.Point(990, 112); + this.layoutControlItem14.Location = new System.Drawing.Point(867, 96); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem14.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem14.Size = new System.Drawing.Size(289, 24); this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; @@ -1163,158 +1205,159 @@ 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(330, 28); + this.layoutControlItem1.Size = new System.Drawing.Size(289, 24); this.layoutControlItem1.Text = "妫�楠屽崟鍙�"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem28 // this.layoutControlItem28.Control = this.txt_lotNo; - this.layoutControlItem28.Location = new System.Drawing.Point(0, 28); + this.layoutControlItem28.Location = new System.Drawing.Point(0, 24); this.layoutControlItem28.Name = "layoutControlItem28"; this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem28.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem28.Size = new System.Drawing.Size(289, 24); this.layoutControlItem28.Text = "鐢熶骇宸ュ崟"; - this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem28.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_lotNo1; - this.layoutControlItem3.Location = new System.Drawing.Point(660, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(578, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem3.Size = new System.Drawing.Size(289, 24); this.layoutControlItem3.Text = "閫佹鎵瑰彿"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_fcheckDate; - this.layoutControlItem2.Location = new System.Drawing.Point(660, 28); + this.layoutControlItem2.Location = new System.Drawing.Point(578, 24); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem2.Size = new System.Drawing.Size(289, 24); this.layoutControlItem2.Text = "妫�楠屾棩鏈�"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fcheckBy; - this.layoutControlItem8.Location = new System.Drawing.Point(660, 56); + this.layoutControlItem8.Location = new System.Drawing.Point(578, 48); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem8.Size = new System.Drawing.Size(289, 24); this.layoutControlItem8.Text = "妫�楠屼汉鍛�"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem8.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem32 // this.layoutControlItem32.Control = this.txt_checkStates; - this.layoutControlItem32.Location = new System.Drawing.Point(660, 84); + this.layoutControlItem32.Location = new System.Drawing.Point(578, 72); this.layoutControlItem32.Name = "layoutControlItem32"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem32.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem32.Size = new System.Drawing.Size(289, 24); this.layoutControlItem32.Text = "妫�楠岀姸鎬�"; - this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem32.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_fcheckResu; - this.layoutControlItem10.Location = new System.Drawing.Point(660, 112); + this.layoutControlItem10.Location = new System.Drawing.Point(578, 96); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem10.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem10.Size = new System.Drawing.Size(289, 24); this.layoutControlItem10.Text = "妫�楠岀粨鏋�"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem10.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_lineName; - this.layoutControlItem7.Location = new System.Drawing.Point(330, 28); + this.layoutControlItem7.Location = new System.Drawing.Point(289, 24); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem7.Size = new System.Drawing.Size(289, 24); this.layoutControlItem7.Text = "浜х嚎鍚嶇О"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_itemId; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 56); + this.layoutControlItem4.Location = new System.Drawing.Point(0, 48); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem4.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem4.Size = new System.Drawing.Size(289, 24); this.layoutControlItem4.Text = "浜у搧ID"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_itemNo; this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜"; - this.layoutControlItem5.Location = new System.Drawing.Point(330, 56); + this.layoutControlItem5.Location = new System.Drawing.Point(289, 48); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem5.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem5.Size = new System.Drawing.Size(289, 24); this.layoutControlItem5.Text = "鐗╂枡缂栫爜"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem34 // this.layoutControlItem34.Control = this.txt_itemName; - this.layoutControlItem34.Location = new System.Drawing.Point(0, 84); + this.layoutControlItem34.Location = new System.Drawing.Point(0, 72); this.layoutControlItem34.Name = "layoutControlItem34"; this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem34.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem34.Size = new System.Drawing.Size(289, 24); this.layoutControlItem34.Text = "浜у搧鍚嶇О"; - this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem34.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_itemModel; this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸"; - this.layoutControlItem6.Location = new System.Drawing.Point(330, 84); + this.layoutControlItem6.Location = new System.Drawing.Point(289, 72); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem6.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem6.Size = new System.Drawing.Size(289, 24); this.layoutControlItem6.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_remarks; - this.layoutControlItem12.Location = new System.Drawing.Point(0, 112); + this.layoutControlItem12.Location = new System.Drawing.Point(0, 96); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem12.Size = new System.Drawing.Size(660, 28); + this.layoutControlItem12.Size = new System.Drawing.Size(578, 24); this.layoutControlItem12.Text = "澶囨敞璇存槑"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem12.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_fngDesc; - this.layoutControlItem13.Location = new System.Drawing.Point(0, 140); + this.layoutControlItem13.Location = new System.Drawing.Point(0, 120); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem13.Size = new System.Drawing.Size(660, 28); + this.layoutControlItem13.Size = new System.Drawing.Size(578, 24); this.layoutControlItem13.Text = "寮傚父澶囨敞"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem13.TextSize = new System.Drawing.Size(48, 14); // // xtraTabControl2 // this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.xtraTabControl2.Location = new System.Drawing.Point(0, 0); + this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.tabMxPage1; - this.xtraTabControl2.Size = new System.Drawing.Size(1342, 491); + this.xtraTabControl2.Size = new System.Drawing.Size(1174, 380); this.xtraTabControl2.TabIndex = 3; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -1324,15 +1367,17 @@ // this.tabMxPage1.Controls.Add(this.splitMx2); this.tabMxPage1.Controls.Add(this.panMsg); + this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1340, 459); + this.tabMxPage1.Size = new System.Drawing.Size(1172, 354); this.tabMxPage1.Text = "鎶芥牱淇℃伅"; // // splitMx2 // this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx2.Horizontal = false; - this.splitMx2.Location = new System.Drawing.Point(0, 47); + this.splitMx2.Location = new System.Drawing.Point(0, 37); + this.splitMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.splitMx2.Name = "splitMx2"; // // splitMx2.Panel1 @@ -1344,17 +1389,19 @@ // this.splitMx2.Panel2.Controls.Add(this.splitYangLi); this.splitMx2.Panel2.Text = "Panel2"; - this.splitMx2.Size = new System.Drawing.Size(1340, 412); - this.splitMx2.SplitterPosition = 287; + this.splitMx2.Size = new System.Drawing.Size(1172, 317); + this.splitMx2.SplitterPosition = 223; this.splitMx2.TabIndex = 3; // // gcMx1 // this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; + this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMx1.Name = "gcMx1"; - this.gcMx1.Size = new System.Drawing.Size(1340, 287); + this.gcMx1.Size = new System.Drawing.Size(1172, 223); this.gcMx1.TabIndex = 1; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1363,7 +1410,7 @@ // this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true; this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; - this.gvMx1.ColumnPanelRowHeight = 50; + this.gvMx1.ColumnPanelRowHeight = 39; this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx1guid, this.gvMx1fcheckItem, @@ -1382,6 +1429,7 @@ this.gvMx1sampleSizeNo, this.gvMx1fcheckLevel, this.gvMx1facLevel}); + this.gvMx1.DetailHeight = 272; this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1393,128 +1441,128 @@ this.gvMx1guid.AppearanceCell.Options.UseFont = true; this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎"; this.gvMx1guid.FieldName = "guid"; - this.gvMx1guid.MinWidth = 50; + this.gvMx1guid.MinWidth = 44; this.gvMx1guid.Name = "gvMx1guid"; this.gvMx1guid.Tag = "query_a.guid"; - this.gvMx1guid.Width = 94; + this.gvMx1guid.Width = 82; // // gvMx1fcheckItem // this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�"; this.gvMx1fcheckItem.FieldName = "fcheckItem"; - this.gvMx1fcheckItem.MinWidth = 50; + this.gvMx1fcheckItem.MinWidth = 44; this.gvMx1fcheckItem.Name = "gvMx1fcheckItem"; this.gvMx1fcheckItem.Tag = "query_a.fcheck_item"; this.gvMx1fcheckItem.Visible = true; this.gvMx1fcheckItem.VisibleIndex = 0; - this.gvMx1fcheckItem.Width = 120; + this.gvMx1fcheckItem.Width = 105; // // gvMx1fcheckTool // this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�"; this.gvMx1fcheckTool.FieldName = "fcheckTool"; - this.gvMx1fcheckTool.MinWidth = 50; + this.gvMx1fcheckTool.MinWidth = 44; this.gvMx1fcheckTool.Name = "gvMx1fcheckTool"; this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool"; this.gvMx1fcheckTool.Visible = true; this.gvMx1fcheckTool.VisibleIndex = 1; - this.gvMx1fcheckTool.Width = 100; + this.gvMx1fcheckTool.Width = 87; // // gvMx1fcheckItemDesc // this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�"; this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc"; - this.gvMx1fcheckItemDesc.MinWidth = 50; + this.gvMx1fcheckItemDesc.MinWidth = 44; this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc"; this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc"; - this.gvMx1fcheckItemDesc.Width = 120; + this.gvMx1fcheckItemDesc.Width = 105; // // gvMx1fspecRequ // this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true; this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰"; this.gvMx1fspecRequ.FieldName = "fspecRequ"; - this.gvMx1fspecRequ.MinWidth = 50; + this.gvMx1fspecRequ.MinWidth = 44; this.gvMx1fspecRequ.Name = "gvMx1fspecRequ"; this.gvMx1fspecRequ.Tag = "query_a.fspec_requ"; this.gvMx1fspecRequ.Visible = true; this.gvMx1fspecRequ.VisibleIndex = 2; - this.gvMx1fspecRequ.Width = 120; + this.gvMx1fspecRequ.Width = 105; // // gvMx1fupAllow // this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true; this.gvMx1fupAllow.Caption = "涓婇檺"; this.gvMx1fupAllow.FieldName = "fupAllow"; - this.gvMx1fupAllow.MinWidth = 50; + this.gvMx1fupAllow.MinWidth = 44; this.gvMx1fupAllow.Name = "gvMx1fupAllow"; this.gvMx1fupAllow.Tag = "query_a.fup_allow"; this.gvMx1fupAllow.Visible = true; this.gvMx1fupAllow.VisibleIndex = 3; - this.gvMx1fupAllow.Width = 50; + this.gvMx1fupAllow.Width = 44; // // gvMx1fstand // this.gvMx1fstand.AppearanceCell.Options.UseFont = true; this.gvMx1fstand.Caption = "鏍囧噯鍊�"; this.gvMx1fstand.FieldName = "fstand"; - this.gvMx1fstand.MinWidth = 50; + this.gvMx1fstand.MinWidth = 44; this.gvMx1fstand.Name = "gvMx1fstand"; this.gvMx1fstand.Tag = "query_a.fstand"; this.gvMx1fstand.Visible = true; this.gvMx1fstand.VisibleIndex = 4; - this.gvMx1fstand.Width = 70; + this.gvMx1fstand.Width = 61; // // gvMx1fdownAllow // this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true; this.gvMx1fdownAllow.Caption = "涓嬮檺"; this.gvMx1fdownAllow.FieldName = "fdownAllow"; - this.gvMx1fdownAllow.MinWidth = 50; + this.gvMx1fdownAllow.MinWidth = 44; this.gvMx1fdownAllow.Name = "gvMx1fdownAllow"; this.gvMx1fdownAllow.Tag = "query_a.fdown_allow"; this.gvMx1fdownAllow.Visible = true; this.gvMx1fdownAllow.VisibleIndex = 5; - this.gvMx1fdownAllow.Width = 50; + this.gvMx1fdownAllow.Width = 44; // // gvMx1freQty // this.gvMx1freQty.AppearanceCell.Options.UseFont = true; this.gvMx1freQty.Caption = "RE鏁伴噺"; this.gvMx1freQty.FieldName = "freQty"; - this.gvMx1freQty.MinWidth = 50; + this.gvMx1freQty.MinWidth = 44; this.gvMx1freQty.Name = "gvMx1freQty"; this.gvMx1freQty.Tag = "query_a.fre_qty"; this.gvMx1freQty.Visible = true; this.gvMx1freQty.VisibleIndex = 6; - this.gvMx1freQty.Width = 50; + this.gvMx1freQty.Width = 44; // // gvMx1checkQyt // this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true; this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺"; this.gvMx1checkQyt.FieldName = "checkQyt"; - this.gvMx1checkQyt.MinWidth = 50; + this.gvMx1checkQyt.MinWidth = 44; this.gvMx1checkQyt.Name = "gvMx1checkQyt"; this.gvMx1checkQyt.Tag = "query_a.check_qyt"; this.gvMx1checkQyt.Visible = true; this.gvMx1checkQyt.VisibleIndex = 7; - this.gvMx1checkQyt.Width = 60; + this.gvMx1checkQyt.Width = 52; // // gvMx1fenterQty // this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true; this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�"; this.gvMx1fenterQty.FieldName = "fenterQty"; - this.gvMx1fenterQty.MinWidth = 60; + this.gvMx1fenterQty.MinWidth = 52; this.gvMx1fenterQty.Name = "gvMx1fenterQty"; this.gvMx1fenterQty.Tag = "query_a.fenter_qty"; this.gvMx1fenterQty.Visible = true; this.gvMx1fenterQty.VisibleIndex = 8; - this.gvMx1fenterQty.Width = 60; + this.gvMx1fenterQty.Width = 52; // // gvMx1fcheckResu // @@ -1525,77 +1573,78 @@ this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true; this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�"; this.gvMx1fcheckResu.FieldName = "fcheckResu"; - this.gvMx1fcheckResu.MinWidth = 50; + this.gvMx1fcheckResu.MinWidth = 44; this.gvMx1fcheckResu.Name = "gvMx1fcheckResu"; this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu"; this.gvMx1fcheckResu.Visible = true; this.gvMx1fcheckResu.VisibleIndex = 9; - this.gvMx1fcheckResu.Width = 94; + this.gvMx1fcheckResu.Width = 82; // // gvMx1fngRate // this.gvMx1fngRate.AppearanceCell.Options.UseFont = true; this.gvMx1fngRate.Caption = "涓嶈壇鐜�"; this.gvMx1fngRate.FieldName = "fngRateName"; - this.gvMx1fngRate.MinWidth = 50; + this.gvMx1fngRate.MinWidth = 44; this.gvMx1fngRate.Name = "gvMx1fngRate"; this.gvMx1fngRate.Tag = "query_a.fng_rate"; this.gvMx1fngRate.Visible = true; this.gvMx1fngRate.VisibleIndex = 10; - this.gvMx1fngRate.Width = 94; + this.gvMx1fngRate.Width = 82; // // gvMx1fngQty // this.gvMx1fngQty.AppearanceCell.Options.UseFont = true; this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟"; this.gvMx1fngQty.FieldName = "fngQty"; - this.gvMx1fngQty.MinWidth = 50; + this.gvMx1fngQty.MinWidth = 44; this.gvMx1fngQty.Name = "gvMx1fngQty"; this.gvMx1fngQty.Tag = "query_a.fng_qty"; this.gvMx1fngQty.Visible = true; this.gvMx1fngQty.VisibleIndex = 11; - this.gvMx1fngQty.Width = 50; + this.gvMx1fngQty.Width = 44; // // gvMx1sampleSizeNo // this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true; this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�"; this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo"; - this.gvMx1sampleSizeNo.MinWidth = 50; + this.gvMx1sampleSizeNo.MinWidth = 44; this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo"; this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no"; this.gvMx1sampleSizeNo.Visible = true; this.gvMx1sampleSizeNo.VisibleIndex = 12; - this.gvMx1sampleSizeNo.Width = 200; + this.gvMx1sampleSizeNo.Width = 175; // // gvMx1fcheckLevel // this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�"; this.gvMx1fcheckLevel.FieldName = "fcheckLevel"; - this.gvMx1fcheckLevel.MinWidth = 50; + this.gvMx1fcheckLevel.MinWidth = 44; this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel"; this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level"; this.gvMx1fcheckLevel.Visible = true; this.gvMx1fcheckLevel.VisibleIndex = 13; - this.gvMx1fcheckLevel.Width = 200; + this.gvMx1fcheckLevel.Width = 175; // // gvMx1facLevel // this.gvMx1facLevel.AppearanceCell.Options.UseFont = true; this.gvMx1facLevel.Caption = "鎷掓敹姘村钩"; this.gvMx1facLevel.FieldName = "facLevel"; - this.gvMx1facLevel.MinWidth = 50; + this.gvMx1facLevel.MinWidth = 44; this.gvMx1facLevel.Name = "gvMx1facLevel"; this.gvMx1facLevel.Tag = "query_a.fac_level"; this.gvMx1facLevel.Visible = true; this.gvMx1facLevel.VisibleIndex = 14; - this.gvMx1facLevel.Width = 200; + this.gvMx1facLevel.Width = 175; // // splitYangLi // this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill; this.splitYangLi.Location = new System.Drawing.Point(0, 0); + this.splitYangLi.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.splitYangLi.Name = "splitYangLi"; // // splitYangLi.Panel1 @@ -1607,8 +1656,8 @@ // this.splitYangLi.Panel2.Controls.Add(this.groupControl2); this.splitYangLi.Panel2.Text = "Panel2"; - this.splitYangLi.Size = new System.Drawing.Size(1340, 113); - this.splitYangLi.SplitterPosition = 676; + this.splitYangLi.Size = new System.Drawing.Size(1172, 84); + this.splitYangLi.SplitterPosition = 591; this.splitYangLi.TabIndex = 4; // // groupControl1 @@ -1616,18 +1665,21 @@ this.groupControl1.Controls.Add(this.gcMx2); this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupControl1.Location = new System.Drawing.Point(0, 0); + this.groupControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupControl1.Name = "groupControl1"; - this.groupControl1.Size = new System.Drawing.Size(676, 113); + this.groupControl1.Size = new System.Drawing.Size(591, 84); this.groupControl1.TabIndex = 3; this.groupControl1.Text = "妫�娴嬬粨鏋�"; // // gcMx2 // this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMx2.Location = new System.Drawing.Point(2, 28); + this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.gcMx2.Location = new System.Drawing.Point(2, 23); this.gcMx2.MainView = this.gvMx2; + this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMx2.Name = "gcMx2"; - this.gcMx2.Size = new System.Drawing.Size(672, 83); + this.gcMx2.Size = new System.Drawing.Size(587, 59); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1642,6 +1694,7 @@ this.gridColumn20, this.gridColumn21, this.gridColumn25}); + this.gvMx2.DetailHeight = 272; this.gvMx2.GridControl = this.gcMx2; this.gvMx2.Name = "gvMx2"; // @@ -1649,83 +1702,86 @@ // this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎"; this.gridColumn4.FieldName = "guid"; - this.gridColumn4.MinWidth = 25; + this.gridColumn4.MinWidth = 22; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.ReadOnly = true; - this.gridColumn4.Width = 94; + this.gridColumn4.Width = 82; // // gridColumn3 // this.gridColumn3.Caption = "椤圭洰"; this.gridColumn3.FieldName = "fcheckItem"; - this.gridColumn3.MaxWidth = 192; - this.gridColumn3.MinWidth = 25; + this.gridColumn3.MaxWidth = 168; + this.gridColumn3.MinWidth = 22; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.OptionsColumn.ReadOnly = true; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 0; - this.gridColumn3.Width = 192; + this.gridColumn3.Width = 168; // // gridColumn2 // this.gridColumn2.Caption = "鎶芥缁撴灉"; this.gridColumn2.FieldName = "fcheckResu"; - this.gridColumn2.MaxWidth = 80; - this.gridColumn2.MinWidth = 25; + this.gridColumn2.MaxWidth = 70; + this.gridColumn2.MinWidth = 22; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.ReadOnly = true; - this.gridColumn2.Width = 80; + this.gridColumn2.Width = 70; // // gridColumn20 // this.gridColumn20.Caption = "鍒ゅ畾鏍囧織"; this.gridColumn20.FieldName = "fstand"; - this.gridColumn20.MinWidth = 25; + this.gridColumn20.MinWidth = 22; this.gridColumn20.Name = "gridColumn20"; this.gridColumn20.OptionsColumn.ReadOnly = true; this.gridColumn20.Visible = true; this.gridColumn20.VisibleIndex = 1; - this.gridColumn20.Width = 94; + this.gridColumn20.Width = 82; // // gridColumn21 // this.gridColumn21.Caption = "鎿嶄綔浜�"; this.gridColumn21.FieldName = "createBy"; - this.gridColumn21.MinWidth = 25; + this.gridColumn21.MinWidth = 22; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.OptionsColumn.ReadOnly = true; this.gridColumn21.Visible = true; this.gridColumn21.VisibleIndex = 2; - this.gridColumn21.Width = 94; + this.gridColumn21.Width = 82; // // gridColumn25 // this.gridColumn25.Caption = "鎿嶄綔鏃堕棿"; this.gridColumn25.FieldName = "createDate"; - this.gridColumn25.MinWidth = 25; + this.gridColumn25.MinWidth = 22; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.OptionsColumn.ReadOnly = true; this.gridColumn25.Visible = true; this.gridColumn25.VisibleIndex = 3; - this.gridColumn25.Width = 94; + this.gridColumn25.Width = 82; // // groupControl2 // this.groupControl2.Controls.Add(this.gcMx3); this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupControl2.Location = new System.Drawing.Point(0, 0); + this.groupControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupControl2.Name = "groupControl2"; - this.groupControl2.Size = new System.Drawing.Size(652, 113); + this.groupControl2.Size = new System.Drawing.Size(571, 84); this.groupControl2.TabIndex = 4; this.groupControl2.Text = "鏍锋湰缁撴灉"; // // gcMx3 // this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMx3.Location = new System.Drawing.Point(2, 28); + this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.gcMx3.Location = new System.Drawing.Point(2, 23); this.gcMx3.MainView = this.gvMx3; + this.gcMx3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gcMx3.Name = "gcMx3"; - this.gcMx3.Size = new System.Drawing.Size(648, 83); + this.gcMx3.Size = new System.Drawing.Size(567, 59); this.gcMx3.TabIndex = 0; this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx3}); @@ -1741,6 +1797,7 @@ this.gridColumn24, this.gridColumn26, this.gridColumn27}); + this.gvMx3.DetailHeight = 272; this.gvMx3.GridControl = this.gcMx3; this.gvMx3.Name = "gvMx3"; // @@ -1748,85 +1805,86 @@ // this.gridColumn1.Caption = "guid涓嶈兘鍒犻櫎"; this.gridColumn1.FieldName = "guid"; - this.gridColumn1.MinWidth = 25; + this.gridColumn1.MinWidth = 22; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.OptionsColumn.ReadOnly = true; - this.gridColumn1.Width = 94; + this.gridColumn1.Width = 82; // // gridColumn22 // this.gridColumn22.Caption = "椤圭洰"; this.gridColumn22.FieldName = "fcheckItemd5"; - this.gridColumn22.MaxWidth = 192; - this.gridColumn22.MinWidth = 25; + this.gridColumn22.MaxWidth = 168; + this.gridColumn22.MinWidth = 22; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.OptionsColumn.ReadOnly = true; this.gridColumn22.Visible = true; this.gridColumn22.VisibleIndex = 0; - this.gridColumn22.Width = 192; + this.gridColumn22.Width = 168; // // gridColumn28 // this.gridColumn28.Caption = "鏍锋湰搴�"; this.gridColumn28.FieldName = "fcheckItem"; - this.gridColumn28.MinWidth = 25; + this.gridColumn28.MinWidth = 22; this.gridColumn28.Name = "gridColumn28"; this.gridColumn28.OptionsColumn.ReadOnly = true; this.gridColumn28.Visible = true; this.gridColumn28.VisibleIndex = 1; - this.gridColumn28.Width = 94; + this.gridColumn28.Width = 82; // // gridColumn29 // this.gridColumn29.Caption = "鏍锋湰鍊�"; this.gridColumn29.FieldName = "fcheckResu"; - this.gridColumn29.MinWidth = 25; + this.gridColumn29.MinWidth = 22; this.gridColumn29.Name = "gridColumn29"; this.gridColumn29.OptionsColumn.ReadOnly = true; this.gridColumn29.Visible = true; this.gridColumn29.VisibleIndex = 2; - this.gridColumn29.Width = 94; + this.gridColumn29.Width = 82; // // gridColumn24 // this.gridColumn24.Caption = "鍒ゅ畾鏍囧織"; this.gridColumn24.FieldName = "fstand"; - this.gridColumn24.MinWidth = 25; + this.gridColumn24.MinWidth = 22; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.OptionsColumn.ReadOnly = true; this.gridColumn24.Visible = true; this.gridColumn24.VisibleIndex = 3; - this.gridColumn24.Width = 94; + this.gridColumn24.Width = 82; // // gridColumn26 // this.gridColumn26.Caption = "鎿嶄綔浜�"; this.gridColumn26.FieldName = "createBy"; - this.gridColumn26.MinWidth = 25; + this.gridColumn26.MinWidth = 22; this.gridColumn26.Name = "gridColumn26"; this.gridColumn26.OptionsColumn.ReadOnly = true; this.gridColumn26.Visible = true; this.gridColumn26.VisibleIndex = 4; - this.gridColumn26.Width = 94; + this.gridColumn26.Width = 82; // // gridColumn27 // this.gridColumn27.Caption = "鎿嶄綔鏃堕棿"; this.gridColumn27.FieldName = "createDate"; - this.gridColumn27.MinWidth = 25; + this.gridColumn27.MinWidth = 22; this.gridColumn27.Name = "gridColumn27"; this.gridColumn27.OptionsColumn.ReadOnly = true; this.gridColumn27.Visible = true; this.gridColumn27.VisibleIndex = 5; - this.gridColumn27.Width = 94; + this.gridColumn27.Width = 82; // // panMsg // this.panMsg.Controls.Add(this.layoutMxMsg); this.panMsg.Dock = System.Windows.Forms.DockStyle.Top; this.panMsg.Location = new System.Drawing.Point(0, 0); + this.panMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panMsg.Name = "panMsg"; - this.panMsg.Size = new System.Drawing.Size(1340, 47); + this.panMsg.Size = new System.Drawing.Size(1172, 37); this.panMsg.TabIndex = 1; // // layoutMxMsg @@ -1835,30 +1893,33 @@ this.layoutMxMsg.Controls.Add(this.txtJianYan); this.layoutMxMsg.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMxMsg.Location = new System.Drawing.Point(2, 2); + this.layoutMxMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.layoutMxMsg.Name = "layoutMxMsg"; this.layoutMxMsg.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(348, 385, 812, 500); this.layoutMxMsg.Root = this.layoutControlGroup1; - this.layoutMxMsg.Size = new System.Drawing.Size(1336, 43); + this.layoutMxMsg.Size = new System.Drawing.Size(1168, 33); this.layoutMxMsg.TabIndex = 0; this.layoutMxMsg.Text = "layoutControl1"; // // btnIpt // this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.calculatenow_32x32; - this.btnIpt.Location = new System.Drawing.Point(1228, 2); + this.btnIpt.Location = new System.Drawing.Point(1074, 2); + this.btnIpt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnIpt.Name = "btnIpt"; - this.btnIpt.Size = new System.Drawing.Size(106, 36); + this.btnIpt.Size = new System.Drawing.Size(92, 27); this.btnIpt.StyleController = this.layoutMxMsg; this.btnIpt.TabIndex = 4; this.btnIpt.Text = "鏍锋湰绠$悊"; // // txtJianYan // - this.txtJianYan.Location = new System.Drawing.Point(221, 2); + this.txtJianYan.Location = new System.Drawing.Point(180, 2); + this.txtJianYan.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txtJianYan.Name = "txtJianYan"; this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F); this.txtJianYan.Properties.Appearance.Options.UseFont = true; - this.txtJianYan.Size = new System.Drawing.Size(594, 36); + this.txtJianYan.Size = new System.Drawing.Size(532, 30); this.txtJianYan.StyleController = this.layoutMxMsg; this.txtJianYan.TabIndex = 2; // @@ -1878,7 +1939,7 @@ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; columnDefinition7.Width = 100D; columnDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize; - columnDefinition8.Width = 110D; + columnDefinition8.Width = 96D; this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition5, columnDefinition6, @@ -1889,7 +1950,7 @@ this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition7}); this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43); + this.layoutControlGroup1.Size = new System.Drawing.Size(1168, 34); this.layoutControlGroup1.TextVisible = false; // // layoutControlItem11 @@ -1899,20 +1960,20 @@ this.layoutControlItem11.Location = new System.Drawing.Point(0, 0); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(817, 43); + this.layoutControlItem11.Size = new System.Drawing.Size(714, 34); this.layoutControlItem11.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(207, 18); + this.layoutControlItem11.TextSize = new System.Drawing.Size(168, 14); // // layoutControlItem20 // this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far; this.layoutControlItem20.Control = this.btnIpt; - this.layoutControlItem20.Location = new System.Drawing.Point(1226, 0); - this.layoutControlItem20.MaxSize = new System.Drawing.Size(110, 40); - this.layoutControlItem20.MinSize = new System.Drawing.Size(110, 40); + this.layoutControlItem20.Location = new System.Drawing.Point(1072, 0); + this.layoutControlItem20.MaxSize = new System.Drawing.Size(96, 31); + this.layoutControlItem20.MinSize = new System.Drawing.Size(96, 31); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem20.Size = new System.Drawing.Size(110, 43); + this.layoutControlItem20.Size = new System.Drawing.Size(96, 34); this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem20.Text = "鏍锋湰绠$悊"; this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0); @@ -1921,18 +1982,20 @@ // tabMxPage2 // this.tabMxPage2.Controls.Add(this.ucUpFileList1); + this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1340, 459); + this.tabMxPage2.Size = new System.Drawing.Size(1172, 357); this.tabMxPage2.Text = "闄勪欢淇℃伅"; // // ucUpFileList1 // this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill; this.ucUpFileList1.Location = new System.Drawing.Point(0, 0); + this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ucUpFileList1.Name = "ucUpFileList1"; this.ucUpFileList1.parentGroup = null; this.ucUpFileList1.pGuid = null; - this.ucUpFileList1.Size = new System.Drawing.Size(1340, 459); + this.ucUpFileList1.Size = new System.Drawing.Size(1172, 357); this.ucUpFileList1.TabIndex = 0; // // repositoryItemComboBox2 @@ -1948,9 +2011,10 @@ // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; - this.picCheckBox.Location = new System.Drawing.Point(921, 42); + this.picCheckBox.Location = new System.Drawing.Point(806, 33); + this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.picCheckBox.Name = "picCheckBox"; - this.picCheckBox.Size = new System.Drawing.Size(100, 50); + this.picCheckBox.Size = new System.Drawing.Size(88, 39); this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.picCheckBox.TabIndex = 6; this.picCheckBox.TabStop = false; @@ -1968,24 +2032,24 @@ // this.gridView4.Name = "gridView4"; // - // gridColumn7 + // gridColumn8 // - this.gridColumn7.Caption = "鐢熶骇缁勭粐"; - this.gridColumn7.FieldName = "fSubsidiary"; - this.gridColumn7.MinWidth = 25; - this.gridColumn7.Name = "gridColumn7"; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 23; - this.gridColumn7.Width = 94; + this.gridColumn8.Caption = "闇�姹傚崟鎹彿"; + this.gridColumn8.FieldName = "xq"; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 24; + this.gridColumn8.Width = 66; // // Frm_ShouJianDetect01 // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1344, 800); + this.ClientSize = new System.Drawing.Size(1176, 622); this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "Frm_ShouJianDetect01"; this.Text = "ipqc棣栨"; ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); @@ -2236,5 +2300,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptButtonUrl; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; } } \ No newline at end of file -- Gitblit v1.9.3