From 236874a930147c27e46c673d8c1a607f1260e8aa Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期一, 31 三月 2025 12:43:43 +0800 Subject: [PATCH] 追溯码 --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 271 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 159 insertions(+), 112 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs index 129320c..006260e 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs @@ -37,16 +37,16 @@ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); @@ -57,11 +57,6 @@ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -94,6 +89,7 @@ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -157,8 +153,6 @@ this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl(); this.groupControl1 = new DevExpress.XtraEditors.GroupControl(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); @@ -167,13 +161,18 @@ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); this.groupControl2 = new DevExpress.XtraEditors.GroupControl(); this.gcMx3 = new DevExpress.XtraGrid.GridControl(); this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panMsg = new DevExpress.XtraEditors.PanelControl(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); this.btnIpt = new DevExpress.XtraEditors.SimpleButton(); @@ -271,7 +270,6 @@ this.splitMx2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).BeginInit(); this.splitYangLi.Panel1.SuspendLayout(); @@ -322,6 +320,7 @@ // this.toolBarMenu1.chkParameter = "0,0,0,0,000chk_iqc_detect01_submit"; this.toolBarMenu1.currentAction = null; + this.toolBarMenu1.defaultActions = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -375,7 +374,7 @@ // gcMain1 // this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F); + this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; @@ -388,7 +387,7 @@ // 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.Appearance.ViewCaption.Options.UseTextOptions = true; this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; @@ -417,7 +416,8 @@ this.bandedGridColumn1, this.gridColumn18, this.gridColumn19, - this.gridColumn17}); + this.gridColumn17, + this.gridColumn23}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -440,7 +440,7 @@ // // gv_fsubmit // - this.gv_fsubmit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_fsubmit.AppearanceCell.Options.UseFont = true; this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑"; this.gv_fsubmit.FieldName = "fsubmitTxt"; @@ -455,7 +455,7 @@ // // gv_lotNo // - this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_lotNo.AppearanceCell.Options.UseFont = true; this.gv_lotNo.Caption = "閫佹鎵规"; this.gv_lotNo.FieldName = "lotNo"; @@ -469,7 +469,7 @@ // // gv_lifnr // - this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_lifnr.AppearanceCell.Options.UseFont = true; this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�"; this.gv_lifnr.FieldName = "suppName"; @@ -483,7 +483,7 @@ // // gv_releaseNo // - this.gv_releaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_releaseNo.AppearanceCell.Options.UseFont = true; this.gv_releaseNo.Caption = "妫�楠屽崟鍙�"; this.gv_releaseNo.FieldName = "releaseNo"; @@ -497,7 +497,7 @@ // // gv_itemId // - this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_itemId.AppearanceCell.Options.UseFont = true; this.gv_itemId.Caption = "鐗╂枡ID"; this.gv_itemId.FieldName = "itemId"; @@ -511,7 +511,7 @@ // // gv_itemNo // - this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_itemNo.AppearanceCell.Options.UseFont = true; this.gv_itemNo.Caption = "鐗╂枡缂栫爜"; this.gv_itemNo.FieldName = "itemNo2"; @@ -525,7 +525,7 @@ // // gv_boardStyle // - this.gv_boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_boardStyle.AppearanceCell.Options.UseFont = true; this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О"; this.gv_boardStyle.FieldName = "itemName"; @@ -550,7 +550,7 @@ // // gv_fbatchQty // - this.gv_fbatchQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_fbatchQty.AppearanceCell.Options.UseFont = true; this.gv_fbatchQty.Caption = "閲囪喘鏁伴噺"; this.gv_fbatchQty.FieldName = "fbatchQty"; @@ -564,7 +564,7 @@ // // gv_fcheckResu // - this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_fcheckResu.AppearanceCell.Options.UseFont = true; this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�"; this.gv_fcheckResu.FieldName = "fcheckResu"; @@ -578,7 +578,7 @@ // // gv_fcovertQty // - this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_fcovertQty.AppearanceCell.Options.UseFont = true; this.gv_fcovertQty.Caption = "杞崲鏁伴噺"; this.gv_fcovertQty.FieldName = "fcovertQty"; @@ -593,7 +593,7 @@ // // gv_remarks // - this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_remarks.AppearanceCell.Options.UseFont = true; this.gv_remarks.Caption = "澶囨敞璇存槑"; this.gv_remarks.FieldName = "remarks"; @@ -607,7 +607,7 @@ // // gv_fcheckBy // - this.gv_fcheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_fcheckBy.AppearanceCell.Options.UseFont = true; this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�"; this.gv_fcheckBy.FieldName = "fcheckBy"; @@ -621,7 +621,7 @@ // // gv_fcheckDate // - this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_fcheckDate.AppearanceCell.Options.UseFont = true; this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�"; this.gv_fcheckDate.FieldName = "fcheckDate"; @@ -635,7 +635,7 @@ // // gv_checkQty // - this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_checkQty.AppearanceCell.Options.UseFont = true; this.gv_checkQty.Caption = "鎶芥鏁伴噺"; this.gv_checkQty.FieldName = "checkQty"; @@ -649,7 +649,7 @@ // // gv_createBy // - this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_createBy.AppearanceCell.Options.UseFont = true; this.gv_createBy.Caption = "鍒涘缓浜�"; this.gv_createBy.FieldName = "createBy"; @@ -673,7 +673,7 @@ // // gv_lastupdateBy // - this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true; this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉"; this.gv_lastupdateBy.FieldName = "lastupdateBy"; @@ -687,7 +687,7 @@ // // gv_lastupdateDate // - this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true; this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�"; this.gv_lastupdateDate.FieldName = "lastupdateDate"; @@ -701,7 +701,7 @@ // // gv_fngHandle // - this.gv_fngHandle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_fngHandle.AppearanceCell.Options.UseFont = true; this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶"; this.gv_fngHandle.FieldName = "fngHandle"; @@ -751,6 +751,16 @@ this.gridColumn17.MinWidth = 25; this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Width = 94; + // + // gridColumn23 + // + this.gridColumn23.Caption = "閲囪喘鍗曞彿"; + this.gridColumn23.FieldName = "cgdNo"; + this.gridColumn23.MinWidth = 25; + this.gridColumn23.Name = "gridColumn23"; + this.gridColumn23.Visible = true; + this.gridColumn23.VisibleIndex = 24; + this.gridColumn23.Width = 94; // // pageBar1 // @@ -847,7 +857,7 @@ // this.txt_remarks.Location = new System.Drawing.Point(409, 108); this.txt_remarks.Name = "txt_remarks"; - this.txt_remarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_remarks.Properties.Appearance.Options.UseFont = true; this.txt_remarks.Size = new System.Drawing.Size(574, 28); this.txt_remarks.StyleController = this.layoutMx1; @@ -866,7 +876,7 @@ // this.txt_itemName.Location = new System.Drawing.Point(84, 44); this.txt_itemName.Name = "txt_itemName"; - this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_itemName.Properties.Appearance.Options.UseFont = true; this.txt_itemName.Size = new System.Drawing.Size(249, 28); this.txt_itemName.StyleController = this.layoutMx1; @@ -877,7 +887,7 @@ // this.txt_releaseNo.Location = new System.Drawing.Point(84, 12); this.txt_releaseNo.Name = "txt_releaseNo"; - this.txt_releaseNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_releaseNo.Properties.Appearance.Options.UseFont = true; this.txt_releaseNo.Size = new System.Drawing.Size(249, 28); this.txt_releaseNo.StyleController = this.layoutMx1; @@ -888,7 +898,7 @@ // this.txt_fcheckDate.Location = new System.Drawing.Point(409, 12); this.txt_fcheckDate.Name = "txt_fcheckDate"; - this.txt_fcheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true; this.txt_fcheckDate.Size = new System.Drawing.Size(249, 28); this.txt_fcheckDate.StyleController = this.layoutMx1; @@ -899,7 +909,7 @@ // this.txt_lotNo.Location = new System.Drawing.Point(734, 12); this.txt_lotNo.Name = "txt_lotNo"; - this.txt_lotNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_lotNo.Properties.Appearance.Options.UseFont = true; this.txt_lotNo.Size = new System.Drawing.Size(249, 28); this.txt_lotNo.StyleController = this.layoutMx1; @@ -910,7 +920,7 @@ // this.txt_itemNo.Location = new System.Drawing.Point(84, 76); this.txt_itemNo.Name = "txt_itemNo"; - this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_itemNo.Properties.Appearance.Options.UseFont = true; this.txt_itemNo.Size = new System.Drawing.Size(249, 28); this.txt_itemNo.StyleController = this.layoutMx1; @@ -939,7 +949,7 @@ // this.txt_fcheckBy.Location = new System.Drawing.Point(409, 44); this.txt_fcheckBy.Name = "txt_fcheckBy"; - this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true; this.txt_fcheckBy.Size = new System.Drawing.Size(249, 28); this.txt_fcheckBy.StyleController = this.layoutMx1; @@ -950,7 +960,7 @@ // this.txt_fbatchQty.Location = new System.Drawing.Point(734, 44); this.txt_fbatchQty.Name = "txt_fbatchQty"; - this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true; this.txt_fbatchQty.Size = new System.Drawing.Size(249, 28); this.txt_fbatchQty.StyleController = this.layoutMx1; @@ -1292,8 +1302,6 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; - this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { - this.repositoryItemButtonEdit4}); this.gcMx1.Size = new System.Drawing.Size(1340, 201); this.gcMx1.TabIndex = 1; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1321,8 +1329,7 @@ this.gvMx1fngQty, this.gvMx1sampleSizeNo, this.gvMx1fcheckLevel, - this.gvMx1facLevel, - this.gridColumn21}); + this.gvMx1facLevel}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1331,7 +1338,7 @@ // // gvMx1guid // - this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1guid.AppearanceCell.Options.UseFont = true; this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎"; this.gvMx1guid.FieldName = "guid"; @@ -1342,7 +1349,7 @@ // // gvMx1fcheckItem // - this.gvMx1fcheckItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�"; this.gvMx1fcheckItem.FieldName = "fcheckItem"; @@ -1355,7 +1362,7 @@ // // gvMx1fcheckTool // - this.gvMx1fcheckTool.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�"; this.gvMx1fcheckTool.FieldName = "fcheckTool"; @@ -1368,7 +1375,7 @@ // // gvMx1fcheckItemDesc // - this.gvMx1fcheckItemDesc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�"; this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc"; @@ -1381,7 +1388,7 @@ // // gvMx1fspecRequ // - this.gvMx1fspecRequ.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true; this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰"; this.gvMx1fspecRequ.FieldName = "fspecRequ"; @@ -1394,7 +1401,7 @@ // // gvMx1fupAllow // - this.gvMx1fupAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true; this.gvMx1fupAllow.Caption = "涓婇檺"; this.gvMx1fupAllow.FieldName = "fupAllow"; @@ -1407,7 +1414,7 @@ // // gvMx1fstand // - this.gvMx1fstand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fstand.AppearanceCell.Options.UseFont = true; this.gvMx1fstand.Caption = "鏍囧噯鍊�"; this.gvMx1fstand.FieldName = "fstand"; @@ -1420,7 +1427,7 @@ // // gvMx1fdownAllow // - this.gvMx1fdownAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true; this.gvMx1fdownAllow.Caption = "涓嬮檺"; this.gvMx1fdownAllow.FieldName = "fdownAllow"; @@ -1433,7 +1440,7 @@ // // gvMx1freQty // - this.gvMx1freQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1freQty.AppearanceCell.Options.UseFont = true; this.gvMx1freQty.Caption = "RE鏁伴噺"; this.gvMx1freQty.FieldName = "freQty"; @@ -1446,7 +1453,7 @@ // // gvMx1checkQyt // - this.gvMx1checkQyt.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true; this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺"; this.gvMx1checkQyt.FieldName = "checkQyt"; @@ -1459,7 +1466,7 @@ // // gvMx1fenterQty // - this.gvMx1fenterQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true; this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�"; this.gvMx1fenterQty.FieldName = "fenterQty"; @@ -1472,7 +1479,7 @@ // // gvMx1fcheckResu // - this.gvMx1fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckResu.AppearanceCell.Options.UseForeColor = true; @@ -1489,7 +1496,7 @@ // // gvMx1fngRate // - this.gvMx1fngRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fngRate.AppearanceCell.Options.UseFont = true; this.gvMx1fngRate.Caption = "涓嶈壇鐜�"; this.gvMx1fngRate.FieldName = "fngRateName"; @@ -1502,7 +1509,7 @@ // // gvMx1fngQty // - this.gvMx1fngQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fngQty.AppearanceCell.Options.UseFont = true; this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟"; this.gvMx1fngQty.FieldName = "fngQty"; @@ -1515,7 +1522,7 @@ // // gvMx1sampleSizeNo // - this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true; this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�"; this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo"; @@ -1528,7 +1535,7 @@ // // gvMx1fcheckLevel // - this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�"; this.gvMx1fcheckLevel.FieldName = "fcheckLevel"; @@ -1541,7 +1548,7 @@ // // gvMx1facLevel // - this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1facLevel.AppearanceCell.Options.UseFont = true; this.gvMx1facLevel.Caption = "鎷掓敹姘村钩"; this.gvMx1facLevel.FieldName = "facLevel"; @@ -1551,26 +1558,6 @@ this.gvMx1facLevel.Visible = true; this.gvMx1facLevel.VisibleIndex = 15; this.gvMx1facLevel.Width = 200; - // - // gridColumn21 - // - this.gridColumn21.Caption = "娓呯┖"; - this.gridColumn21.ColumnEdit = this.repositoryItemButtonEdit4; - this.gridColumn21.MinWidth = 25; - this.gridColumn21.Name = "gridColumn21"; - this.gridColumn21.Visible = true; - this.gridColumn21.VisibleIndex = 16; - this.gridColumn21.Width = 94; - // - // repositoryItemButtonEdit4 - // - this.repositoryItemButtonEdit4.AutoHeight = false; - editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.refresh_16x16; - editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; - this.repositoryItemButtonEdit4.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)}); - this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4"; - this.repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; // // splitYangLi // @@ -1614,11 +1601,15 @@ // // gvMx2 // + + this.gvMx2.Appearance.Row.Options.UseFont = true; this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn4, this.gridColumn3, this.gridColumn2, - this.gridColumn20}); + this.gridColumn20, + this.gridColumn21, + this.gridColumn25}); this.gvMx2.GridControl = this.gcMx2; this.gvMx2.Name = "gvMx2"; // @@ -1656,13 +1647,32 @@ // gridColumn20 // this.gridColumn20.Caption = "鍒ゅ畾鏍囧織"; - this.gridColumn20.ColumnEdit = this.repositoryItemComboBox1; this.gridColumn20.FieldName = "fstand"; this.gridColumn20.MinWidth = 25; this.gridColumn20.Name = "gridColumn20"; this.gridColumn20.Visible = true; this.gridColumn20.VisibleIndex = 1; this.gridColumn20.Width = 94; + // + // gridColumn21 + // + this.gridColumn21.Caption = "鎿嶄綔浜�"; + this.gridColumn21.FieldName = "createBy"; + this.gridColumn21.MinWidth = 25; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Visible = true; + this.gridColumn21.VisibleIndex = 2; + this.gridColumn21.Width = 94; + // + // gridColumn25 + // + this.gridColumn25.Caption = "鎿嶄綔鏃堕棿"; + this.gridColumn25.FieldName = "createDate"; + this.gridColumn25.MinWidth = 25; + this.gridColumn25.Name = "gridColumn25"; + this.gridColumn25.Visible = true; + this.gridColumn25.VisibleIndex = 3; + this.gridColumn25.Width = 94; // // groupControl2 // @@ -1687,11 +1697,16 @@ // // gvMx3 // + + this.gvMx3.Appearance.Row.Options.UseFont = true; this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn1, this.gridColumn22, - this.gridColumn23, - this.gridColumn24}); + this.gridColumn28, + this.gridColumn29, + this.gridColumn24, + this.gridColumn26, + this.gridColumn27}); this.gvMx3.GridControl = this.gcMx3; this.gvMx3.Name = "gvMx3"; // @@ -1707,7 +1722,7 @@ // gridColumn22 // this.gridColumn22.Caption = "椤圭洰"; - this.gridColumn22.FieldName = "fcheckItem"; + this.gridColumn22.FieldName = "fcheckItemd5"; this.gridColumn22.MaxWidth = 192; this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; @@ -1716,26 +1731,55 @@ this.gridColumn22.VisibleIndex = 0; this.gridColumn22.Width = 192; // - // gridColumn23 + // gridColumn28 // - this.gridColumn23.Caption = "鎶芥缁撴灉"; - this.gridColumn23.FieldName = "fcheckResu"; - this.gridColumn23.MaxWidth = 80; - this.gridColumn23.MinWidth = 25; - this.gridColumn23.Name = "gridColumn23"; - this.gridColumn23.OptionsColumn.ReadOnly = true; - this.gridColumn23.Width = 80; + this.gridColumn28.Caption = "鏍锋湰搴�"; + this.gridColumn28.FieldName = "fcheckItem"; + this.gridColumn28.MinWidth = 25; + this.gridColumn28.Name = "gridColumn28"; + this.gridColumn28.Visible = true; + this.gridColumn28.VisibleIndex = 1; + this.gridColumn28.Width = 94; + // + // gridColumn29 + // + this.gridColumn29.Caption = "鏍锋湰鍊�"; + this.gridColumn29.FieldName = "fcheckResu"; + this.gridColumn29.MinWidth = 25; + this.gridColumn29.Name = "gridColumn29"; + this.gridColumn29.Visible = true; + this.gridColumn29.VisibleIndex = 2; + this.gridColumn29.Width = 94; // // gridColumn24 // this.gridColumn24.Caption = "鍒ゅ畾鏍囧織"; - this.gridColumn24.ColumnEdit = this.repositoryItemComboBox1; this.gridColumn24.FieldName = "fstand"; this.gridColumn24.MinWidth = 25; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; - this.gridColumn24.VisibleIndex = 1; + this.gridColumn24.VisibleIndex = 3; this.gridColumn24.Width = 94; + // + // gridColumn26 + // + this.gridColumn26.Caption = "鎿嶄綔浜�"; + this.gridColumn26.FieldName = "createBy"; + this.gridColumn26.MinWidth = 25; + this.gridColumn26.Name = "gridColumn26"; + this.gridColumn26.Visible = true; + this.gridColumn26.VisibleIndex = 4; + this.gridColumn26.Width = 94; + // + // gridColumn27 + // + this.gridColumn27.Caption = "鎿嶄綔鏃堕棿"; + this.gridColumn27.FieldName = "createDate"; + this.gridColumn27.MinWidth = 25; + this.gridColumn27.Name = "gridColumn27"; + this.gridColumn27.Visible = true; + this.gridColumn27.VisibleIndex = 5; + this.gridColumn27.Width = 94; // // panMsg // @@ -1784,7 +1828,7 @@ // this.txtJianYan.Location = new System.Drawing.Point(221, 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(445, 36); this.txtJianYan.StyleController = this.layoutControl1; @@ -1977,9 +2021,9 @@ // repositoryItemButtonEdit2 // this.repositoryItemButtonEdit2.AutoHeight = false; - editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; // @@ -1996,10 +2040,10 @@ // repositoryItemButtonEdit3 // this.repositoryItemButtonEdit3.AutoHeight = false; - editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.download_16x16; - editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3"; this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; // @@ -2016,10 +2060,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; // @@ -2142,7 +2186,6 @@ this.splitMx2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).EndInit(); this.splitYangLi.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).EndInit(); @@ -2307,8 +2350,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; - private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; private DevExpress.XtraEditors.SplitContainerControl splitYangLi; @@ -2318,10 +2359,16 @@ private DevExpress.XtraGrid.Views.Grid.GridView gvMx3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; private DevExpress.XtraEditors.TextEdit txt_guid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn26; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; } } \ No newline at end of file -- Gitblit v1.9.3