From 7cb6753c8a92c562d5258085df0ce5248eb5eefa Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期三, 26 三月 2025 21:47:12 +0800 Subject: [PATCH] 退货申请 --- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 1 DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs | 26 +- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs | 245 ++++++++++++++++++------ DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs | 2 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs | 175 +++++++++-------- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 88 ++++---- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 5 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs | 6 8 files changed, 337 insertions(+), 211 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs index b062085..281b4b8 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs @@ -475,6 +475,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs index a170f66..65b14c3 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs @@ -59,6 +59,7 @@ this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -75,6 +76,9 @@ this.txt_remark = new DevExpress.XtraEditors.TextEdit(); this.txt_status = new DevExpress.XtraEditors.CheckEdit(); this.txt_guid = new DevExpress.XtraEditors.TextEdit(); + this.txt_sqdNo = new DevExpress.XtraEditors.TextEdit(); + this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); + this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.lb_guid = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); @@ -88,6 +92,9 @@ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.lab_createBy = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -127,13 +134,6 @@ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.txt_sqdNo = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); - this.lab_createBy = new DevExpress.XtraLayout.LayoutControlItem(); - this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -164,6 +164,9 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); @@ -177,6 +180,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage2.SuspendLayout(); @@ -187,18 +193,13 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = null; + this.toolBarMenu1.defaultActions = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -483,6 +484,16 @@ this.gridColumn7.VisibleIndex = 15; this.gridColumn7.Width = 94; // + // gridColumn18 + // + this.gridColumn18.Caption = "鐢宠鍗曞彿"; + this.gridColumn18.FieldName = "sqdNo"; + this.gridColumn18.MinWidth = 25; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.Visible = true; + this.gridColumn18.VisibleIndex = 16; + this.gridColumn18.Width = 94; + // // pageBar1 // this.pageBar1.CurrentPage = 1; @@ -675,6 +686,30 @@ this.txt_guid.StyleController = this.layoutMx1; this.txt_guid.TabIndex = 528; // + // txt_sqdNo + // + this.txt_sqdNo.Location = new System.Drawing.Point(626, 76); + this.txt_sqdNo.Name = "txt_sqdNo"; + this.txt_sqdNo.Size = new System.Drawing.Size(195, 24); + this.txt_sqdNo.StyleController = this.layoutMx1; + this.txt_sqdNo.TabIndex = 529; + // + // txt_createBy + // + this.txt_createBy.Location = new System.Drawing.Point(626, 12); + this.txt_createBy.Name = "txt_createBy"; + this.txt_createBy.Size = new System.Drawing.Size(195, 24); + this.txt_createBy.StyleController = this.layoutMx1; + this.txt_createBy.TabIndex = 530; + // + // txt_createDate + // + this.txt_createDate.Location = new System.Drawing.Point(626, 44); + this.txt_createDate.Name = "txt_createDate"; + this.txt_createDate.Size = new System.Drawing.Size(195, 24); + this.txt_createDate.StyleController = this.layoutMx1; + this.txt_createDate.TabIndex = 531; + // // lb_guid // this.lb_guid.Control = this.txt_guid; @@ -853,6 +888,38 @@ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txt_sqdNo; + this.layoutControlItem13.Location = new System.Drawing.Point(542, 64); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem13.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem13.Text = "鐢宠鍗曞彿"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); + // + // lab_createBy + // + this.lab_createBy.Control = this.txt_createBy; + this.lab_createBy.Location = new System.Drawing.Point(542, 0); + this.lab_createBy.Name = "lab_createBy"; + this.lab_createBy.OptionsTableLayoutItem.ColumnIndex = 2; + this.lab_createBy.Size = new System.Drawing.Size(271, 32); + this.lab_createBy.Text = "鍒涘缓浜�"; + this.lab_createBy.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_createDate; + this.layoutControlItem15.Location = new System.Drawing.Point(542, 32); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem15.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem15.Text = "鍒涘缓鏃堕棿"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); + // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -885,6 +952,8 @@ // // gvMx1 // + this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1.Appearance.Row.Options.UseFont = true; this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn12, this.gridColumn11, @@ -1133,6 +1202,8 @@ // // gvMx2 // + this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2.Appearance.Row.Options.UseFont = true; this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx1guid, this.gvMx1itemBarcode, @@ -1316,72 +1387,6 @@ this.layoutControlItem4.Size = new System.Drawing.Size(138, 73); this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20); // - // gridColumn18 - // - this.gridColumn18.Caption = "鐢宠鍗曞彿"; - this.gridColumn18.FieldName = "sqdNo"; - this.gridColumn18.MinWidth = 25; - this.gridColumn18.Name = "gridColumn18"; - this.gridColumn18.Visible = true; - this.gridColumn18.VisibleIndex = 16; - this.gridColumn18.Width = 94; - // - // txt_sqdNo - // - this.txt_sqdNo.Location = new System.Drawing.Point(626, 76); - this.txt_sqdNo.Name = "txt_sqdNo"; - this.txt_sqdNo.Size = new System.Drawing.Size(195, 24); - this.txt_sqdNo.StyleController = this.layoutMx1; - this.txt_sqdNo.TabIndex = 529; - // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.txt_sqdNo; - this.layoutControlItem13.Location = new System.Drawing.Point(542, 64); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem13.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem13.Text = "鐢宠鍗曞彿"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); - // - // txt_createBy - // - this.txt_createBy.Location = new System.Drawing.Point(626, 12); - this.txt_createBy.Name = "txt_createBy"; - this.txt_createBy.Size = new System.Drawing.Size(195, 24); - this.txt_createBy.StyleController = this.layoutMx1; - this.txt_createBy.TabIndex = 530; - // - // lab_createBy - // - this.lab_createBy.Control = this.txt_createBy; - this.lab_createBy.Location = new System.Drawing.Point(542, 0); - this.lab_createBy.Name = "lab_createBy"; - this.lab_createBy.OptionsTableLayoutItem.ColumnIndex = 2; - this.lab_createBy.Size = new System.Drawing.Size(271, 32); - this.lab_createBy.Text = "鍒涘缓浜�"; - this.lab_createBy.TextSize = new System.Drawing.Size(60, 18); - // - // txt_createDate - // - this.txt_createDate.Location = new System.Drawing.Point(626, 44); - this.txt_createDate.Name = "txt_createDate"; - this.txt_createDate.Size = new System.Drawing.Size(195, 24); - this.txt_createDate.StyleController = this.layoutMx1; - this.txt_createDate.TabIndex = 531; - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txt_createDate; - this.layoutControlItem15.Location = new System.Drawing.Point(542, 32); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem15.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem15.Text = "鍒涘缓鏃堕棿"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); - // // Frm_MesCgthSqDj // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1422,6 +1427,9 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lb_guid)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); @@ -1435,6 +1443,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage2.ResumeLayout(false); @@ -1445,12 +1456,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_sqdNo.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.lab_createBy)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); this.ResumeLayout(false); } diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs index 83c73d6..fd6cd2d 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs @@ -229,6 +229,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -247,6 +248,7 @@ gcMx2.DataSource = dt1; gcMx2.ForceInitialize(); gvMx2.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2); } else { diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs index 91077d2..c5aba68 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs @@ -91,10 +91,8 @@ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -121,6 +119,8 @@ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -158,10 +158,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -171,6 +169,8 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -531,7 +531,7 @@ // txt_qt008 // this.txt_qt008.IsReadly = false; - this.txt_qt008.Location = new System.Drawing.Point(626, 76); + this.txt_qt008.Location = new System.Drawing.Point(626, 32); this.txt_qt008.Margin = new System.Windows.Forms.Padding(0); this.txt_qt008.Name = "txt_qt008"; this.txt_qt008.Size = new System.Drawing.Size(195, 28); @@ -541,7 +541,7 @@ // this.ucLookHuoZhu1.HzId = null; this.ucLookHuoZhu1.IsReadly = false; - this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 76); + this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 64); this.ucLookHuoZhu1.Name = "ucLookHuoZhu1"; this.ucLookHuoZhu1.OrgId = null; this.ucLookHuoZhu1.Size = new System.Drawing.Size(267, 60); @@ -549,7 +549,7 @@ // // txt_qt010 // - this.txt_qt010.Location = new System.Drawing.Point(355, 108); + this.txt_qt010.Location = new System.Drawing.Point(355, 96); this.txt_qt010.Name = "txt_qt010"; this.txt_qt010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_qt010.Properties.Appearance.Options.UseFont = true; @@ -560,7 +560,7 @@ // txt_qt009 // this.txt_qt009.IsReadly = false; - this.txt_qt009.Location = new System.Drawing.Point(626, 44); + this.txt_qt009.Location = new System.Drawing.Point(626, 64); this.txt_qt009.Name = "txt_qt009"; this.txt_qt009.Size = new System.Drawing.Size(195, 28); this.txt_qt009.TabIndex = 316; @@ -568,14 +568,14 @@ // txt_qt013 // this.txt_qt013.IsReadly = false; - this.txt_qt013.Location = new System.Drawing.Point(355, 76); + this.txt_qt013.Location = new System.Drawing.Point(355, 64); this.txt_qt013.Name = "txt_qt013"; this.txt_qt013.Size = new System.Drawing.Size(195, 28); this.txt_qt013.TabIndex = 304; // // txt_qtck // - this.txt_qtck.Location = new System.Drawing.Point(84, 12); + this.txt_qtck.Location = new System.Drawing.Point(84, 0); this.txt_qtck.Name = "txt_qtck"; this.txt_qtck.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_qtck.Properties.Appearance.Options.UseFont = true; @@ -587,7 +587,7 @@ // txt_qt019 // this.txt_qt019.EditValue = "璇烽�夋嫨"; - this.txt_qt019.Location = new System.Drawing.Point(355, 12); + this.txt_qt019.Location = new System.Drawing.Point(355, 0); this.txt_qt019.Name = "txt_qt019"; this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -606,7 +606,7 @@ // txt_qt024 // this.txt_qt024.IsReadly = false; - this.txt_qt024.Location = new System.Drawing.Point(355, 44); + this.txt_qt024.Location = new System.Drawing.Point(355, 32); this.txt_qt024.Name = "txt_qt024"; this.txt_qt024.Size = new System.Drawing.Size(195, 28); this.txt_qt024.TabIndex = 309; @@ -614,7 +614,7 @@ // txt_qt020 // this.txt_qt020.EditValue = "璇烽�夋嫨"; - this.txt_qt020.Location = new System.Drawing.Point(626, 12); + this.txt_qt020.Location = new System.Drawing.Point(626, 0); this.txt_qt020.Name = "txt_qt020"; this.txt_qt020.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -630,14 +630,14 @@ // txt_qt023 // this.txt_qt023.IsReadly = false; - this.txt_qt023.Location = new System.Drawing.Point(84, 44); + this.txt_qt023.Location = new System.Drawing.Point(84, 32); this.txt_qt023.Name = "txt_qt023"; this.txt_qt023.Size = new System.Drawing.Size(195, 28); this.txt_qt023.TabIndex = 307; // // txt_qt016 // - this.txt_qt016.Location = new System.Drawing.Point(897, 12); + this.txt_qt016.Location = new System.Drawing.Point(897, 0); this.txt_qt016.Name = "txt_qt016"; this.txt_qt016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_qt016.Properties.Appearance.Options.UseFont = true; @@ -648,7 +648,7 @@ // // txt_qt002 // - this.txt_qt002.Location = new System.Drawing.Point(897, 44); + this.txt_qt002.Location = new System.Drawing.Point(897, 32); this.txt_qt002.Name = "txt_qt002"; this.txt_qt002.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_qt002.Properties.Appearance.Options.UseFont = true; @@ -659,7 +659,7 @@ // // txt_qt015 // - this.txt_qt015.Location = new System.Drawing.Point(825, 76); + this.txt_qt015.Location = new System.Drawing.Point(825, 64); this.txt_qt015.Name = "txt_qt015"; this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��"; this.txt_qt015.Size = new System.Drawing.Size(268, 24); @@ -693,9 +693,9 @@ this.layoutControlItem7, this.layoutControlItem8, this.layoutControlItem10, - this.layoutControlItem11, this.layoutControlItem13, this.layoutControlItem9, + this.layoutControlItem11, this.layoutControlItem12}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; @@ -822,17 +822,6 @@ this.layoutControlItem10.Text = "瀹㈡埛"; this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem11 - // - this.layoutControlItem11.Control = this.txt_qt009; - this.layoutControlItem11.Location = new System.Drawing.Point(542, 32); - this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem11.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); - // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_qt010; @@ -856,17 +845,6 @@ this.layoutControlItem9.Text = "璐т富绫诲瀷"; this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem9.TextVisible = false; - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_qt008; - this.layoutControlItem12.Location = new System.Drawing.Point(542, 64); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem12.Text = "鍙戞枡浠撳簱"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // tabMx // @@ -1182,6 +1160,28 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_qt009; + this.layoutControlItem11.Location = new System.Drawing.Point(542, 64); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem11.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_qt008; + this.layoutControlItem12.Location = new System.Drawing.Point(542, 32); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem12.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem12.Text = "鍙戞枡浠撳簱"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); + // // Frm_MesItemQt // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1229,10 +1229,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1242,6 +1240,8 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); this.ResumeLayout(false); } @@ -1296,10 +1296,8 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; private DevExpress.XtraGrid.GridControl gcMx1; @@ -1325,5 +1323,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs index ddc7d04..0e576fe 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs @@ -34,9 +34,7 @@ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; - List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); - gvList.Add(gridView1); - Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList); + this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (value) => { @@ -480,6 +478,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs index 04e1e96..4071535 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs @@ -58,6 +58,15 @@ this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -81,6 +90,7 @@ this.txt_status = new DevExpress.XtraEditors.CheckEdit(); this.txt_guid = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -98,7 +108,6 @@ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -164,6 +173,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); @@ -181,7 +191,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -280,7 +289,16 @@ this.gv_createBy, this.gv_createDate, this.gv_remark, - this.gridColumn1}); + this.gridColumn1, + this.gridColumn6, + this.gridColumn8, + this.gridColumn9, + this.gridColumn10, + this.gridColumn11, + this.gridColumn12, + this.gridColumn13, + this.gridColumn7, + this.gridColumn14}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -465,6 +483,96 @@ this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Width = 94; // + // gridColumn6 + // + this.gridColumn6.Caption = "搴撳瓨鏂瑰悜"; + this.gridColumn6.FieldName = "lyfx"; + this.gridColumn6.MinWidth = 25; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 12; + this.gridColumn6.Width = 94; + // + // gridColumn8 + // + this.gridColumn8.Caption = "鍙戞枡浠撳簱"; + this.gridColumn8.FieldName = "ckName"; + this.gridColumn8.MinWidth = 25; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 13; + this.gridColumn8.Width = 94; + // + // gridColumn9 + // + this.gridColumn9.Caption = "鍑哄簱鍘熷洜"; + this.gridColumn9.FieldName = "sqRemark"; + this.gridColumn9.MinWidth = 25; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 14; + this.gridColumn9.Width = 94; + // + // gridColumn10 + // + this.gridColumn10.Caption = "搴撳瓨缁勭粐"; + this.gridColumn10.FieldName = "kcOrg"; + this.gridColumn10.MinWidth = 25; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 15; + this.gridColumn10.Width = 94; + // + // gridColumn11 + // + this.gridColumn11.Caption = "棰嗙敤缁勭粐"; + this.gridColumn11.FieldName = "lyOrg"; + this.gridColumn11.MinWidth = 25; + this.gridColumn11.Name = "gridColumn11"; + this.gridColumn11.Visible = true; + this.gridColumn11.VisibleIndex = 16; + this.gridColumn11.Width = 94; + // + // gridColumn12 + // + this.gridColumn12.Caption = "璐т富"; + this.gridColumn12.FieldName = "hz"; + this.gridColumn12.MinWidth = 25; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 17; + this.gridColumn12.Width = 94; + // + // gridColumn13 + // + this.gridColumn13.Caption = "璐т富绫诲瀷"; + this.gridColumn13.FieldName = "hzlx"; + this.gridColumn13.MinWidth = 25; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 18; + this.gridColumn13.Width = 94; + // + // gridColumn7 + // + this.gridColumn7.Caption = "棰嗙敤瀹㈡埛"; + this.gridColumn7.FieldName = "lykh"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 19; + this.gridColumn7.Width = 94; + // + // gridColumn14 + // + this.gridColumn14.Caption = "棰嗙敤閮ㄩ棬"; + this.gridColumn14.FieldName = "lybm"; + this.gridColumn14.MinWidth = 25; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 20; + this.gridColumn14.Width = 94; + // // pageBar1 // this.pageBar1.CurrentPage = 1; @@ -526,7 +634,8 @@ this.layoutMx1.Controls.Add(this.txt_guid); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem17}); + this.layoutControlItem17, + this.layoutControlItem18}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(693, 221, 812, 500); @@ -545,151 +654,151 @@ // // txt_lybm // - this.txt_lybm.Location = new System.Drawing.Point(361, 108); + this.txt_lybm.Location = new System.Drawing.Point(355, 108); this.txt_lybm.Name = "txt_lybm"; this.txt_lybm.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lybm.Properties.Appearance.Options.UseFont = true; - this.txt_lybm.Size = new System.Drawing.Size(189, 28); + this.txt_lybm.Size = new System.Drawing.Size(195, 28); this.txt_lybm.StyleController = this.layoutMx1; this.txt_lybm.TabIndex = 583; // // txt_hz // - this.txt_hz.Location = new System.Drawing.Point(90, 108); + this.txt_hz.Location = new System.Drawing.Point(84, 108); this.txt_hz.Name = "txt_hz"; this.txt_hz.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_hz.Properties.Appearance.Options.UseFont = true; - this.txt_hz.Size = new System.Drawing.Size(189, 28); + this.txt_hz.Size = new System.Drawing.Size(195, 28); this.txt_hz.StyleController = this.layoutMx1; this.txt_hz.TabIndex = 579; // // txt_lyfx // - this.txt_lyfx.Location = new System.Drawing.Point(632, 12); + this.txt_lyfx.Location = new System.Drawing.Point(626, 12); this.txt_lyfx.Name = "txt_lyfx"; this.txt_lyfx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lyfx.Properties.Appearance.Options.UseFont = true; - this.txt_lyfx.Size = new System.Drawing.Size(189, 28); + this.txt_lyfx.Size = new System.Drawing.Size(195, 28); this.txt_lyfx.StyleController = this.layoutMx1; this.txt_lyfx.TabIndex = 581; // // txt_sqRemark // - this.txt_sqRemark.Location = new System.Drawing.Point(90, 140); + this.txt_sqRemark.Location = new System.Drawing.Point(84, 140); this.txt_sqRemark.Name = "txt_sqRemark"; this.txt_sqRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_sqRemark.Properties.Appearance.Options.UseFont = true; - this.txt_sqRemark.Size = new System.Drawing.Size(460, 28); + this.txt_sqRemark.Size = new System.Drawing.Size(466, 28); this.txt_sqRemark.StyleController = this.layoutMx1; this.txt_sqRemark.TabIndex = 243; // // txt_hzlx // - this.txt_hzlx.Location = new System.Drawing.Point(90, 76); + this.txt_hzlx.Location = new System.Drawing.Point(84, 76); this.txt_hzlx.Name = "txt_hzlx"; this.txt_hzlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_hzlx.Properties.Appearance.Options.UseFont = true; - this.txt_hzlx.Size = new System.Drawing.Size(189, 28); + this.txt_hzlx.Size = new System.Drawing.Size(195, 28); this.txt_hzlx.StyleController = this.layoutMx1; this.txt_hzlx.TabIndex = 577; // // txt_itemOutNo // - this.txt_itemOutNo.Location = new System.Drawing.Point(90, 12); + this.txt_itemOutNo.Location = new System.Drawing.Point(84, 12); this.txt_itemOutNo.Name = "txt_itemOutNo"; this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true; - this.txt_itemOutNo.Size = new System.Drawing.Size(189, 28); + this.txt_itemOutNo.Size = new System.Drawing.Size(195, 28); this.txt_itemOutNo.StyleController = this.layoutMx1; this.txt_itemOutNo.TabIndex = 213; // // txt_lyOrg // - this.txt_lyOrg.Location = new System.Drawing.Point(361, 44); + this.txt_lyOrg.Location = new System.Drawing.Point(355, 44); this.txt_lyOrg.Name = "txt_lyOrg"; this.txt_lyOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lyOrg.Properties.Appearance.Options.UseFont = true; - this.txt_lyOrg.Size = new System.Drawing.Size(189, 28); + this.txt_lyOrg.Size = new System.Drawing.Size(195, 28); this.txt_lyOrg.StyleController = this.layoutMx1; this.txt_lyOrg.TabIndex = 573; // // txt_djlx // - this.txt_djlx.Location = new System.Drawing.Point(361, 12); + this.txt_djlx.Location = new System.Drawing.Point(355, 12); this.txt_djlx.Name = "txt_djlx"; this.txt_djlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_djlx.Properties.Appearance.Options.UseFont = true; - this.txt_djlx.Size = new System.Drawing.Size(189, 28); + this.txt_djlx.Size = new System.Drawing.Size(195, 28); this.txt_djlx.StyleController = this.layoutMx1; this.txt_djlx.TabIndex = 575; // // txt_lykh // - this.txt_lykh.Location = new System.Drawing.Point(361, 76); + this.txt_lykh.Location = new System.Drawing.Point(355, 76); this.txt_lykh.Name = "txt_lykh"; this.txt_lykh.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lykh.Properties.Appearance.Options.UseFont = true; - this.txt_lykh.Size = new System.Drawing.Size(189, 28); + this.txt_lykh.Size = new System.Drawing.Size(195, 28); this.txt_lykh.StyleController = this.layoutMx1; this.txt_lykh.TabIndex = 450; // // txt_checkDate // - this.txt_checkDate.Location = new System.Drawing.Point(903, 76); + this.txt_checkDate.Location = new System.Drawing.Point(897, 76); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_checkDate.Properties.Appearance.Options.UseFont = true; - this.txt_checkDate.Size = new System.Drawing.Size(190, 28); + this.txt_checkDate.Size = new System.Drawing.Size(196, 28); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 262; // // txt_abtNo // - this.txt_abtNo.Location = new System.Drawing.Point(903, 12); + this.txt_abtNo.Location = new System.Drawing.Point(897, 12); this.txt_abtNo.Name = "txt_abtNo"; this.txt_abtNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_abtNo.Properties.Appearance.Options.UseFont = true; - this.txt_abtNo.Size = new System.Drawing.Size(190, 28); + this.txt_abtNo.Size = new System.Drawing.Size(196, 28); this.txt_abtNo.StyleController = this.layoutMx1; this.txt_abtNo.TabIndex = 387; // // txt_kcOrg // - this.txt_kcOrg.Location = new System.Drawing.Point(90, 44); + this.txt_kcOrg.Location = new System.Drawing.Point(84, 44); this.txt_kcOrg.Name = "txt_kcOrg"; this.txt_kcOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_kcOrg.Properties.Appearance.Options.UseFont = true; - this.txt_kcOrg.Size = new System.Drawing.Size(189, 28); + this.txt_kcOrg.Size = new System.Drawing.Size(195, 28); this.txt_kcOrg.StyleController = this.layoutMx1; this.txt_kcOrg.TabIndex = 216; // // txt_createBy // - this.txt_createBy.Location = new System.Drawing.Point(632, 44); + this.txt_createBy.Location = new System.Drawing.Point(626, 44); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createBy.Properties.Appearance.Options.UseFont = true; - this.txt_createBy.Size = new System.Drawing.Size(189, 28); + this.txt_createBy.Size = new System.Drawing.Size(195, 28); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 222; // // txt_checkUser // - this.txt_checkUser.Location = new System.Drawing.Point(903, 44); + this.txt_checkUser.Location = new System.Drawing.Point(897, 44); this.txt_checkUser.Name = "txt_checkUser"; this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_checkUser.Properties.Appearance.Options.UseFont = true; - this.txt_checkUser.Size = new System.Drawing.Size(190, 28); + this.txt_checkUser.Size = new System.Drawing.Size(196, 28); this.txt_checkUser.StyleController = this.layoutMx1; this.txt_checkUser.TabIndex = 258; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(632, 76); + this.txt_createDate.Location = new System.Drawing.Point(626, 76); 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(189, 28); + this.txt_createDate.Size = new System.Drawing.Size(195, 28); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 226; // @@ -722,6 +831,17 @@ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem17.TextVisible = false; // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txt_guid; + this.layoutControlItem18.Location = new System.Drawing.Point(542, 96); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem18.Size = new System.Drawing.Size(271, 32); + this.layoutControlItem18.Text = "涓婚敭GUID"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(66, 18); + // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; @@ -742,8 +862,7 @@ this.layoutControlItem13, this.layoutControlItem14, this.layoutControlItem16, - this.layoutControlItem15, - this.layoutControlItem18}); + this.layoutControlItem15}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -785,7 +904,7 @@ this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(271, 32); this.layoutControlItem1.Text = "鍑哄簱鍗曞彿"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // @@ -795,7 +914,7 @@ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(271, 32); this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // @@ -805,7 +924,7 @@ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(271, 32); this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem4 // @@ -815,7 +934,7 @@ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem4.Size = new System.Drawing.Size(272, 32); this.layoutControlItem4.Text = "鐢宠鍗曞彿"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem5 // @@ -825,7 +944,7 @@ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem5.Size = new System.Drawing.Size(271, 32); this.layoutControlItem5.Text = "搴撳瓨缁勭粐"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem6 // @@ -836,7 +955,7 @@ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem6.Size = new System.Drawing.Size(271, 32); this.layoutControlItem6.Text = "棰嗙敤缁勭粐"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // @@ -847,7 +966,7 @@ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem7.Size = new System.Drawing.Size(271, 32); this.layoutControlItem7.Text = "鍒涘缓浜�"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 // @@ -858,7 +977,7 @@ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(272, 32); this.layoutControlItem8.Text = "瀹℃牳浜�"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem9 // @@ -868,7 +987,7 @@ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem9.Size = new System.Drawing.Size(271, 32); this.layoutControlItem9.Text = "璐т富绫诲瀷"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // @@ -879,7 +998,7 @@ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem10.Size = new System.Drawing.Size(271, 32); this.layoutControlItem10.Text = "瀹㈡埛"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem11 // @@ -890,7 +1009,7 @@ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem11.Size = new System.Drawing.Size(271, 32); this.layoutControlItem11.Text = "鍒涘缓鏃堕棿"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem12 // @@ -901,7 +1020,7 @@ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem12.Size = new System.Drawing.Size(272, 32); this.layoutControlItem12.Text = "瀹℃牳鏃ユ湡"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem13 // @@ -911,7 +1030,7 @@ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(271, 32); this.layoutControlItem13.Text = "璐т富"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // @@ -922,7 +1041,7 @@ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem14.Size = new System.Drawing.Size(271, 32); this.layoutControlItem14.Text = "棰嗘枡閮ㄩ棬"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // @@ -945,18 +1064,7 @@ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem15.Size = new System.Drawing.Size(542, 32); this.layoutControlItem15.Text = "澶囨敞淇℃伅"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(66, 18); - // - // layoutControlItem18 - // - this.layoutControlItem18.Control = this.txt_guid; - this.layoutControlItem18.Location = new System.Drawing.Point(542, 96); - this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem18.Size = new System.Drawing.Size(271, 32); - this.layoutControlItem18.Text = "涓婚敭GUID"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(66, 18); + this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // tabMx // @@ -1115,7 +1223,7 @@ this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1remark.AppearanceCell.Options.UseFont = true; this.gvMx1remark.Caption = "澶囨敞淇℃伅 "; - this.gvMx1remark.FieldName = "remark"; + this.gvMx1remark.FieldName = "sqRemark"; this.gvMx1remark.MinWidth = 50; this.gvMx1remark.Name = "gvMx1remark"; this.gvMx1remark.Tag = "query_a.remark"; @@ -1348,6 +1456,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); @@ -1365,7 +1474,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1467,5 +1575,14 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; private DevExpress.XtraEditors.TextEdit txt_guid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs index 964d1c1..f61694f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs @@ -24,9 +24,7 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; - List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); - gvList.Add(gridView1); - Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList); + this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "statusChk", "", (value) => @@ -232,6 +230,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -249,6 +248,7 @@ gcMx2.DataSource = dt1; gcMx2.ForceInitialize(); gvMx2.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2); } else { diff --git a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs index b0ffe3d..1803bf7 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs @@ -47,10 +47,10 @@ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); this.pageBar1 = new UserControls.Data.UcPageBar(); - this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit(); this.panelControl3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).BeginInit(); @@ -301,6 +301,16 @@ this.gridColumn1.OptionsColumn.ReadOnly = true; this.gridColumn1.Width = 94; // + // gridColumn8 + // + this.gridColumn8.Caption = "鍗曟嵁绫诲瀷"; + this.gridColumn8.FieldName = "inType"; + this.gridColumn8.MinWidth = 25; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 12; + this.gridColumn8.Width = 94; + // // panelControl1 // this.panelControl1.Controls.Add(this.btnIn); @@ -313,8 +323,10 @@ // // btnIn // + this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; + this.btnIn.Appearance.Options.UseBackColor = true; this.btnIn.Dock = System.Windows.Forms.DockStyle.Right; - this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161; + this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16; this.btnIn.Location = new System.Drawing.Point(1032, 2); this.btnIn.Name = "btnIn"; this.btnIn.Size = new System.Drawing.Size(94, 39); @@ -332,16 +344,6 @@ this.pageBar1.Size = new System.Drawing.Size(984, 39); this.pageBar1.TabIndex = 3; this.pageBar1.TotalPages = 0; - // - // gridColumn8 - // - this.gridColumn8.Caption = "鍗曟嵁绫诲瀷"; - this.gridColumn8.FieldName = "inType"; - this.gridColumn8.MinWidth = 25; - this.gridColumn8.Name = "gridColumn8"; - this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 12; - this.gridColumn8.Width = 94; // // SelectMesCgthSq // -- Gitblit v1.9.3