From bd06bb837fa0c7edeeae56cb0fe4fb844f53fb2f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 23 十月 2024 16:42:34 +0800
Subject: [PATCH] 修改了报表设计器
---
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs | 187 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 140 insertions(+), 47 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
index 8f50f89..d91a953 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -29,12 +29,20 @@
/// </summary>
private void InitializeComponent()
{
- this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.tlMenu = new System.Windows.Forms.TreeView();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_checkStatus = new System.Windows.Forms.Label();
+ this.labelControl15 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_isStatus = new System.Windows.Forms.CheckBox();
+ this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.txt_factory = new DevExpress.XtraEditors.TextEdit();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
@@ -43,7 +51,6 @@
this.txt_upGuid = new System.Windows.Forms.ComboBox();
this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
- this.txt_isStatus = new DevExpress.XtraEditors.ComboBoxEdit();
this.lbGuid = new System.Windows.Forms.Label();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -59,8 +66,9 @@
this.xtraTabPage1.SuspendLayout();
this.xtraTabPage2.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_conTel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_conPeople.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
@@ -68,12 +76,17 @@
//
// toolBarMenu1
//
+ this.toolBarMenu1.chkParameter = "SYS_ORGANIZATION,check_date,check_status,check_by";
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.Size = new System.Drawing.Size(917, 80);
+
+ this.toolBarMenu1.Size = new System.Drawing.Size(772, 80);
this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+
//
// xtraTabControl1
//
@@ -81,7 +94,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(917, 564);
+ this.xtraTabControl1.Size = new System.Drawing.Size(772, 410);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -91,7 +104,7 @@
//
this.xtraTabPage1.Controls.Add(this.tlMenu);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(915, 532);
+ this.xtraTabPage1.Size = new System.Drawing.Size(770, 378);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
//
// tlMenu
@@ -100,7 +113,7 @@
this.tlMenu.Font = new System.Drawing.Font("Tahoma", 10F);
this.tlMenu.Location = new System.Drawing.Point(0, 0);
this.tlMenu.Name = "tlMenu";
- this.tlMenu.Size = new System.Drawing.Size(207, 532);
+ this.tlMenu.Size = new System.Drawing.Size(207, 378);
this.tlMenu.TabIndex = 2;
//
// xtraTabPage2
@@ -108,12 +121,20 @@
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
- this.xtraTabPage2.Size = new System.Drawing.Size(915, 532);
+ this.xtraTabPage2.Size = new System.Drawing.Size(770, 378);
this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_checkStatus);
+ this.panel1.Controls.Add(this.labelControl15);
+ this.panel1.Controls.Add(this.txt_checkDate);
+ this.panel1.Controls.Add(this.txt_checkBy);
+ this.panel1.Controls.Add(this.labelControl14);
+ this.panel1.Controls.Add(this.labelControl13);
+ this.panel1.Controls.Add(this.txt_isStatus);
+ this.panel1.Controls.Add(this.labelControl10);
this.panel1.Controls.Add(this.txt_factory);
this.panel1.Controls.Add(this.labelControl9);
this.panel1.Controls.Add(this.labelControl11);
@@ -122,7 +143,6 @@
this.panel1.Controls.Add(this.txt_upGuid);
this.panel1.Controls.Add(this.labelControl6);
this.panel1.Controls.Add(this.labelControl7);
- this.panel1.Controls.Add(this.txt_isStatus);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.labelControl5);
this.panel1.Controls.Add(this.labelControl1);
@@ -136,16 +156,95 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(21, 17);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(554, 413);
+ this.panel1.Size = new System.Drawing.Size(710, 324);
this.panel1.TabIndex = 1;
+ //
+ // txt_checkStatus
+ //
+ this.txt_checkStatus.AutoSize = true;
+ this.txt_checkStatus.Location = new System.Drawing.Point(484, 207);
+ this.txt_checkStatus.Name = "txt_checkStatus";
+ this.txt_checkStatus.Size = new System.Drawing.Size(0, 21);
+ this.txt_checkStatus.TabIndex = 146;
+ //
+ // labelControl15
+ //
+ this.labelControl15.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl15.Appearance.Options.UseFont = true;
+ this.labelControl15.Location = new System.Drawing.Point(395, 204);
+ this.labelControl15.Name = "labelControl15";
+ this.labelControl15.Size = new System.Drawing.Size(85, 21);
+ this.labelControl15.TabIndex = 145;
+ this.labelControl15.Text = "瀹℃牳鐘舵�侊細";
+ //
+ // txt_checkDate
+ //
+ this.txt_checkDate.Enabled = false;
+ this.txt_checkDate.Location = new System.Drawing.Point(488, 160);
+ 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(200, 28);
+ this.txt_checkDate.TabIndex = 144;
+ //
+ // txt_checkBy
+ //
+ this.txt_checkBy.Enabled = false;
+ this.txt_checkBy.Location = new System.Drawing.Point(488, 118);
+ this.txt_checkBy.Name = "txt_checkBy";
+ this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkBy.Size = new System.Drawing.Size(200, 28);
+ this.txt_checkBy.TabIndex = 143;
+ //
+ // labelControl14
+ //
+ this.labelControl14.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl14.Appearance.Options.UseFont = true;
+ this.labelControl14.Location = new System.Drawing.Point(395, 164);
+ this.labelControl14.Name = "labelControl14";
+ this.labelControl14.Size = new System.Drawing.Size(85, 21);
+ this.labelControl14.TabIndex = 140;
+ this.labelControl14.Text = "瀹℃牳鏃堕棿锛�";
+ //
+ // labelControl13
+ //
+ this.labelControl13.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl13.Appearance.Options.UseFont = true;
+ this.labelControl13.Location = new System.Drawing.Point(412, 122);
+ this.labelControl13.Name = "labelControl13";
+ this.labelControl13.Size = new System.Drawing.Size(68, 21);
+ this.labelControl13.TabIndex = 139;
+ this.labelControl13.Text = "瀹℃牳浜猴細";
+ //
+ // txt_isStatus
+ //
+ this.txt_isStatus.AutoSize = true;
+ this.txt_isStatus.Checked = true;
+ this.txt_isStatus.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.txt_isStatus.Location = new System.Drawing.Point(134, 250);
+ this.txt_isStatus.Name = "txt_isStatus";
+ this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
+ this.txt_isStatus.TabIndex = 138;
+ this.txt_isStatus.UseVisualStyleBackColor = true;
+ //
+ // labelControl10
+ //
+ this.labelControl10.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl10.Appearance.Options.UseFont = true;
+ this.labelControl10.Location = new System.Drawing.Point(362, 80);
+ this.labelControl10.Name = "labelControl10";
+ this.labelControl10.Size = new System.Drawing.Size(172, 21);
+ this.labelControl10.TabIndex = 137;
+ this.labelControl10.Text = "锛堟牴缁勭粐寤虹珛涓�1000锛�";
//
// txt_factory
//
- this.txt_factory.Location = new System.Drawing.Point(138, 76);
+ this.txt_factory.Location = new System.Drawing.Point(134, 76);
this.txt_factory.Name = "txt_factory";
this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_factory.Properties.Appearance.Options.UseFont = true;
- this.txt_factory.Size = new System.Drawing.Size(156, 28);
+ this.txt_factory.Size = new System.Drawing.Size(220, 28);
this.txt_factory.TabIndex = 135;
//
// labelControl9
@@ -166,6 +265,7 @@
this.labelControl11.Size = new System.Drawing.Size(45, 18);
this.labelControl11.TabIndex = 133;
this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
//
// label1
//
@@ -174,12 +274,13 @@
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(0, 21);
this.label1.TabIndex = 132;
+ this.label1.Visible = false;
//
// labelControl8
//
this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl8.Appearance.Options.UseFont = true;
- this.labelControl8.Location = new System.Drawing.Point(300, 35);
+ this.labelControl8.Location = new System.Drawing.Point(359, 38);
this.labelControl8.Name = "labelControl8";
this.labelControl8.Size = new System.Drawing.Size(136, 21);
this.labelControl8.TabIndex = 120;
@@ -189,9 +290,9 @@
//
this.txt_upGuid.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.txt_upGuid.FormattingEnabled = true;
- this.txt_upGuid.Location = new System.Drawing.Point(138, 34);
+ this.txt_upGuid.Location = new System.Drawing.Point(134, 34);
this.txt_upGuid.Name = "txt_upGuid";
- this.txt_upGuid.Size = new System.Drawing.Size(156, 29);
+ this.txt_upGuid.Size = new System.Drawing.Size(220, 29);
this.txt_upGuid.TabIndex = 119;
//
// labelControl6
@@ -213,38 +314,22 @@
this.labelControl7.Name = "labelControl7";
this.labelControl7.Size = new System.Drawing.Size(85, 21);
this.labelControl7.TabIndex = 117;
- this.labelControl7.Text = "缁勭粐鐘舵�侊細";
- //
- // txt_isStatus
- //
- this.txt_isStatus.Location = new System.Drawing.Point(138, 244);
- this.txt_isStatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.txt_isStatus.Name = "txt_isStatus";
- this.txt_isStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_isStatus.Properties.Appearance.Options.UseFont = true;
- this.txt_isStatus.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_isStatus.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
- "姝ｅ父",
- "绂佺敤"});
- this.txt_isStatus.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_isStatus.Size = new System.Drawing.Size(156, 28);
- this.txt_isStatus.TabIndex = 116;
+ this.labelControl7.Text = "鏄惁鍚敤锛�";
//
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(138, 295);
+ this.lbGuid.Location = new System.Drawing.Point(134, 295);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 111;
+ this.lbGuid.Visible = false;
//
// labelControl5
//
this.labelControl5.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl5.Appearance.Options.UseForeColor = true;
- this.labelControl5.Location = new System.Drawing.Point(303, 209);
+ this.labelControl5.Location = new System.Drawing.Point(362, 207);
this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl5.Name = "labelControl5";
this.labelControl5.Size = new System.Drawing.Size(8, 18);
@@ -255,7 +340,7 @@
//
this.labelControl1.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl1.Appearance.Options.UseForeColor = true;
- this.labelControl1.Location = new System.Drawing.Point(303, 166);
+ this.labelControl1.Location = new System.Drawing.Point(362, 165);
this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(8, 18);
@@ -266,7 +351,7 @@
//
this.labelControl12.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl12.Appearance.Options.UseForeColor = true;
- this.labelControl12.Location = new System.Drawing.Point(303, 123);
+ this.labelControl12.Location = new System.Drawing.Point(362, 123);
this.labelControl12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl12.Name = "labelControl12";
this.labelControl12.Size = new System.Drawing.Size(8, 18);
@@ -275,11 +360,11 @@
//
// txt_conTel
//
- this.txt_conTel.Location = new System.Drawing.Point(138, 202);
+ this.txt_conTel.Location = new System.Drawing.Point(134, 202);
this.txt_conTel.Name = "txt_conTel";
this.txt_conTel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_conTel.Properties.Appearance.Options.UseFont = true;
- this.txt_conTel.Size = new System.Drawing.Size(156, 28);
+ this.txt_conTel.Size = new System.Drawing.Size(220, 28);
this.txt_conTel.TabIndex = 7;
//
// labelControl4
@@ -294,11 +379,11 @@
//
// txt_conPeople
//
- this.txt_conPeople.Location = new System.Drawing.Point(138, 160);
+ this.txt_conPeople.Location = new System.Drawing.Point(134, 160);
this.txt_conPeople.Name = "txt_conPeople";
this.txt_conPeople.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_conPeople.Properties.Appearance.Options.UseFont = true;
- this.txt_conPeople.Size = new System.Drawing.Size(156, 28);
+ this.txt_conPeople.Size = new System.Drawing.Size(220, 28);
this.txt_conPeople.TabIndex = 5;
//
// labelControl3
@@ -313,11 +398,11 @@
//
// txt_name
//
- this.txt_name.Location = new System.Drawing.Point(138, 118);
+ this.txt_name.Location = new System.Drawing.Point(134, 118);
this.txt_name.Name = "txt_name";
this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_name.Properties.Appearance.Options.UseFont = true;
- this.txt_name.Size = new System.Drawing.Size(156, 28);
+ this.txt_name.Size = new System.Drawing.Size(220, 28);
this.txt_name.TabIndex = 3;
//
// labelControl2
@@ -334,7 +419,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(917, 644);
+ this.ClientSize = new System.Drawing.Size(772, 490);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Organization";
@@ -345,8 +430,9 @@
this.xtraTabPage2.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_conTel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_conPeople.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
@@ -355,7 +441,7 @@
}
#endregion
- private UserControl.ToolBarMenu toolBarMenu1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private System.Windows.Forms.TreeView tlMenu;
@@ -365,7 +451,6 @@
private System.Windows.Forms.ComboBox txt_upGuid;
private DevExpress.XtraEditors.LabelControl labelControl6;
private DevExpress.XtraEditors.LabelControl labelControl7;
- private DevExpress.XtraEditors.ComboBoxEdit txt_isStatus;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl5;
private DevExpress.XtraEditors.LabelControl labelControl1;
@@ -380,5 +465,13 @@
private System.Windows.Forms.Label label1;
private DevExpress.XtraEditors.TextEdit txt_factory;
private DevExpress.XtraEditors.LabelControl labelControl9;
+ private DevExpress.XtraEditors.LabelControl labelControl10;
+ private System.Windows.Forms.CheckBox txt_isStatus;
+ private DevExpress.XtraEditors.TextEdit txt_checkDate;
+ private DevExpress.XtraEditors.TextEdit txt_checkBy;
+ private DevExpress.XtraEditors.LabelControl labelControl14;
+ private DevExpress.XtraEditors.LabelControl labelControl13;
+ private DevExpress.XtraEditors.LabelControl labelControl15;
+ private System.Windows.Forms.Label txt_checkStatus;
}
}
\ No newline at end of file
--
Gitblit v1.9.3