From c698fcb41fa92d6185f133e65bc16f3467ac9ed3 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 21 十一月 2024 15:37:22 +0800 Subject: [PATCH] 修改iqc基础信息维护的细节 --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs | 30 +++--- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 12 +- DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 38 ++++---- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 123 +++++++++++++++--------------- DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 2 6 files changed, 106 insertions(+), 101 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs index d2295ae..aabdbf1 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs @@ -112,7 +112,7 @@ this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1124, 485); - this.tabMxPage1.Text = "鏄庣粏1"; + this.tabMxPage1.Text = "鏄庣粏"; // // gcMx1 // diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs index e6ee9cd..76edb6b 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs @@ -12,6 +12,7 @@ using Gs.DevApp.ToolBox; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using static DevExpress.XtraPrinting.Native.PageSizeInfo; namespace Gs.DevApp.DevFrm.QC { @@ -89,6 +90,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_lookupTypeCode, gridView1); toolBarMenu1.guidKey = rowGuid; + } /// <summary> diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs index 25e4eab..a3cfde8 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs @@ -795,7 +795,7 @@ this.txt_fversion.Name = "txt_fversion"; this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_fversion.Properties.Appearance.Options.UseFont = true; - this.txt_fversion.Size = new System.Drawing.Size(150, 28); + this.txt_fversion.Size = new System.Drawing.Size(180, 28); this.txt_fversion.TabIndex = 273; // // gv_fversion @@ -816,7 +816,7 @@ // this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_ftwoCheckdate.Appearance.Options.UseFont = true; - this.lb_ftwoCheckdate.Location = new System.Drawing.Point(515, 88); + this.lb_ftwoCheckdate.Location = new System.Drawing.Point(532, 54); this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate"; this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21); this.lb_ftwoCheckdate.TabIndex = 262; @@ -825,11 +825,11 @@ // txt_ftwoCheckdate // this.txt_ftwoCheckdate.Enabled = false; - this.txt_ftwoCheckdate.Location = new System.Drawing.Point(594, 84); + this.txt_ftwoCheckdate.Location = new System.Drawing.Point(611, 50); this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate"; this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true; - this.txt_ftwoCheckdate.Size = new System.Drawing.Size(150, 28); + this.txt_ftwoCheckdate.Size = new System.Drawing.Size(165, 28); this.txt_ftwoCheckdate.TabIndex = 262; // // gv_ftwoCheckdate @@ -850,7 +850,7 @@ // this.lb_ftwoCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_ftwoCheckor.Appearance.Options.UseFont = true; - this.lb_ftwoCheckor.Location = new System.Drawing.Point(532, 54); + this.lb_ftwoCheckor.Location = new System.Drawing.Point(549, 20); this.lb_ftwoCheckor.Name = "lb_ftwoCheckor"; this.lb_ftwoCheckor.Size = new System.Drawing.Size(56, 21); this.lb_ftwoCheckor.TabIndex = 258; @@ -859,11 +859,11 @@ // txt_ftwoCheckor // this.txt_ftwoCheckor.Enabled = false; - this.txt_ftwoCheckor.Location = new System.Drawing.Point(594, 50); + this.txt_ftwoCheckor.Location = new System.Drawing.Point(611, 16); this.txt_ftwoCheckor.Name = "txt_ftwoCheckor"; this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true; - this.txt_ftwoCheckor.Size = new System.Drawing.Size(150, 28); + this.txt_ftwoCheckor.Size = new System.Drawing.Size(165, 28); this.txt_ftwoCheckor.TabIndex = 258; // // gv_ftwoCheckor @@ -884,7 +884,7 @@ // this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_ftwoChecked.Appearance.Options.UseFont = true; - this.lb_ftwoChecked.Location = new System.Drawing.Point(515, 20); + this.lb_ftwoChecked.Location = new System.Drawing.Point(532, 88); this.lb_ftwoChecked.Name = "lb_ftwoChecked"; this.lb_ftwoChecked.Size = new System.Drawing.Size(73, 21); this.lb_ftwoChecked.TabIndex = 252; @@ -908,7 +908,7 @@ // this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_foneCheckdate.Appearance.Options.UseFont = true; - this.lb_foneCheckdate.Location = new System.Drawing.Point(761, 88); + this.lb_foneCheckdate.Location = new System.Drawing.Point(782, 54); this.lb_foneCheckdate.Name = "lb_foneCheckdate"; this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21); this.lb_foneCheckdate.TabIndex = 247; @@ -917,11 +917,11 @@ // txt_foneCheckdate // this.txt_foneCheckdate.Enabled = false; - this.txt_foneCheckdate.Location = new System.Drawing.Point(837, 84); + this.txt_foneCheckdate.Location = new System.Drawing.Point(858, 50); this.txt_foneCheckdate.Name = "txt_foneCheckdate"; this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true; - this.txt_foneCheckdate.Size = new System.Drawing.Size(150, 28); + this.txt_foneCheckdate.Size = new System.Drawing.Size(177, 28); this.txt_foneCheckdate.TabIndex = 247; // // gv_foneCheckdate @@ -942,7 +942,7 @@ // this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_foneCheckor.Appearance.Options.UseFont = true; - this.lb_foneCheckor.Location = new System.Drawing.Point(778, 54); + this.lb_foneCheckor.Location = new System.Drawing.Point(799, 20); this.lb_foneCheckor.Name = "lb_foneCheckor"; this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21); this.lb_foneCheckor.TabIndex = 243; @@ -951,11 +951,11 @@ // txt_foneCheckor // this.txt_foneCheckor.Enabled = false; - this.txt_foneCheckor.Location = new System.Drawing.Point(837, 50); + this.txt_foneCheckor.Location = new System.Drawing.Point(858, 16); this.txt_foneCheckor.Name = "txt_foneCheckor"; this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true; - this.txt_foneCheckor.Size = new System.Drawing.Size(150, 28); + this.txt_foneCheckor.Size = new System.Drawing.Size(177, 28); this.txt_foneCheckor.TabIndex = 243; // // gv_foneCheckor @@ -976,7 +976,7 @@ // this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_foneChecked.Appearance.Options.UseFont = true; - this.lb_foneChecked.Location = new System.Drawing.Point(761, 20); + this.lb_foneChecked.Location = new System.Drawing.Point(782, 88); this.lb_foneChecked.Name = "lb_foneChecked"; this.lb_foneChecked.Size = new System.Drawing.Size(73, 21); this.lb_foneChecked.TabIndex = 240; @@ -1112,7 +1112,7 @@ this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(150, 28); + this.txt_createDate.Size = new System.Drawing.Size(180, 28); this.txt_createDate.TabIndex = 216; // // lb_createName @@ -1132,7 +1132,7 @@ this.txt_createName.Name = "txt_createName"; this.txt_createName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createName.Properties.Appearance.Options.UseFont = true; - this.txt_createName.Size = new System.Drawing.Size(150, 28); + this.txt_createName.Size = new System.Drawing.Size(180, 28); this.txt_createName.TabIndex = 213; // // gv_createName @@ -1306,7 +1306,7 @@ // txt_ftwoChecked // this.txt_ftwoChecked.Enabled = false; - this.txt_ftwoChecked.Location = new System.Drawing.Point(594, 18); + this.txt_ftwoChecked.Location = new System.Drawing.Point(611, 86); this.txt_ftwoChecked.Name = "txt_ftwoChecked"; this.txt_ftwoChecked.Properties.Caption = ""; this.txt_ftwoChecked.Size = new System.Drawing.Size(94, 24); @@ -1315,7 +1315,7 @@ // txt_foneChecked // this.txt_foneChecked.Enabled = false; - this.txt_foneChecked.Location = new System.Drawing.Point(837, 18); + this.txt_foneChecked.Location = new System.Drawing.Point(858, 86); this.txt_foneChecked.Name = "txt_foneChecked"; this.txt_foneChecked.Properties.Caption = ""; this.txt_foneChecked.Size = new System.Drawing.Size(94, 24); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs index 22376bb..dc9108e 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs @@ -349,8 +349,8 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1073, 371); - this.tabMxPage1.Text = "鏄庣粏1"; + this.tabMxPage1.Size = new System.Drawing.Size(1125, 371); + this.tabMxPage1.Text = "鏄庣粏"; // // gcMx1 // @@ -365,7 +365,7 @@ this.rptJSSP, this.rptJYSP, this.repositoryItemButtonEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1073, 371); + this.gcMx1.Size = new System.Drawing.Size(1125, 371); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -441,7 +441,7 @@ // this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_tname.Appearance.Options.UseFont = true; - this.lb_tname.Location = new System.Drawing.Point(3, 59); + this.lb_tname.Location = new System.Drawing.Point(9, 59); this.lb_tname.Name = "lb_tname"; this.lb_tname.Size = new System.Drawing.Size(68, 21); this.lb_tname.TabIndex = 370; @@ -461,7 +461,7 @@ // this.lb_isenabled.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_isenabled.Appearance.Options.UseFont = true; - this.lb_isenabled.Location = new System.Drawing.Point(978, 92); + this.lb_isenabled.Location = new System.Drawing.Point(989, 96); this.lb_isenabled.Name = "lb_isenabled"; this.lb_isenabled.Size = new System.Drawing.Size(73, 21); this.lb_isenabled.TabIndex = 306; @@ -485,7 +485,7 @@ // this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_fversion.Appearance.Options.UseFont = true; - this.lb_fversion.Location = new System.Drawing.Point(389, 131); + this.lb_fversion.Location = new System.Drawing.Point(389, 139); this.lb_fversion.Name = "lb_fversion"; this.lb_fversion.Size = new System.Drawing.Size(39, 21); this.lb_fversion.TabIndex = 298; @@ -493,11 +493,11 @@ // // txt_fversion // - this.txt_fversion.Location = new System.Drawing.Point(433, 127); + this.txt_fversion.Location = new System.Drawing.Point(433, 132); this.txt_fversion.Name = "txt_fversion"; this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_fversion.Properties.Appearance.Options.UseFont = true; - this.txt_fversion.Size = new System.Drawing.Size(150, 28); + this.txt_fversion.Size = new System.Drawing.Size(175, 28); this.txt_fversion.TabIndex = 298; // // gv_fversion @@ -511,14 +511,14 @@ this.gv_fversion.OptionsColumn.AllowEdit = false; this.gv_fversion.Tag = "query_a.FVERSION"; this.gv_fversion.Visible = true; - this.gv_fversion.VisibleIndex = 9; + this.gv_fversion.VisibleIndex = 8; this.gv_fversion.Width = 94; // // lb_ftwoCheckdate // this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_ftwoCheckdate.Appearance.Options.UseFont = true; - this.lb_ftwoCheckdate.Location = new System.Drawing.Point(601, 53); + this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 59); this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate"; this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21); this.lb_ftwoCheckdate.TabIndex = 285; @@ -527,18 +527,18 @@ // txt_ftwoCheckdate // this.txt_ftwoCheckdate.Enabled = false; - this.txt_ftwoCheckdate.Location = new System.Drawing.Point(674, 49); + this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 55); this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate"; this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true; - this.txt_ftwoCheckdate.Size = new System.Drawing.Size(150, 28); + this.txt_ftwoCheckdate.Size = new System.Drawing.Size(158, 28); this.txt_ftwoCheckdate.TabIndex = 285; // // lb_ftwoCheckor // this.lb_ftwoCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_ftwoCheckor.Appearance.Options.UseFont = true; - this.lb_ftwoCheckor.Location = new System.Drawing.Point(618, 19); + this.lb_ftwoCheckor.Location = new System.Drawing.Point(629, 20); this.lb_ftwoCheckor.Name = "lb_ftwoCheckor"; this.lb_ftwoCheckor.Size = new System.Drawing.Size(56, 21); this.lb_ftwoCheckor.TabIndex = 280; @@ -547,11 +547,11 @@ // txt_ftwoCheckor // this.txt_ftwoCheckor.Enabled = false; - this.txt_ftwoCheckor.Location = new System.Drawing.Point(674, 15); + this.txt_ftwoCheckor.Location = new System.Drawing.Point(685, 16); this.txt_ftwoCheckor.Name = "txt_ftwoCheckor"; this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true; - this.txt_ftwoCheckor.Size = new System.Drawing.Size(150, 28); + this.txt_ftwoCheckor.Size = new System.Drawing.Size(158, 28); this.txt_ftwoCheckor.TabIndex = 280; // // gv_ftwoCheckor @@ -565,14 +565,14 @@ this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false; this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR"; this.gv_ftwoCheckor.Visible = true; - this.gv_ftwoCheckor.VisibleIndex = 12; + this.gv_ftwoCheckor.VisibleIndex = 11; this.gv_ftwoCheckor.Width = 94; // // lb_ftwoChecked // this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_ftwoChecked.Appearance.Options.UseFont = true; - this.lb_ftwoChecked.Location = new System.Drawing.Point(601, 93); + this.lb_ftwoChecked.Location = new System.Drawing.Point(612, 96); this.lb_ftwoChecked.Name = "lb_ftwoChecked"; this.lb_ftwoChecked.Size = new System.Drawing.Size(73, 21); this.lb_ftwoChecked.TabIndex = 273; @@ -596,7 +596,7 @@ // this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_foneCheckdate.Appearance.Options.UseFont = true; - this.lb_foneCheckdate.Location = new System.Drawing.Point(838, 53); + this.lb_foneCheckdate.Location = new System.Drawing.Point(849, 59); this.lb_foneCheckdate.Name = "lb_foneCheckdate"; this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21); this.lb_foneCheckdate.TabIndex = 267; @@ -605,11 +605,11 @@ // txt_foneCheckdate // this.txt_foneCheckdate.Enabled = false; - this.txt_foneCheckdate.Location = new System.Drawing.Point(917, 49); + this.txt_foneCheckdate.Location = new System.Drawing.Point(928, 55); this.txt_foneCheckdate.Name = "txt_foneCheckdate"; this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true; - this.txt_foneCheckdate.Size = new System.Drawing.Size(150, 28); + this.txt_foneCheckdate.Size = new System.Drawing.Size(172, 28); this.txt_foneCheckdate.TabIndex = 267; // // gv_foneCheckdate @@ -618,19 +618,19 @@ 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 = 120; 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 = 11; - this.gv_foneCheckdate.Width = 94; + this.gv_foneCheckdate.VisibleIndex = 10; + this.gv_foneCheckdate.Width = 120; // // lb_foneCheckor // this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_foneCheckor.Appearance.Options.UseFont = true; - this.lb_foneCheckor.Location = new System.Drawing.Point(855, 19); + this.lb_foneCheckor.Location = new System.Drawing.Point(866, 20); this.lb_foneCheckor.Name = "lb_foneCheckor"; this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21); this.lb_foneCheckor.TabIndex = 262; @@ -639,11 +639,11 @@ // txt_foneCheckor // this.txt_foneCheckor.Enabled = false; - this.txt_foneCheckor.Location = new System.Drawing.Point(917, 15); + this.txt_foneCheckor.Location = new System.Drawing.Point(928, 16); this.txt_foneCheckor.Name = "txt_foneCheckor"; this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true; - this.txt_foneCheckor.Size = new System.Drawing.Size(150, 28); + this.txt_foneCheckor.Size = new System.Drawing.Size(172, 28); this.txt_foneCheckor.TabIndex = 262; // // gv_foneCheckor @@ -652,19 +652,19 @@ 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 = 80; 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 = 10; + this.gv_foneCheckor.VisibleIndex = 9; this.gv_foneCheckor.Width = 94; // // lb_foneChecked // this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_foneChecked.Appearance.Options.UseFont = true; - this.lb_foneChecked.Location = new System.Drawing.Point(838, 93); + this.lb_foneChecked.Location = new System.Drawing.Point(849, 96); this.lb_foneChecked.Name = "lb_foneChecked"; this.lb_foneChecked.Size = new System.Drawing.Size(73, 21); this.lb_foneChecked.TabIndex = 258; @@ -688,7 +688,7 @@ // this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_itemNo.Appearance.Options.UseFont = true; - this.lb_itemNo.Location = new System.Drawing.Point(3, 20); + this.lb_itemNo.Location = new System.Drawing.Point(9, 20); this.lb_itemNo.Name = "lb_itemNo"; this.lb_itemNo.Size = new System.Drawing.Size(68, 21); this.lb_itemNo.TabIndex = 222; @@ -712,7 +712,7 @@ // this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_memo.Appearance.Options.UseFont = true; - this.lb_memo.Location = new System.Drawing.Point(389, 93); + this.lb_memo.Location = new System.Drawing.Point(389, 96); this.lb_memo.Name = "lb_memo"; this.lb_memo.Size = new System.Drawing.Size(39, 21); this.lb_memo.TabIndex = 219; @@ -720,11 +720,11 @@ // // txt_memo // - this.txt_memo.Location = new System.Drawing.Point(433, 89); + this.txt_memo.Location = new System.Drawing.Point(433, 96); this.txt_memo.Name = "txt_memo"; this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_memo.Properties.Appearance.Options.UseFont = true; - this.txt_memo.Size = new System.Drawing.Size(150, 28); + this.txt_memo.Size = new System.Drawing.Size(175, 28); this.txt_memo.TabIndex = 219; // // gv_memo @@ -733,13 +733,13 @@ 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 = 150; 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 = 14; - this.gv_memo.Width = 94; + this.gv_memo.Width = 150; // // toolBarMenu1 // @@ -750,7 +750,7 @@ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; - this.toolBarMenu1.Size = new System.Drawing.Size(1077, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(1129, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; @@ -762,15 +762,18 @@ this.gcMain.Location = new System.Drawing.Point(0, 0); this.gcMain.MainView = this.gridView1; this.gcMain.Name = "gcMain"; - this.gcMain.Size = new System.Drawing.Size(1075, 531); + this.gcMain.Size = new System.Drawing.Size(1127, 531); this.gcMain.TabIndex = 1; this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); // // gridView1 // + this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); this.gridView1.Appearance.Row.Options.UseFont = true; + this.gridView1.ColumnPanelRowHeight = 50; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn8, this.gv_isenabled, @@ -809,7 +812,7 @@ // this.gridColumn7.Caption = "鐗╂枡ID"; this.gridColumn7.FieldName = "itemId"; - this.gridColumn7.MinWidth = 25; + this.gridColumn7.MinWidth = 80; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.AllowEdit = false; this.gridColumn7.Visible = true; @@ -831,34 +834,34 @@ // this.gridColumn2.Caption = "鐗╂枡瑙勬牸"; this.gridColumn2.FieldName = "gg"; - this.gridColumn2.MinWidth = 25; + this.gridColumn2.MinWidth = 100; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 7; - this.gridColumn2.Width = 94; + this.gridColumn2.Width = 100; // // gridColumn1 // this.gridColumn1.Caption = "鍒朵綔浜�"; this.gridColumn1.FieldName = "createBy"; - this.gridColumn1.MinWidth = 25; + this.gridColumn1.MinWidth = 50; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.OptionsColumn.AllowEdit = false; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 13; + this.gridColumn1.VisibleIndex = 12; this.gridColumn1.Width = 94; // // gridColumn4 // this.gridColumn4.Caption = "鍒朵綔鏃堕棿"; this.gridColumn4.FieldName = "createDate"; - this.gridColumn4.MinWidth = 25; + this.gridColumn4.MinWidth = 180; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.AllowEdit = false; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 8; - this.gridColumn4.Width = 94; + this.gridColumn4.VisibleIndex = 13; + this.gridColumn4.Width = 180; // // xtraTabControl1 // @@ -866,7 +869,7 @@ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1077, 602); + this.xtraTabControl1.Size = new System.Drawing.Size(1129, 602); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, @@ -877,7 +880,7 @@ this.xtraTabPage1.Controls.Add(this.gcMain); this.xtraTabPage1.Controls.Add(this.pageBar1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1075, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(1127, 570); this.xtraTabPage1.Text = "鏁版嵁鏌ヨ"; // // pageBar1 @@ -889,7 +892,7 @@ this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; this.pageBar1.RowsCount = 50; - this.pageBar1.Size = new System.Drawing.Size(1075, 39); + this.pageBar1.Size = new System.Drawing.Size(1127, 39); this.pageBar1.TabIndex = 3; this.pageBar1.TotalPages = 0; // @@ -899,7 +902,7 @@ this.xtraTabPage2.Controls.Add(this.panel1); this.xtraTabPage2.Name = "xtraTabPage2"; this.xtraTabPage2.PageEnabled = false; - this.xtraTabPage2.Size = new System.Drawing.Size(1075, 570); + this.xtraTabPage2.Size = new System.Drawing.Size(1127, 570); this.xtraTabPage2.Text = "鏁版嵁缂栬緫"; // // tabMx @@ -908,7 +911,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 167); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1075, 403); + this.tabMx.Size = new System.Drawing.Size(1127, 403); this.tabMx.TabIndex = 2; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -950,13 +953,13 @@ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1075, 167); + this.panel1.Size = new System.Drawing.Size(1127, 167); this.panel1.TabIndex = 1; // // btnSelect // this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; - this.btnSelect.Location = new System.Drawing.Point(601, 127); + this.btnSelect.Location = new System.Drawing.Point(612, 131); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(85, 29); this.btnSelect.TabIndex = 449; @@ -965,7 +968,7 @@ // txt_itemModel // this.txt_itemModel.Enabled = false; - this.txt_itemModel.Location = new System.Drawing.Point(85, 95); + this.txt_itemModel.Location = new System.Drawing.Point(85, 96); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_itemModel.Properties.Appearance.Options.UseFont = true; @@ -985,7 +988,7 @@ // // txt_isenabled // - this.txt_isenabled.Location = new System.Drawing.Point(1051, 90); + this.txt_isenabled.Location = new System.Drawing.Point(1062, 96); this.txt_isenabled.Name = "txt_isenabled"; this.txt_isenabled.Properties.Caption = ""; this.txt_isenabled.Size = new System.Drawing.Size(27, 24); @@ -994,7 +997,7 @@ // txt_ftwoChecked // this.txt_ftwoChecked.Enabled = false; - this.txt_ftwoChecked.Location = new System.Drawing.Point(674, 91); + this.txt_ftwoChecked.Location = new System.Drawing.Point(685, 96); this.txt_ftwoChecked.Name = "txt_ftwoChecked"; this.txt_ftwoChecked.Properties.Caption = ""; this.txt_ftwoChecked.Size = new System.Drawing.Size(94, 24); @@ -1003,7 +1006,7 @@ // txt_foneChecked // this.txt_foneChecked.Enabled = false; - this.txt_foneChecked.Location = new System.Drawing.Point(917, 91); + this.txt_foneChecked.Location = new System.Drawing.Point(928, 96); this.txt_foneChecked.Name = "txt_foneChecked"; this.txt_foneChecked.Properties.Caption = ""; this.txt_foneChecked.Size = new System.Drawing.Size(94, 24); @@ -1013,7 +1016,7 @@ // this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_itemModel.Appearance.Options.UseFont = true; - this.lb_itemModel.Location = new System.Drawing.Point(8, 96); + this.lb_itemModel.Location = new System.Drawing.Point(9, 96); this.lb_itemModel.Name = "lb_itemModel"; this.lb_itemModel.Size = new System.Drawing.Size(68, 21); this.lb_itemModel.TabIndex = 375; @@ -1036,7 +1039,7 @@ this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(150, 28); + this.txt_createDate.Size = new System.Drawing.Size(175, 28); this.txt_createDate.TabIndex = 374; // // labelUserName @@ -1056,7 +1059,7 @@ this.txt_userName.Name = "txt_userName"; this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_userName.Properties.Appearance.Options.UseFont = true; - this.txt_userName.Size = new System.Drawing.Size(150, 28); + this.txt_userName.Size = new System.Drawing.Size(175, 28); this.txt_userName.TabIndex = 372; // // lbGuid @@ -1082,7 +1085,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1077, 682); + this.ClientSize = new System.Drawing.Size(1129, 682); this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs index 752f3b7..dd56432 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs @@ -268,7 +268,7 @@ { toolBarMenu1.isSetBtn = false; string _ItemId = txt_ItemId.GetId() -; if (string.IsNullOrEmpty(_ItemId)) +; if (string.IsNullOrEmpty(_ItemId)) { MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�"); txt_ItemId.Focus(); @@ -292,7 +292,7 @@ Fstand = row["Fstand"].ToString(), FacLevel = row["FacLevel"].ToString(), FspecRequ = row["FspecRequ"].ToString(), - Memo = row["memo"].ToString(), + Memo = row["memo"].ToString(), FupAllow = row["FupAllow"].ToString(), FdownAllow = row["FdownAllow"].ToString(), }); @@ -306,7 +306,7 @@ ItemNo = txt_itemNo.Text.Trim(), Isenabled = txt_isenabled.Checked, Ftype = "1", - Fversion =Gs.DevApp.ToolBox.UtilityHelper.ToLong( txt_fversion.Text.Trim()), + Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()), list = lst }; try @@ -351,7 +351,7 @@ try { var strReturn = UtilityHelper.HttpPost("", - // _webServiceName + "GetListPageIQC", json); + // _webServiceName + "GetListPageIQC", json); _webServiceName + "GetListPage", json); var dd = UtilityHelper.ReturnToTablePage(strReturn); @@ -395,7 +395,7 @@ try { var strJson = UtilityHelper.HttpPost("", - // _webServiceName + "GetModelIQC", + // _webServiceName + "GetModelIQC", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); var _rtn = @@ -646,7 +646,7 @@ gvMx1.UpdateCurrentRow(); gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val); gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt); - + } } private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs index 903d352..f0e49c9 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs @@ -1,7 +1,7 @@ /* Create By GS EasyCode */ namespace Gs.DevApp.DevFrm.QC { - partial class Frm_MesSysLookups + partial class Frm_MesSysLookups { /// <summary> /// Required designer variable. @@ -112,7 +112,7 @@ this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1124, 478); - this.tabMxPage1.Text = "鏄庣粏1"; + this.tabMxPage1.Text = "鏄庣粏"; // // gcMx1 // @@ -441,7 +441,7 @@ } #endregion - private UserControl.UcToolBarMenu toolBarMenu1; + private UserControl.UcToolBarMenu toolBarMenu1; private DevExpress.XtraGrid.GridControl gcMain; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraTab.XtraTabControl xtraTabControl1; @@ -451,20 +451,20 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraEditors.LabelControl labelControl11; - private DevExpress.XtraTab.XtraTabControl tabMx; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupName; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupValue; - private DevExpress.XtraTab.XtraTabPage tabMxPage1; - private DevExpress.XtraGrid.GridControl gcMx1; - private DevExpress.XtraGrid.Views.Grid.GridView gvMx1; + private DevExpress.XtraTab.XtraTabControl tabMx; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupName; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1lookupValue; + private DevExpress.XtraTab.XtraTabPage tabMxPage1; + private DevExpress.XtraGrid.GridControl gcMx1; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx1; -private DevExpress.XtraEditors.LabelControl lb_lookupTypeName; -private DevExpress.XtraEditors.TextEdit txt_lookupTypeName; - private DevExpress.XtraGrid.Columns.GridColumn gv_lookupTypeName; + private DevExpress.XtraEditors.LabelControl lb_lookupTypeName; + private DevExpress.XtraEditors.TextEdit txt_lookupTypeName; + private DevExpress.XtraGrid.Columns.GridColumn gv_lookupTypeName; -private DevExpress.XtraEditors.LabelControl lb_lookupTypeCode; -private DevExpress.XtraEditors.TextEdit txt_lookupTypeCode; - private DevExpress.XtraGrid.Columns.GridColumn gv_lookupTypeCode; + private DevExpress.XtraEditors.LabelControl lb_lookupTypeCode; + private DevExpress.XtraEditors.TextEdit txt_lookupTypeCode; + private DevExpress.XtraGrid.Columns.GridColumn gv_lookupTypeCode; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; -- Gitblit v1.9.3