From 98267f9dfb90aa98eb55e7abeabc52d3f8a5b694 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 27 八月 2025 15:25:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs | 92 ++++++++++++++++++---------------------------
1 files changed, 37 insertions(+), 55 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
index aa6267a..889940e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
@@ -33,7 +33,6 @@
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 +46,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = 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 +61,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.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -69,13 +69,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();
@@ -130,37 +125,18 @@
//
// 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.SplitterPosition = 268;
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
//
@@ -170,8 +146,8 @@
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(1408, 367);
+ this.gcMain1.TabIndex = 5;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
@@ -189,7 +165,8 @@
this.gridColumn4,
this.gridColumn5,
this.gridColumn6,
- this.gridColumn7});
+ this.gridColumn7,
+ this.gridColumn18});
this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 62;
@@ -312,6 +289,18 @@
this.gridColumn7.VisibleIndex = 10;
this.gridColumn7.Width = 112;
//
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 367);
+ 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;
+ //
// gridControl1
//
this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -320,8 +309,8 @@
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(1408, 268);
+ this.gridControl1.TabIndex = 5;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView2});
//
@@ -473,17 +462,15 @@
this.gridColumn17.VisibleIndex = 11;
this.gridColumn17.Width = 112;
//
- // pageBar1
+ // gridColumn18
//
- 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.gridColumn18.Caption = "缁勭粐鏈烘瀯";
+ this.gridColumn18.FieldName = "orgName";
+ this.gridColumn18.MinWidth = 30;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 11;
+ this.gridColumn18.Width = 112;
//
// CPMX
//
@@ -502,14 +489,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 +505,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 +521,17 @@
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;
}
}
\ No newline at end of file
--
Gitblit v1.9.3