From cc286e3641ef72fe7cb1312487a6d4e40bda81fe Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 03 九月 2025 09:23:31 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs | 221 ++++++++++++++++++++++++------------------------------
1 files changed, 98 insertions(+), 123 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
index aa6267a..4ad4a31 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -47,6 +47,8 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = 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.gridControl1 = new DevExpress.XtraGrid.GridControl();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -61,7 +63,7 @@
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -69,13 +71,8 @@
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
this.split1.Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.Panel2.SuspendLayout();
this.split1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
- this.splitContainerControl1.Panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
- this.splitContainerControl1.Panel2.SuspendLayout();
- this.splitContainerControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
@@ -91,10 +88,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -102,11 +99,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ 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(1410, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
@@ -114,9 +110,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -125,53 +120,31 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
//
- this.split1.Panel1.Controls.Add(this.splitContainerControl1);
+ this.split1.Panel1.Controls.Add(this.gcMain1);
this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
//
// split1.Panel2
//
+ this.split1.Panel2.Controls.Add(this.gridControl1);
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1408, 698);
- this.split1.SplitterPosition = 0;
+ this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.SplitterPosition = 219;
this.split1.TabIndex = 0;
- //
- // splitContainerControl1
- //
- this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainerControl1.Horizontal = false;
- this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
- this.splitContainerControl1.Name = "splitContainerControl1";
- //
- // splitContainerControl1.Panel1
- //
- this.splitContainerControl1.Panel1.Controls.Add(this.gcMain1);
- this.splitContainerControl1.Panel1.Text = "Panel1";
- //
- // splitContainerControl1.Panel2
- //
- this.splitContainerControl1.Panel2.Controls.Add(this.gridControl1);
- this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(1408, 635);
- this.splitContainerControl1.SplitterPosition = 365;
- this.splitContainerControl1.TabIndex = 5;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1408, 365);
- this.gcMain1.TabIndex = 3;
+ this.gcMain1.Size = new System.Drawing.Size(1126, 300);
+ this.gcMain1.TabIndex = 5;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
@@ -189,10 +162,10 @@
this.gridColumn4,
this.gridColumn5,
this.gridColumn6,
- this.gridColumn7});
- this.gridView1.DetailHeight = 428;
+ this.gridColumn7,
+ this.gridColumn18});
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -202,126 +175,146 @@
//
this.gridColumn8.Caption = "宸ュ崟鍗曞彿";
this.gridColumn8.FieldName = "daa001";
- this.gridColumn8.MinWidth = 30;
+ this.gridColumn8.MinWidth = 24;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Tag = "daa001";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 0;
- this.gridColumn8.Width = 112;
+ this.gridColumn8.Width = 90;
//
// itemNo1
//
this.itemNo1.Caption = "鐗╂枡缂栫爜";
this.itemNo1.FieldName = "itemNo";
- this.itemNo1.MinWidth = 30;
+ this.itemNo1.MinWidth = 24;
this.itemNo1.Name = "itemNo1";
this.itemNo1.Tag = "itemNo";
this.itemNo1.Visible = true;
this.itemNo1.VisibleIndex = 1;
- this.itemNo1.Width = 112;
+ this.itemNo1.Width = 90;
//
// itemName
//
this.itemName.Caption = "鐗╂枡鍚嶇О";
this.itemName.FieldName = "itemName";
- this.itemName.MinWidth = 30;
+ this.itemName.MinWidth = 24;
this.itemName.Name = "itemName";
this.itemName.Tag = "itemName";
this.itemName.Visible = true;
this.itemName.VisibleIndex = 2;
- this.itemName.Width = 112;
+ this.itemName.Width = 90;
//
// itemModel
//
this.itemModel.Caption = "瑙勬牸鍨嬪彿";
this.itemModel.FieldName = "itemModel";
- this.itemModel.MinWidth = 30;
+ this.itemModel.MinWidth = 24;
this.itemModel.Name = "itemModel";
this.itemModel.Tag = "itemModel";
this.itemModel.Visible = true;
this.itemModel.VisibleIndex = 3;
- this.itemModel.Width = 112;
+ this.itemModel.Width = 90;
//
// gridColumn1
//
this.gridColumn1.Caption = "瀹為檯寮�宸ユ棩鏈�";
this.gridColumn1.FieldName = "daa016";
- this.gridColumn1.MinWidth = 30;
+ this.gridColumn1.MinWidth = 24;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 112;
+ this.gridColumn1.Width = 90;
//
// gridColumn2
//
this.gridColumn2.Caption = "瀹為檯瀹屽伐鏃ユ湡";
this.gridColumn2.FieldName = "daa017";
- this.gridColumn2.MinWidth = 30;
+ this.gridColumn2.MinWidth = 24;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 5;
- this.gridColumn2.Width = 112;
+ this.gridColumn2.Width = 90;
//
// gridColumn3
//
this.gridColumn3.Caption = "宸ュ崟鏁伴噺";
this.gridColumn3.FieldName = "daa008";
- this.gridColumn3.MinWidth = 30;
+ this.gridColumn3.MinWidth = 24;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 6;
- this.gridColumn3.Width = 112;
+ this.gridColumn3.Width = 90;
//
// gridColumn4
//
this.gridColumn4.Caption = "宸茬敓浜ф暟";
this.gridColumn4.FieldName = "quantity1";
- this.gridColumn4.MinWidth = 30;
+ this.gridColumn4.MinWidth = 24;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 7;
- this.gridColumn4.Width = 112;
+ this.gridColumn4.Width = 90;
//
// gridColumn5
//
this.gridColumn5.Caption = "绾垮埆";
this.gridColumn5.FieldName = "lineName";
- this.gridColumn5.MinWidth = 30;
+ this.gridColumn5.MinWidth = 24;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 8;
- this.gridColumn5.Width = 112;
+ this.gridColumn5.Width = 90;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍏ュ簱鏁伴噺";
this.gridColumn6.FieldName = "quantity2";
- this.gridColumn6.MinWidth = 30;
+ this.gridColumn6.MinWidth = 24;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 9;
- this.gridColumn6.Width = 112;
+ this.gridColumn6.Width = 90;
//
// gridColumn7
//
this.gridColumn7.Caption = "鍏ュ簱杩涘害";
this.gridColumn7.FieldName = "quantity3";
- this.gridColumn7.MinWidth = 30;
+ this.gridColumn7.MinWidth = 24;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 10;
- this.gridColumn7.Width = 112;
+ this.gridColumn7.Width = 90;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "缁勭粐鏈烘瀯";
+ this.gridColumn18.FieldName = "orgName";
+ this.gridColumn18.MinWidth = 24;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 11;
+ this.gridColumn18.Width = 90;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 300);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
//
// gridControl1
//
this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gridControl1.Location = new System.Drawing.Point(0, 0);
this.gridControl1.MainView = this.gridView2;
- this.gridControl1.Margin = new System.Windows.Forms.Padding(4);
this.gridControl1.Name = "gridControl1";
- this.gridControl1.Size = new System.Drawing.Size(1408, 255);
- this.gridControl1.TabIndex = 4;
+ this.gridControl1.Size = new System.Drawing.Size(1126, 219);
+ this.gridControl1.TabIndex = 5;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView2});
//
@@ -341,9 +334,8 @@
this.gridColumn15,
this.gridColumn16,
this.gridColumn17});
- this.gridView2.DetailHeight = 428;
this.gridView2.GridControl = this.gridControl1;
- this.gridView2.IndicatorWidth = 62;
+ this.gridView2.IndicatorWidth = 50;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsFind.ShowSearchNavButtons = false;
this.gridView2.OptionsView.ShowAutoFilterRow = true;
@@ -353,147 +345,134 @@
//
this.gridColumn9.Caption = "浜у搧鏉＄爜";
this.gridColumn9.FieldName = "itemBarcode";
- this.gridColumn9.MinWidth = 30;
+ this.gridColumn9.MinWidth = 24;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "daa001";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 0;
- this.gridColumn9.Width = 112;
+ this.gridColumn9.Width = 90;
//
// gridColumn20
//
this.gridColumn20.Caption = "浠撳簱缂栧彿";
this.gridColumn20.FieldName = "depotCode";
- this.gridColumn20.MinWidth = 30;
+ this.gridColumn20.MinWidth = 24;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 1;
- this.gridColumn20.Width = 112;
+ this.gridColumn20.Width = 90;
//
// gridColumn21
//
this.gridColumn21.Caption = "搴撲綅缂栧彿";
this.gridColumn21.FieldName = "depotSectionCode";
- this.gridColumn21.MinWidth = 30;
+ this.gridColumn21.MinWidth = 24;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 2;
- this.gridColumn21.Width = 112;
+ this.gridColumn21.Width = 90;
//
// gridColumn22
//
this.gridColumn22.Caption = "鏁伴噺";
this.gridColumn22.FieldName = "quantity";
- this.gridColumn22.MinWidth = 30;
+ this.gridColumn22.MinWidth = 24;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 3;
- this.gridColumn22.Width = 112;
+ this.gridColumn22.Width = 90;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡缂栫爜";
this.gridColumn10.FieldName = "itemNo";
- this.gridColumn10.MinWidth = 30;
+ this.gridColumn10.MinWidth = 24;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "itemNo";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 4;
- this.gridColumn10.Width = 112;
+ this.gridColumn10.Width = 90;
//
// gridColumn11
//
this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
this.gridColumn11.FieldName = "itemName";
- this.gridColumn11.MinWidth = 30;
+ this.gridColumn11.MinWidth = 24;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "itemName";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 5;
- this.gridColumn11.Width = 112;
+ this.gridColumn11.Width = 90;
//
// gridColumn12
//
this.gridColumn12.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn12.FieldName = "itemModel";
- this.gridColumn12.MinWidth = 30;
+ this.gridColumn12.MinWidth = 24;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "itemModel";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 6;
- this.gridColumn12.Width = 112;
+ this.gridColumn12.Width = 90;
//
// gridColumn13
//
this.gridColumn13.Caption = "鍏ュ簱鏃堕棿";
this.gridColumn13.FieldName = "rkDate";
- this.gridColumn13.MinWidth = 30;
+ this.gridColumn13.MinWidth = 24;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 7;
- this.gridColumn13.Width = 112;
+ this.gridColumn13.Width = 90;
//
// gridColumn14
//
this.gridColumn14.Caption = "妫�楠屾椂闂�";
this.gridColumn14.FieldName = "fcheckDate";
- this.gridColumn14.MinWidth = 30;
+ this.gridColumn14.MinWidth = 24;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 8;
- this.gridColumn14.Width = 112;
+ this.gridColumn14.Width = 90;
//
// gridColumn15
//
this.gridColumn15.Caption = "鍏ュ簱鏃跺樊";
this.gridColumn15.FieldName = "diff1";
- this.gridColumn15.MinWidth = 30;
+ this.gridColumn15.MinWidth = 24;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 9;
- this.gridColumn15.Width = 112;
+ this.gridColumn15.Width = 90;
//
// gridColumn16
//
this.gridColumn16.Caption = "閫佹鏃堕棿";
this.gridColumn16.FieldName = "sjDate";
- this.gridColumn16.MinWidth = 30;
+ this.gridColumn16.MinWidth = 24;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 112;
+ this.gridColumn16.Width = 90;
//
// gridColumn17
//
this.gridColumn17.Caption = "妫�楠屾椂宸�";
this.gridColumn17.FieldName = "diff2";
- this.gridColumn17.MinWidth = 30;
+ this.gridColumn17.MinWidth = 24;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 11;
- this.gridColumn17.Width = 112;
- //
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1408, 48);
- this.pageBar1.TabIndex = 4;
- this.pageBar1.TotalPages = 0;
+ this.gridColumn17.Width = 90;
//
// CPMX
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.ClientSize = new System.Drawing.Size(1128, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "CPMX";
this.Text = "鎴愬搧鍏ュ簱璁板綍琛�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -502,14 +481,9 @@
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
this.split1.Panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ this.split1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
this.split1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
- this.splitContainerControl1.Panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
- this.splitContainerControl1.Panel2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
- this.splitContainerControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
@@ -523,7 +497,6 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private UserControls.Data.UcPageBar pageBar1;
- private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
@@ -540,16 +513,18 @@
private DevExpress.XtraGrid.GridControl gridControl1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
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 gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ 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 gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.Utils.ToolTipController tips;
}
}
\ No newline at end of file
--
Gitblit v1.9.3