From 262746cb15ee6779f24adeca62eded6389df6ef9 Mon Sep 17 00:00:00 2001 From: cnf <3200815559@qq.com> Date: 星期四, 24 七月 2025 13:50:48 +0800 Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient --- DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 318 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 181 insertions(+), 137 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs index eacaeb1..2f48cef 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs @@ -198,9 +198,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(1129, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(988, 62); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; @@ -208,10 +209,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(1129, 602); + this.xtraTabControl1.Size = new System.Drawing.Size(988, 468); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, @@ -220,8 +222,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(1127, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(986, 442); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -230,6 +233,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 @@ -242,17 +246,19 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1127, 570); + this.split1.Size = new System.Drawing.Size(986, 442); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // // 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.Size = new System.Drawing.Size(1127, 519); + this.gcMain1.Size = new System.Drawing.Size(986, 402); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -262,7 +268,7 @@ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridView1.Appearance.Row.Options.UseFont = true; - this.gridView1.ColumnPanelRowHeight = 50; + this.gridView1.ColumnPanelRowHeight = 39; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gv_isenabled, this.gv_foneChecked, @@ -278,8 +284,9 @@ this.gridColumn16, this.gridColumn8, this.gridColumn18}); + 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; @@ -290,189 +297,190 @@ this.gv_isenabled.AppearanceCell.Options.UseFont = true; this.gv_isenabled.Caption = "鏄惁鍙敤"; this.gv_isenabled.FieldName = "isenabled"; - this.gv_isenabled.MaxWidth = 50; - this.gv_isenabled.MinWidth = 50; + this.gv_isenabled.MaxWidth = 44; + this.gv_isenabled.MinWidth = 44; this.gv_isenabled.Name = "gv_isenabled"; this.gv_isenabled.OptionsColumn.AllowEdit = false; this.gv_isenabled.Tag = "query_a.ISENABLED"; this.gv_isenabled.UnboundDataType = typeof(bool); - this.gv_isenabled.Width = 50; + this.gv_isenabled.Width = 44; // // gv_foneChecked // this.gv_foneChecked.AppearanceCell.Options.UseFont = true; this.gv_foneChecked.Caption = "瀹℃牳鏍囪"; this.gv_foneChecked.FieldName = "foneChecked"; - this.gv_foneChecked.MaxWidth = 50; - this.gv_foneChecked.MinWidth = 50; + this.gv_foneChecked.MaxWidth = 44; + this.gv_foneChecked.MinWidth = 44; this.gv_foneChecked.Name = "gv_foneChecked"; this.gv_foneChecked.OptionsColumn.AllowEdit = false; this.gv_foneChecked.Tag = "query_a.FONE_CHECKED"; this.gv_foneChecked.UnboundDataType = typeof(bool); this.gv_foneChecked.Visible = true; this.gv_foneChecked.VisibleIndex = 0; - this.gv_foneChecked.Width = 50; + this.gv_foneChecked.Width = 44; // // gridColumn7 // this.gridColumn7.Caption = "鐗╂枡ID"; this.gridColumn7.FieldName = "itemId"; - this.gridColumn7.MinWidth = 50; + this.gridColumn7.MinWidth = 44; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.AllowEdit = false; this.gridColumn7.Tag = "query_a.ITEM_ID"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 1; - this.gridColumn7.Width = 94; + this.gridColumn7.Width = 82; // // gv_itemNo // this.gv_itemNo.AppearanceCell.Options.UseFont = true; this.gv_itemNo.Caption = "鐗╂枡缂栫爜"; this.gv_itemNo.FieldName = "itemNo"; - this.gv_itemNo.MinWidth = 50; + this.gv_itemNo.MinWidth = 44; this.gv_itemNo.Name = "gv_itemNo"; this.gv_itemNo.OptionsColumn.AllowEdit = false; this.gv_itemNo.Tag = "query_b.item_no"; this.gv_itemNo.Visible = true; this.gv_itemNo.VisibleIndex = 2; - this.gv_itemNo.Width = 150; + this.gv_itemNo.Width = 131; // // gridColumn3 // this.gridColumn3.Caption = "鐗╂枡鍚嶇О"; this.gridColumn3.FieldName = "mc"; - this.gridColumn3.MinWidth = 50; + this.gridColumn3.MinWidth = 44; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.OptionsColumn.AllowEdit = false; this.gridColumn3.Tag = "query_b.item_name"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 3; - this.gridColumn3.Width = 250; + this.gridColumn3.Width = 219; // // gridColumn2 // this.gridColumn2.Caption = "鐗╂枡瑙勬牸"; this.gridColumn2.FieldName = "gg"; - this.gridColumn2.MaxWidth = 300; - this.gridColumn2.MinWidth = 50; + this.gridColumn2.MaxWidth = 262; + this.gridColumn2.MinWidth = 44; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.Tag = "query_b.item_model"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 4; - this.gridColumn2.Width = 100; + this.gridColumn2.Width = 87; // // gv_foneCheckor // this.gv_foneCheckor.AppearanceCell.Options.UseFont = true; this.gv_foneCheckor.Caption = "瀹℃牳浜�"; this.gv_foneCheckor.FieldName = "foneCheckor"; - this.gv_foneCheckor.MinWidth = 50; + this.gv_foneCheckor.MinWidth = 44; this.gv_foneCheckor.Name = "gv_foneCheckor"; this.gv_foneCheckor.OptionsColumn.AllowEdit = false; this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR"; this.gv_foneCheckor.Visible = true; this.gv_foneCheckor.VisibleIndex = 5; - this.gv_foneCheckor.Width = 94; + this.gv_foneCheckor.Width = 82; // // gv_foneCheckdate // this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true; this.gv_foneCheckdate.Caption = "瀹℃牳鏃堕棿"; this.gv_foneCheckdate.FieldName = "foneCheckdate"; - this.gv_foneCheckdate.MinWidth = 50; + this.gv_foneCheckdate.MinWidth = 44; this.gv_foneCheckdate.Name = "gv_foneCheckdate"; this.gv_foneCheckdate.OptionsColumn.AllowEdit = false; this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE"; this.gv_foneCheckdate.Visible = true; this.gv_foneCheckdate.VisibleIndex = 6; - this.gv_foneCheckdate.Width = 120; + this.gv_foneCheckdate.Width = 105; // // gridColumn1 // this.gridColumn1.Caption = "鍒朵綔浜�"; this.gridColumn1.FieldName = "createBy"; - this.gridColumn1.MinWidth = 50; + this.gridColumn1.MinWidth = 44; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.OptionsColumn.AllowEdit = false; this.gridColumn1.Tag = "query_a.CREATE_BY"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 7; - this.gridColumn1.Width = 94; + this.gridColumn1.Width = 82; // // gridColumn4 // this.gridColumn4.Caption = "鍒朵綔鏃堕棿"; this.gridColumn4.FieldName = "createDate"; - this.gridColumn4.MinWidth = 50; + this.gridColumn4.MinWidth = 44; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.AllowEdit = false; this.gridColumn4.Tag = "query_a.CREATE_DATE"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 8; - this.gridColumn4.Width = 180; + this.gridColumn4.Width = 157; // // gv_memo // this.gv_memo.AppearanceCell.Options.UseFont = true; this.gv_memo.Caption = "澶囨敞"; this.gv_memo.FieldName = "memo"; - this.gv_memo.MinWidth = 50; + this.gv_memo.MinWidth = 44; this.gv_memo.Name = "gv_memo"; this.gv_memo.OptionsColumn.AllowEdit = false; this.gv_memo.Tag = "query_a.MEMO"; this.gv_memo.Visible = true; this.gv_memo.VisibleIndex = 9; - this.gv_memo.Width = 150; + this.gv_memo.Width = 131; // // gridColumn16 // this.gridColumn16.Caption = "涓婚敭GUID"; this.gridColumn16.FieldName = "guid"; - this.gridColumn16.MinWidth = 25; + this.gridColumn16.MinWidth = 22; this.gridColumn16.Name = "gridColumn16"; - this.gridColumn16.Width = 94; + this.gridColumn16.Width = 82; // // gridColumn8 // this.gridColumn8.Caption = "浣跨敤缁勭粐"; this.gridColumn8.FieldName = "fSubsidiary"; - this.gridColumn8.MinWidth = 50; + this.gridColumn8.MinWidth = 44; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.OptionsColumn.AllowEdit = false; this.gridColumn8.Tag = "org.fnumber"; this.gridColumn8.Visible = true; this.gridColumn8.VisibleIndex = 10; - this.gridColumn8.Width = 250; + this.gridColumn8.Width = 219; // // gridColumn18 // this.gridColumn18.Caption = "绫诲埆"; this.gridColumn18.FieldName = "ftype"; - this.gridColumn18.MinWidth = 25; + this.gridColumn18.MinWidth = 22; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; this.gridColumn18.VisibleIndex = 11; - this.gridColumn18.Width = 94; + this.gridColumn18.Width = 82; // // pageBar1 // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pageBar1.Location = new System.Drawing.Point(0, 519); - this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.pageBar1.Location = new System.Drawing.Point(0, 402); + 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(1127, 39); + this.pageBar1.Size = new System.Drawing.Size(986, 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.Size = new System.Drawing.Size(1127, 570); + this.xtraTabPage2.Size = new System.Drawing.Size(986, 442); this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; // // splitMx1 @@ -480,6 +488,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 @@ -492,8 +501,8 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.splitMx1.Size = new System.Drawing.Size(1127, 570); - this.splitMx1.SplitterPosition = 113; + this.splitMx1.Size = new System.Drawing.Size(986, 442); + this.splitMx1.SplitterPosition = 88; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -515,19 +524,21 @@ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem13}); 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(599, 447, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1127, 113); + this.layoutMx1.Size = new System.Drawing.Size(986, 88); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "dataLayoutControl1"; // // btnCopy // this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.chartswitchrowcolumn_16x16; - this.btnCopy.Location = new System.Drawing.Point(565, 74); + this.btnCopy.Location = new System.Drawing.Point(495, 58); + this.btnCopy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnCopy.Name = "btnCopy"; - this.btnCopy.Size = new System.Drawing.Size(131, 27); + this.btnCopy.Size = new System.Drawing.Size(114, 20); this.btnCopy.StyleController = this.layoutMx1; this.btnCopy.TabIndex = 388; this.btnCopy.Tag = "gvBtnAlawys"; @@ -535,113 +546,124 @@ // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(825, 102); + this.lbGuid.Location = new System.Drawing.Point(722, 79); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(269, 28); + this.lbGuid.Size = new System.Drawing.Size(235, 22); this.lbGuid.TabIndex = 387; this.lbGuid.Text = "label1"; // // txt_foneCheckdate // - this.txt_foneCheckdate.Location = new System.Drawing.Point(914, 43); + this.txt_foneCheckdate.Location = new System.Drawing.Point(795, 34); + this.txt_foneCheckdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_foneCheckdate.Name = "txt_foneCheckdate"; this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true; - this.txt_foneCheckdate.Size = new System.Drawing.Size(201, 24); + this.txt_foneCheckdate.Size = new System.Drawing.Size(180, 20); this.txt_foneCheckdate.StyleController = this.layoutMx1; this.txt_foneCheckdate.TabIndex = 267; this.txt_foneCheckdate.Tag = "readOnly"; // // txt_foneCheckor // - this.txt_foneCheckor.Location = new System.Drawing.Point(914, 12); + this.txt_foneCheckor.Location = new System.Drawing.Point(795, 10); + this.txt_foneCheckor.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_foneCheckor.Name = "txt_foneCheckor"; this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true; - this.txt_foneCheckor.Size = new System.Drawing.Size(201, 24); + this.txt_foneCheckor.Size = new System.Drawing.Size(180, 20); this.txt_foneCheckor.StyleController = this.layoutMx1; this.txt_foneCheckor.TabIndex = 262; this.txt_foneCheckor.Tag = "readOnly"; // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(360, 12); + this.txt_itemNo.Location = new System.Drawing.Point(311, 10); + 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(201, 24); + this.txt_itemNo.Size = new System.Drawing.Size(180, 20); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 370; this.txt_itemNo.Tag = "readOnly"; // // txt_memo // - this.txt_memo.Location = new System.Drawing.Point(360, 74); + this.txt_memo.Location = new System.Drawing.Point(311, 58); + this.txt_memo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_memo.Name = "txt_memo"; this.txt_memo.Properties.Appearance.Options.UseFont = true; - this.txt_memo.Size = new System.Drawing.Size(201, 24); + this.txt_memo.Size = new System.Drawing.Size(180, 20); this.txt_memo.StyleController = this.layoutMx1; this.txt_memo.TabIndex = 219; // // txt_gg // - this.txt_gg.Location = new System.Drawing.Point(360, 43); + this.txt_gg.Location = new System.Drawing.Point(311, 34); + this.txt_gg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_gg.Name = "txt_gg"; - this.txt_gg.Size = new System.Drawing.Size(201, 24); + this.txt_gg.Size = new System.Drawing.Size(180, 20); this.txt_gg.StyleController = this.layoutMx1; this.txt_gg.TabIndex = 384; this.txt_gg.Tag = "readOnly"; // // txt_foneChecked // - this.txt_foneChecked.Location = new System.Drawing.Point(842, 74); + this.txt_foneChecked.Location = new System.Drawing.Point(737, 58); + this.txt_foneChecked.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_foneChecked.Name = "txt_foneChecked"; this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_foneChecked.Size = new System.Drawing.Size(273, 24); + this.txt_foneChecked.Size = new System.Drawing.Size(238, 20); this.txt_foneChecked.StyleController = this.layoutMx1; this.txt_foneChecked.TabIndex = 386; this.txt_foneChecked.Tag = "readOnly"; // // txt_ftype // - this.txt_ftype.Location = new System.Drawing.Point(637, 12); + this.txt_ftype.Location = new System.Drawing.Point(553, 10); + this.txt_ftype.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_ftype.Name = "txt_ftype"; - this.txt_ftype.Size = new System.Drawing.Size(201, 24); + this.txt_ftype.Size = new System.Drawing.Size(180, 20); this.txt_ftype.StyleController = this.layoutMx1; this.txt_ftype.TabIndex = 389; this.txt_ftype.Tag = "readOnly"; // // txt_isenabled // - this.txt_isenabled.Location = new System.Drawing.Point(565, 43); + this.txt_isenabled.Location = new System.Drawing.Point(495, 34); + this.txt_isenabled.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_isenabled.Name = "txt_isenabled"; this.txt_isenabled.Properties.Caption = "鍙敤鏍囪瘑"; - this.txt_isenabled.Size = new System.Drawing.Size(273, 24); + this.txt_isenabled.Size = new System.Drawing.Size(238, 20); this.txt_isenabled.StyleController = this.layoutMx1; this.txt_isenabled.TabIndex = 390; this.txt_isenabled.Tag = "readOnly"; // // txt_itemId // - this.txt_itemId.Location = new System.Drawing.Point(84, 12); + this.txt_itemId.Location = new System.Drawing.Point(69, 10); + this.txt_itemId.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_itemId.Name = "txt_itemId"; this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton()}); - this.txt_itemId.Size = new System.Drawing.Size(200, 24); + this.txt_itemId.Size = new System.Drawing.Size(180, 20); this.txt_itemId.StyleController = this.layoutMx1; this.txt_itemId.TabIndex = 391; // // txt_mc // - this.txt_mc.Location = new System.Drawing.Point(84, 43); + this.txt_mc.Location = new System.Drawing.Point(69, 34); + this.txt_mc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_mc.Name = "txt_mc"; - this.txt_mc.Size = new System.Drawing.Size(200, 24); + this.txt_mc.Size = new System.Drawing.Size(180, 20); this.txt_mc.StyleController = this.layoutMx1; this.txt_mc.TabIndex = 392; this.txt_mc.Tag = "readOnly"; // // txt_fSubsidiary // - this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 74); + this.txt_fSubsidiary.Location = new System.Drawing.Point(69, 58); + this.txt_fSubsidiary.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txt_fSubsidiary.Name = "txt_fSubsidiary"; - this.txt_fSubsidiary.Size = new System.Drawing.Size(200, 24); + this.txt_fSubsidiary.Size = new System.Drawing.Size(180, 20); this.txt_fSubsidiary.StyleController = this.layoutMx1; this.txt_fSubsidiary.TabIndex = 393; this.txt_fSubsidiary.Tag = "readOnly"; @@ -700,38 +722,38 @@ rowDefinition1, rowDefinition2, rowDefinition3}); - this.Root.Size = new System.Drawing.Size(1127, 113); + this.Root.Size = new System.Drawing.Size(986, 88); this.Root.TextVisible = false; // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_foneCheckor; - this.layoutControlItem10.Location = new System.Drawing.Point(830, 0); + this.layoutControlItem10.Location = new System.Drawing.Point(726, 0); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem10.Size = new System.Drawing.Size(277, 31); + this.layoutControlItem10.Size = new System.Drawing.Size(242, 24); this.layoutControlItem10.Text = "瀹℃牳浜哄憳"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem10.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_foneCheckdate; - this.layoutControlItem11.Location = new System.Drawing.Point(830, 31); + this.layoutControlItem11.Location = new System.Drawing.Point(726, 24); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem11.Size = new System.Drawing.Size(277, 31); + this.layoutControlItem11.Size = new System.Drawing.Size(242, 24); this.layoutControlItem11.Text = "瀹℃牳鏃堕棿"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem11.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_foneChecked; - this.layoutControlItem12.Location = new System.Drawing.Point(830, 62); + this.layoutControlItem12.Location = new System.Drawing.Point(726, 48); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(277, 31); + this.layoutControlItem12.Size = new System.Drawing.Size(242, 24); this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem12.TextVisible = false; @@ -739,13 +761,13 @@ // layoutControlItem14 // this.layoutControlItem14.Control = this.btnCopy; - this.layoutControlItem14.Location = new System.Drawing.Point(553, 62); - this.layoutControlItem14.MaxSize = new System.Drawing.Size(135, 31); - this.layoutControlItem14.MinSize = new System.Drawing.Size(135, 31); + this.layoutControlItem14.Location = new System.Drawing.Point(484, 48); + this.layoutControlItem14.MaxSize = new System.Drawing.Size(118, 24); + this.layoutControlItem14.MinSize = new System.Drawing.Size(118, 24); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem14.Size = new System.Drawing.Size(277, 31); + this.layoutControlItem14.Size = new System.Drawing.Size(242, 24); this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem14.Text = "澶嶅埗"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); @@ -754,31 +776,31 @@ // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_ftype; - this.layoutControlItem3.Location = new System.Drawing.Point(553, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(484, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(277, 31); + this.layoutControlItem3.Size = new System.Drawing.Size(242, 24); this.layoutControlItem3.Text = "椤圭洰鍒嗙被"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_itemNo; - this.layoutControlItem7.Location = new System.Drawing.Point(276, 0); + this.layoutControlItem7.Location = new System.Drawing.Point(242, 0); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(277, 31); + this.layoutControlItem7.Size = new System.Drawing.Size(242, 24); this.layoutControlItem7.Text = "鐗╂枡缂栫爜"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_isenabled; - this.layoutControlItem5.Location = new System.Drawing.Point(553, 31); + this.layoutControlItem5.Location = new System.Drawing.Point(484, 24); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(277, 31); + this.layoutControlItem5.Size = new System.Drawing.Size(242, 24); this.layoutControlItem5.Text = "鍙敤鏍囪瘑"; this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem5.TextVisible = false; @@ -788,59 +810,60 @@ this.layoutControlItem1.Control = this.txt_itemId; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(276, 31); + this.layoutControlItem1.Size = new System.Drawing.Size(242, 24); this.layoutControlItem1.Text = "閫夋嫨鐗╂枡"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_gg; - this.layoutControlItem8.Location = new System.Drawing.Point(276, 31); + this.layoutControlItem8.Location = new System.Drawing.Point(242, 24); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(277, 31); + this.layoutControlItem8.Size = new System.Drawing.Size(242, 24); this.layoutControlItem8.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem8.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_memo; - this.layoutControlItem2.Location = new System.Drawing.Point(276, 62); + this.layoutControlItem2.Location = new System.Drawing.Point(242, 48); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem2.Size = new System.Drawing.Size(277, 31); + this.layoutControlItem2.Size = new System.Drawing.Size(242, 24); this.layoutControlItem2.Text = "澶囨敞"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_mc; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 31); + this.layoutControlItem4.Location = new System.Drawing.Point(0, 24); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 31); + this.layoutControlItem4.Size = new System.Drawing.Size(242, 24); this.layoutControlItem4.Text = "鐗╂枡鍚嶇О"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_fSubsidiary; - this.layoutControlItem6.Location = new System.Drawing.Point(0, 62); + this.layoutControlItem6.Location = new System.Drawing.Point(0, 48); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem6.Size = new System.Drawing.Size(276, 31); + this.layoutControlItem6.Size = new System.Drawing.Size(242, 24); this.layoutControlItem6.Text = "浣跨敤缁勭粐"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14); // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMx.Location = new System.Drawing.Point(0, 0); + this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1127, 445); + this.tabMx.Size = new System.Drawing.Size(986, 344); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -848,15 +871,18 @@ // tabMxPage1 // this.tabMxPage1.Controls.Add(this.gcMx1); + this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1125, 413); + this.tabMxPage1.Size = new System.Drawing.Size(984, 318); this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�"; // // 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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.rptJYXM, @@ -869,7 +895,7 @@ this.rptStation, this.repositoryItemCheckEdit1, this.rptGroup}); - this.gcMx1.Size = new System.Drawing.Size(1125, 413); + this.gcMx1.Size = new System.Drawing.Size(984, 318); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -896,6 +922,7 @@ this.gridColumn6, this.gridColumn9, this.gridColumn10}); + this.gvMx1.DetailHeight = 272; this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -908,18 +935,20 @@ this.gvMx1guid.AppearanceCell.Options.UseFont = true; this.gvMx1guid.Caption = "瀛愯〃涓婚敭GUID"; this.gvMx1guid.FieldName = "guid"; + this.gvMx1guid.MinWidth = 17; this.gvMx1guid.Name = "gvMx1guid"; this.gvMx1guid.Tag = "query_a.guid"; - this.gvMx1guid.Width = 94; + this.gvMx1guid.Width = 82; // // gvMx1pid // this.gvMx1pid.AppearanceCell.Options.UseFont = true; this.gvMx1pid.Caption = "涓昏〃涓婚敭GUID"; this.gvMx1pid.FieldName = "pid"; + this.gvMx1pid.MinWidth = 17; this.gvMx1pid.Name = "gvMx1pid"; this.gvMx1pid.Tag = "query_a.pid"; - this.gvMx1pid.Width = 94; + this.gvMx1pid.Width = 82; // // gvMx1fcheckItem // @@ -927,11 +956,12 @@ this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�"; this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM; this.gvMx1fcheckItem.FieldName = "fcheckItem"; + this.gvMx1fcheckItem.MinWidth = 17; this.gvMx1fcheckItem.Name = "gvMx1fcheckItem"; this.gvMx1fcheckItem.Tag = "edit"; this.gvMx1fcheckItem.Visible = true; this.gvMx1fcheckItem.VisibleIndex = 0; - this.gvMx1fcheckItem.Width = 150; + this.gvMx1fcheckItem.Width = 131; // // rptJYXM // @@ -946,11 +976,12 @@ this.gvMx1forder.Caption = "椤哄簭"; this.gvMx1forder.ColumnEdit = this.rptShunXui; this.gvMx1forder.FieldName = "forder"; + this.gvMx1forder.MinWidth = 17; this.gvMx1forder.Name = "gvMx1forder"; this.gvMx1forder.Tag = "yz_quantity_0_edit"; this.gvMx1forder.Visible = true; this.gvMx1forder.VisibleIndex = 1; - this.gvMx1forder.Width = 50; + this.gvMx1forder.Width = 44; // // rptShunXui // @@ -979,20 +1010,22 @@ // this.gridColumn5.Caption = "瑙勬牸瑕佹眰"; this.gridColumn5.FieldName = "fspecRequ"; + this.gridColumn5.MinWidth = 17; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Tag = "edit"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 2; - this.gridColumn5.Width = 150; + this.gridColumn5.Width = 131; // // gvMx1memo // this.gvMx1memo.AppearanceCell.Options.UseFont = true; this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�"; this.gvMx1memo.FieldName = "memo"; + this.gvMx1memo.MinWidth = 17; this.gvMx1memo.Name = "gvMx1memo"; this.gvMx1memo.Tag = "edit"; - this.gvMx1memo.Width = 150; + this.gvMx1memo.Width = 131; // // gvMx1fcheckTool // @@ -1000,11 +1033,12 @@ this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�"; this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ; this.gvMx1fcheckTool.FieldName = "fcheckTool"; + this.gvMx1fcheckTool.MinWidth = 17; this.gvMx1fcheckTool.Name = "gvMx1fcheckTool"; this.gvMx1fcheckTool.Tag = "edit"; this.gvMx1fcheckTool.Visible = true; this.gvMx1fcheckTool.VisibleIndex = 3; - this.gvMx1fcheckTool.Width = 150; + this.gvMx1fcheckTool.Width = 131; // // rptJYGJ // @@ -1019,11 +1053,12 @@ this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�"; this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ; this.gvMx1sampleSizeNo.FieldName = "sampleSizeName"; + this.gvMx1sampleSizeNo.MinWidth = 17; this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo"; this.gvMx1sampleSizeNo.Tag = "edit"; this.gvMx1sampleSizeNo.Visible = true; this.gvMx1sampleSizeNo.VisibleIndex = 4; - this.gvMx1sampleSizeNo.Width = 150; + this.gvMx1sampleSizeNo.Width = 131; // // rptJYBZ // @@ -1038,10 +1073,11 @@ // this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�"; this.sampleSizeName.FieldName = "sampleSizeNo"; + this.sampleSizeName.MinWidth = 17; this.sampleSizeName.Name = "sampleSizeName"; this.sampleSizeName.OptionsColumn.ReadOnly = true; this.sampleSizeName.Tag = "edit"; - this.sampleSizeName.Width = 150; + this.sampleSizeName.Width = 131; // // gvMx1fcheckLevel // @@ -1049,11 +1085,12 @@ this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�"; this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP; this.gvMx1fcheckLevel.FieldName = "fcheckLevel"; + this.gvMx1fcheckLevel.MinWidth = 17; this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel"; this.gvMx1fcheckLevel.Tag = "edit"; this.gvMx1fcheckLevel.Visible = true; this.gvMx1fcheckLevel.VisibleIndex = 5; - this.gvMx1fcheckLevel.Width = 200; + this.gvMx1fcheckLevel.Width = 175; // // rptJYSP // @@ -1069,11 +1106,12 @@ this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩"; this.gvMx1facLevel.ColumnEdit = this.rptJSSP; this.gvMx1facLevel.FieldName = "facLevel"; + this.gvMx1facLevel.MinWidth = 17; this.gvMx1facLevel.Name = "gvMx1facLevel"; this.gvMx1facLevel.Tag = "edit"; this.gvMx1facLevel.Visible = true; this.gvMx1facLevel.VisibleIndex = 6; - this.gvMx1facLevel.Width = 150; + this.gvMx1facLevel.Width = 131; // // rptJSSP // @@ -1088,53 +1126,57 @@ this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true; this.gvMx1fupAllow.Caption = "涓婇檺"; this.gvMx1fupAllow.FieldName = "fupAllow"; + this.gvMx1fupAllow.MinWidth = 17; this.gvMx1fupAllow.Name = "gvMx1fupAllow"; this.gvMx1fupAllow.Tag = "yz_quantity_0_edit"; this.gvMx1fupAllow.Visible = true; this.gvMx1fupAllow.VisibleIndex = 7; - this.gvMx1fupAllow.Width = 60; + this.gvMx1fupAllow.Width = 52; // // gvMx1fstand // this.gvMx1fstand.AppearanceCell.Options.UseFont = true; this.gvMx1fstand.Caption = "鏍囧噯鍊�"; this.gvMx1fstand.FieldName = "fstand"; + this.gvMx1fstand.MinWidth = 17; this.gvMx1fstand.Name = "gvMx1fstand"; this.gvMx1fstand.Tag = "yz_quantity_0_edit"; this.gvMx1fstand.Visible = true; this.gvMx1fstand.VisibleIndex = 8; - this.gvMx1fstand.Width = 60; + this.gvMx1fstand.Width = 52; // // gvMx1fdownAllow // this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true; this.gvMx1fdownAllow.Caption = "涓嬮檺"; this.gvMx1fdownAllow.FieldName = "fdownAllow"; + this.gvMx1fdownAllow.MinWidth = 17; this.gvMx1fdownAllow.Name = "gvMx1fdownAllow"; this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit"; this.gvMx1fdownAllow.Visible = true; this.gvMx1fdownAllow.VisibleIndex = 9; - this.gvMx1fdownAllow.Width = 60; + this.gvMx1fdownAllow.Width = 52; // // gridColumn19 // this.gridColumn19.Caption = "鏍峰搧鍩烘暟"; this.gridColumn19.FieldName = "ypsl"; + this.gridColumn19.MinWidth = 17; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Tag = "edit"; this.gridColumn19.Visible = true; this.gridColumn19.VisibleIndex = 10; - this.gridColumn19.Width = 94; + this.gridColumn19.Width = 82; // // gvMxDel // this.gvMxDel.Caption = "绉婚櫎"; this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1; - this.gvMxDel.MinWidth = 50; + this.gvMxDel.MinWidth = 44; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; this.gvMxDel.VisibleIndex = 14; - this.gvMxDel.Width = 100; + this.gvMxDel.Width = 87; // // repositoryItemButtonEdit1 // @@ -1152,12 +1194,12 @@ this.gridColumn6.Caption = "宸ヤ綅"; this.gridColumn6.ColumnEdit = this.rptStation; this.gridColumn6.FieldName = "stationName"; - this.gridColumn6.MinWidth = 25; + this.gridColumn6.MinWidth = 22; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Tag = "edit"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 11; - this.gridColumn6.Width = 94; + this.gridColumn6.Width = 82; // // rptStation // @@ -1172,13 +1214,13 @@ this.gridColumn9.Caption = "鏄惁棣栨璁よ瘉"; this.gridColumn9.ColumnEdit = this.repositoryItemCheckEdit1; this.gridColumn9.FieldName = "isRzxx"; - this.gridColumn9.MinWidth = 25; + this.gridColumn9.MinWidth = 22; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Tag = "edit"; this.gridColumn9.UnboundDataType = typeof(bool); this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 12; - this.gridColumn9.Width = 94; + this.gridColumn9.Width = 82; // // repositoryItemCheckEdit1 // @@ -1190,12 +1232,12 @@ this.gridColumn10.Caption = "鎵�灞炲ぇ绫�"; this.gridColumn10.ColumnEdit = this.rptGroup; this.gridColumn10.FieldName = "fcheckType"; - this.gridColumn10.MinWidth = 25; + this.gridColumn10.MinWidth = 22; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Tag = "edit"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 13; - this.gridColumn10.Width = 94; + this.gridColumn10.Width = 82; // // rptGroup // @@ -1207,9 +1249,10 @@ // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; - this.picCheckBox.Location = new System.Drawing.Point(945, 55); + this.picCheckBox.Location = new System.Drawing.Point(827, 43); + 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; @@ -1217,13 +1260,14 @@ // // Jyxm // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 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 = "Jyxm"; - this.Size = new System.Drawing.Size(1129, 682); + this.Size = new System.Drawing.Size(988, 530); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); -- Gitblit v1.9.3