From c0575b3330ef57fffd9e617eb25ea38f821c0aa7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 31 十月 2024 10:19:43 +0800
Subject: [PATCH] 检验项目增加了审核
---
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 174 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 97 insertions(+), 77 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index e72dd84..4794cd4 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -29,7 +29,7 @@
/// </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.gcMain = new DevExpress.XtraGrid.GridControl();
@@ -37,21 +37,21 @@
this.roleName = new DevExpress.XtraGrid.Columns.GridColumn();
this.rolRemark = new DevExpress.XtraGrid.Columns.GridColumn();
this.status = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.roleCreateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.PageBar1 = new UserControls.Data.PageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_isStatus = new System.Windows.Forms.CheckBox();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.txt_roleName = new DevExpress.XtraEditors.TextEdit();
this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
- this.txt_rolRemark = new DevExpress.XtraEditors.MemoEdit();
+ this.txt_roleRemark = new DevExpress.XtraEditors.MemoEdit();
this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
- this.txt_status = new DevExpress.XtraEditors.ComboBoxEdit();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.trv = new System.Windows.Forms.TreeView();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -62,19 +62,23 @@
this.xtraTabPage2.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_rolRemark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).BeginInit();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// toolBarMenu1
//
+ this.toolBarMenu1.chkParameter = null;
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(1237, 80);
this.toolBarMenu1.TabIndex = 5;
+ this.toolBarMenu1.xlsInService = null;
+
//
// xtraTabControl1
//
@@ -91,7 +95,7 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.PageBar1);
+ this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(933, 629);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
@@ -99,6 +103,7 @@
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
@@ -109,14 +114,18 @@
//
// gridView1
//
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.roleName,
this.rolRemark,
this.status,
+ this.roleCreateBy,
this.createDate});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsView.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
//
// roleName
//
@@ -125,6 +134,7 @@
this.roleName.MinWidth = 25;
this.roleName.Name = "roleName";
this.roleName.OptionsColumn.AllowEdit = false;
+ this.roleName.Tag = "query_a.role_Name";
this.roleName.Visible = true;
this.roleName.VisibleIndex = 0;
this.roleName.Width = 94;
@@ -132,10 +142,11 @@
// rolRemark
//
this.rolRemark.Caption = "鍔熻兘澶囨敞";
- this.rolRemark.FieldName = "rolRemark";
+ this.rolRemark.FieldName = "roleRemark";
this.rolRemark.MinWidth = 25;
this.rolRemark.Name = "rolRemark";
this.rolRemark.OptionsColumn.AllowEdit = false;
+ this.rolRemark.Tag = "query_a.role_Remark";
this.rolRemark.Visible = true;
this.rolRemark.VisibleIndex = 1;
this.rolRemark.Width = 94;
@@ -143,62 +154,86 @@
// status
//
this.status.Caption = "鐘舵��";
- this.status.FieldName = "statusTxt";
+ this.status.FieldName = "isStatus";
this.status.MinWidth = 25;
this.status.Name = "status";
this.status.OptionsColumn.AllowEdit = false;
+ this.status.Tag = "query_a.is_Status";
this.status.Visible = true;
this.status.VisibleIndex = 2;
this.status.Width = 94;
//
+ // roleCreateBy
+ //
+ this.roleCreateBy.Caption = "寤虹珛鑰�";
+ this.roleCreateBy.FieldName = "createBy";
+ this.roleCreateBy.MinWidth = 25;
+ this.roleCreateBy.Name = "roleCreateBy";
+ this.roleCreateBy.OptionsColumn.AllowEdit = false;
+ this.roleCreateBy.Visible = true;
+ this.roleCreateBy.VisibleIndex = 3;
+ this.roleCreateBy.Width = 94;
+ //
// createDate
//
this.createDate.Caption = "寤虹珛鏃堕棿";
- this.createDate.FieldName = "createDate";
+ this.createDate.FieldName = "createTime";
this.createDate.MinWidth = 25;
this.createDate.Name = "createDate";
this.createDate.OptionsColumn.AllowEdit = false;
+ this.createDate.Tag = "query_a.create_Time";
this.createDate.Visible = true;
- this.createDate.VisibleIndex = 3;
+ this.createDate.VisibleIndex = 4;
this.createDate.Width = 94;
//
- // PageBar1
+ // pageBar1
//
- this.PageBar1.CurrentPage = 0;
- this.PageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.PageBar1.Location = new System.Drawing.Point(0, 589);
- this.PageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.PageBar1.Name = "PageBar1";
- this.PageBar1.RecordCount = 0;
- this.PageBar1.RowsCount = 0;
- this.PageBar1.Size = new System.Drawing.Size(933, 40);
- this.PageBar1.TabIndex = 6;
- this.PageBar1.TotalPages = 0;
+ this.pageBar1.CurrentPage = 0;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 589);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.RowsCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(933, 40);
+ this.pageBar1.TabIndex = 6;
+ this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(933, 629);
this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
//
// panel1
//
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_isStatus);
this.panel1.Controls.Add(this.labelControl1);
this.panel1.Controls.Add(this.labelControl10);
this.panel1.Controls.Add(this.txt_roleName);
this.panel1.Controls.Add(this.labelControl8);
- this.panel1.Controls.Add(this.txt_rolRemark);
+ this.panel1.Controls.Add(this.txt_roleRemark);
this.panel1.Controls.Add(this.labelControl7);
this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.labelControl12);
this.panel1.Controls.Add(this.labelControl9);
this.panel1.Controls.Add(this.labelControl5);
- this.panel1.Controls.Add(this.txt_status);
+ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(62, 49);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(585, 386);
+ this.panel1.Size = new System.Drawing.Size(507, 293);
this.panel1.TabIndex = 1;
+ //
+ // txt_isStatus
+ //
+ this.txt_isStatus.AutoSize = true;
+ this.txt_isStatus.Location = new System.Drawing.Point(123, 154);
+ this.txt_isStatus.Name = "txt_isStatus";
+ this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
+ this.txt_isStatus.TabIndex = 132;
+ this.txt_isStatus.UseVisualStyleBackColor = true;
//
// labelControl1
//
@@ -208,12 +243,13 @@
this.labelControl1.Size = new System.Drawing.Size(45, 18);
this.labelControl1.TabIndex = 130;
this.labelControl1.Text = "涓婚敭锛�";
+ this.labelControl1.Visible = false;
//
// labelControl10
//
this.labelControl10.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl10.Appearance.Options.UseForeColor = true;
- this.labelControl10.Location = new System.Drawing.Point(418, 29);
+ this.labelControl10.Location = new System.Drawing.Point(426, 25);
this.labelControl10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl10.Name = "labelControl10";
this.labelControl10.Size = new System.Drawing.Size(8, 18);
@@ -222,36 +258,44 @@
//
// txt_roleName
//
- this.txt_roleName.Location = new System.Drawing.Point(115, 16);
+ this.txt_roleName.Location = new System.Drawing.Point(123, 16);
this.txt_roleName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_roleName.Name = "txt_roleName";
- this.txt_roleName.Size = new System.Drawing.Size(297, 24);
+ this.txt_roleName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_roleName.Properties.Appearance.Options.UseFont = true;
+ this.txt_roleName.Size = new System.Drawing.Size(297, 28);
this.txt_roleName.TabIndex = 128;
//
// labelControl8
//
+ this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl8.Appearance.Options.UseFont = true;
this.labelControl8.Location = new System.Drawing.Point(31, 20);
this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(75, 18);
+ this.labelControl8.Size = new System.Drawing.Size(85, 21);
this.labelControl8.TabIndex = 127;
this.labelControl8.Text = "瑙掕壊鍚嶇О锛�";
//
- // txt_rolRemark
+ // txt_roleRemark
//
- this.txt_rolRemark.Location = new System.Drawing.Point(115, 54);
- this.txt_rolRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.txt_rolRemark.Name = "txt_rolRemark";
- this.txt_rolRemark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.txt_rolRemark.Size = new System.Drawing.Size(297, 68);
- this.txt_rolRemark.TabIndex = 126;
+ this.txt_roleRemark.Location = new System.Drawing.Point(123, 67);
+ this.txt_roleRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.txt_roleRemark.Name = "txt_roleRemark";
+ this.txt_roleRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_roleRemark.Properties.Appearance.Options.UseFont = true;
+ this.txt_roleRemark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.txt_roleRemark.Size = new System.Drawing.Size(297, 68);
+ this.txt_roleRemark.TabIndex = 126;
//
// labelControl7
//
+ this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl7.Appearance.Options.UseFont = true;
this.labelControl7.Location = new System.Drawing.Point(31, 67);
this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(75, 18);
+ this.labelControl7.Size = new System.Drawing.Size(85, 21);
this.labelControl7.TabIndex = 125;
this.labelControl7.Text = "瑙掕壊澶囨敞锛�";
//
@@ -260,25 +304,15 @@
this.lbGuid.AutoSize = true;
this.lbGuid.Location = new System.Drawing.Point(121, 226);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 18);
+ this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
- //
- // labelControl12
- //
- this.labelControl12.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl12.Appearance.Options.UseForeColor = true;
- this.labelControl12.Location = new System.Drawing.Point(418, 55);
- 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);
- this.labelControl12.TabIndex = 107;
- this.labelControl12.Text = "*";
+ this.lbGuid.Visible = false;
//
// labelControl9
//
this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
this.labelControl9.Appearance.Options.UseForeColor = true;
- this.labelControl9.Location = new System.Drawing.Point(418, 98);
+ this.labelControl9.Location = new System.Drawing.Point(426, 73);
this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl9.Name = "labelControl9";
this.labelControl9.Size = new System.Drawing.Size(8, 18);
@@ -287,27 +321,14 @@
//
// labelControl5
//
- this.labelControl5.Location = new System.Drawing.Point(31, 152);
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(31, 156);
this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(75, 18);
+ this.labelControl5.Size = new System.Drawing.Size(85, 21);
this.labelControl5.TabIndex = 101;
- this.labelControl5.Text = "瑙掕壊鐘舵�侊細";
- //
- // txt_status
- //
- this.txt_status.Location = new System.Drawing.Point(115, 148);
- this.txt_status.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.txt_status.Name = "txt_status";
- this.txt_status.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_status.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
- "姝ｅ父",
- "绂佺敤"});
- this.txt_status.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_status.Size = new System.Drawing.Size(297, 24);
- this.txt_status.TabIndex = 100;
+ this.labelControl5.Text = "鍚敤鐘舵�侊細";
//
// groupBox1
//
@@ -349,15 +370,14 @@
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_rolRemark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).EndInit();
this.groupBox1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
- private UserControl.ToolBarMenu toolBarMenu1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
@@ -368,19 +388,19 @@
private DevExpress.XtraGrid.Columns.GridColumn status;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.TreeView trv;
- private UserControls.Data.PageBar PageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private System.Windows.Forms.Panel panel1;
private DevExpress.XtraEditors.LabelControl labelControl10;
private DevExpress.XtraEditors.TextEdit txt_roleName;
private DevExpress.XtraEditors.LabelControl labelControl8;
- private DevExpress.XtraEditors.MemoEdit txt_rolRemark;
+ private DevExpress.XtraEditors.MemoEdit txt_roleRemark;
private DevExpress.XtraEditors.LabelControl labelControl7;
private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl12;
private DevExpress.XtraEditors.LabelControl labelControl9;
private DevExpress.XtraEditors.LabelControl labelControl5;
- private DevExpress.XtraEditors.ComboBoxEdit txt_status;
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraGrid.Columns.GridColumn createDate;
+ private DevExpress.XtraGrid.Columns.GridColumn roleCreateBy;
+ private System.Windows.Forms.CheckBox txt_isStatus;
}
}
\ No newline at end of file
--
Gitblit v1.9.3