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/User.Designer.cs |  365 ++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 258 insertions(+), 107 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index 1639ba5..e534ed2 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -29,22 +29,41 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
+            DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
+            DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(User));
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+            this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.account = new DevExpress.XtraGrid.Columns.GridColumn();
             this.userName = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.email = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.colCreateBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.createTime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lastLoginTime = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn();
             this.loginCounter = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.colRole = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            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.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
             this.txt_account = new DevExpress.XtraEditors.TextEdit();
@@ -57,17 +76,18 @@
             this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
             this.txt_email = new DevExpress.XtraEditors.TextEdit();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
+            this.tipPwd = new DevExpress.XtraEditors.LabelControl();
             this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_isLocked = new DevExpress.XtraEditors.ComboBoxEdit();
             this.txt_password = new DevExpress.XtraEditors.TextEdit();
             this.lbPwd = new DevExpress.XtraEditors.LabelControl();
             this.txt_userName = new DevExpress.XtraEditors.TextEdit();
             this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -78,19 +98,37 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_address.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tel.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_isLocked.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_password.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit();
             this.SuspendLayout();
             // 
+            // isLocked
+            // 
+            this.isLocked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.isLocked.AppearanceCell.Options.UseFont = true;
+            this.isLocked.Caption = "鐘舵��";
+            this.isLocked.FieldName = "isStatus";
+            this.isLocked.MinWidth = 25;
+            this.isLocked.Name = "isLocked";
+            this.isLocked.OptionsColumn.AllowEdit = false;
+            this.isLocked.Tag = "query_a.IS_STATUS";
+            this.isLocked.Visible = true;
+            this.isLocked.VisibleIndex = 7;
+            this.isLocked.Width = 94;
+            // 
             // 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(1128, 80);
+            this.toolBarMenu1.rptParameter = "rpt_User{}";
+            this.toolBarMenu1.Size = new System.Drawing.Size(738, 80);
             this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
             // 
             // gcMain
             // 
@@ -99,7 +137,10 @@
             this.gcMain.Location = new System.Drawing.Point(0, 0);
             this.gcMain.MainView = this.gridView1;
             this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1126, 531);
+            this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1,
+            this.repositoryItemButtonEdit2});
+            this.gcMain.Size = new System.Drawing.Size(736, 531);
             this.gcMain.TabIndex = 1;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -113,13 +154,26 @@
             this.userName,
             this.tel,
             this.email,
+            this.colCreateBy,
             this.createTime,
             this.lastLoginTime,
             this.isLocked,
-            this.loginCounter});
+            this.loginCounter,
+            this.colRole,
+            this.gridColumn1});
+            gridFormatRule1.Column = this.isLocked;
+            gridFormatRule1.Name = "Format0";
+            formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red;
+            formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
+            formatConditionRuleExpression1.Expression = "[isStatusTxt] = [绂佺敤]";
+            formatConditionRuleExpression1.PredefinedName = "Red Text";
+            gridFormatRule1.Rule = formatConditionRuleExpression1;
+            this.gridView1.FormatRules.Add(gridFormatRule1);
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsBehavior.Editable = false;
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
             // account
             // 
@@ -129,6 +183,8 @@
             this.account.FieldName = "account";
             this.account.MinWidth = 25;
             this.account.Name = "account";
+            this.account.OptionsColumn.AllowEdit = false;
+            this.account.Tag = "query_a.ACCOUNT";
             this.account.Visible = true;
             this.account.VisibleIndex = 0;
             this.account.Width = 94;
@@ -141,6 +197,8 @@
             this.userName.FieldName = "userName";
             this.userName.MinWidth = 25;
             this.userName.Name = "userName";
+            this.userName.OptionsColumn.AllowEdit = false;
+            this.userName.Tag = "query_a.USER_NAME";
             this.userName.Visible = true;
             this.userName.VisibleIndex = 1;
             this.userName.Width = 94;
@@ -153,6 +211,8 @@
             this.tel.FieldName = "tel";
             this.tel.MinWidth = 25;
             this.tel.Name = "tel";
+            this.tel.OptionsColumn.AllowEdit = false;
+            this.tel.Tag = "query_a.tel";
             this.tel.Visible = true;
             this.tel.VisibleIndex = 2;
             this.tel.Width = 94;
@@ -165,9 +225,22 @@
             this.email.FieldName = "email";
             this.email.MinWidth = 25;
             this.email.Name = "email";
+            this.email.OptionsColumn.AllowEdit = false;
+            this.email.Tag = "query_a.email";
             this.email.Visible = true;
             this.email.VisibleIndex = 3;
             this.email.Width = 94;
+            // 
+            // colCreateBy
+            // 
+            this.colCreateBy.Caption = "寤虹珛鑰�";
+            this.colCreateBy.FieldName = "createBy";
+            this.colCreateBy.MinWidth = 25;
+            this.colCreateBy.Name = "colCreateBy";
+            this.colCreateBy.OptionsColumn.AllowEdit = false;
+            this.colCreateBy.Visible = true;
+            this.colCreateBy.VisibleIndex = 4;
+            this.colCreateBy.Width = 94;
             // 
             // createTime
             // 
@@ -177,8 +250,10 @@
             this.createTime.FieldName = "createTime";
             this.createTime.MinWidth = 25;
             this.createTime.Name = "createTime";
+            this.createTime.OptionsColumn.AllowEdit = false;
+            this.createTime.Tag = "query_a.CREATE_TIME";
             this.createTime.Visible = true;
-            this.createTime.VisibleIndex = 4;
+            this.createTime.VisibleIndex = 5;
             this.createTime.Width = 94;
             // 
             // lastLoginTime
@@ -186,24 +261,14 @@
             this.lastLoginTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lastLoginTime.AppearanceCell.Options.UseFont = true;
             this.lastLoginTime.Caption = "鏈�杩戠櫥褰曟椂闂�";
-            this.lastLoginTime.FieldName = "lastLoginTime";
+            this.lastLoginTime.FieldName = "lastloginTime";
             this.lastLoginTime.MinWidth = 25;
             this.lastLoginTime.Name = "lastLoginTime";
+            this.lastLoginTime.OptionsColumn.AllowEdit = false;
+            this.lastLoginTime.Tag = "query_a.LASTLOGIN_TIME";
             this.lastLoginTime.Visible = true;
-            this.lastLoginTime.VisibleIndex = 5;
+            this.lastLoginTime.VisibleIndex = 6;
             this.lastLoginTime.Width = 94;
-            // 
-            // isLocked
-            // 
-            this.isLocked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.isLocked.AppearanceCell.Options.UseFont = true;
-            this.isLocked.Caption = "鐘舵��";
-            this.isLocked.FieldName = "isLockedTxt";
-            this.isLocked.MinWidth = 25;
-            this.isLocked.Name = "isLocked";
-            this.isLocked.Visible = true;
-            this.isLocked.VisibleIndex = 6;
-            this.isLocked.Width = 94;
             // 
             // loginCounter
             // 
@@ -213,9 +278,62 @@
             this.loginCounter.FieldName = "loginCounter";
             this.loginCounter.MinWidth = 25;
             this.loginCounter.Name = "loginCounter";
+            this.loginCounter.OptionsColumn.AllowEdit = false;
+            this.loginCounter.Tag = "query_a.LOGIN_COUNTER";
             this.loginCounter.Visible = true;
-            this.loginCounter.VisibleIndex = 7;
+            this.loginCounter.VisibleIndex = 8;
             this.loginCounter.Width = 94;
+            // 
+            // colRole
+            // 
+            this.colRole.Caption = "瑙掕壊璁剧疆";
+            this.colRole.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.colRole.MinWidth = 25;
+            this.colRole.Name = "colRole";
+            this.colRole.OptionsFilter.AllowAutoFilter = false;
+            this.colRole.OptionsFilter.AllowFilter = false;
+            this.colRole.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways;
+            this.colRole.Tag = "";
+            this.colRole.Visible = true;
+            this.colRole.VisibleIndex = 9;
+            this.colRole.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
+            editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            serializableAppearanceObject17.Font = new System.Drawing.Font("Tahoma", 10F);
+            serializableAppearanceObject17.Options.UseFont = true;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁剧疆瑙掕壊", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "閲嶇疆瀵嗙爜";
+            this.gridColumn1.ColumnEdit = this.repositoryItemButtonEdit2;
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsFilter.AllowAutoFilter = false;
+            this.gridColumn1.OptionsFilter.AllowFilter = false;
+            this.gridColumn1.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways;
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 10;
+            this.gridColumn1.Width = 94;
+            // 
+            // repositoryItemButtonEdit2
+            // 
+            this.repositoryItemButtonEdit2.AutoHeight = false;
+            editorButtonImageOptions6.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions6.Image")));
+            editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶇疆瀵嗙爜", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
             // 
             // xtraTabControl1
             // 
@@ -223,7 +341,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(1128, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(738, 602);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -232,34 +350,36 @@
             // 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(1126, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(736, 570);
             this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
             // 
-            // PageBar1
+            // pageBar1
             // 
-            this.PageBar1.CurrentPage = 1;
-            this.PageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.PageBar1.Location = new System.Drawing.Point(0, 531);
-            this.PageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.PageBar1.Name = "PageBar1";
-            this.PageBar1.RecordCount = 0;
-            this.PageBar1.RowsCount = 50;
-            this.PageBar1.Size = new System.Drawing.Size(1126, 39);
-            this.PageBar1.TabIndex = 3;
-            this.PageBar1.TotalPages = 0;
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 531);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.RowsCount = 50;
+            this.pageBar1.Size = new System.Drawing.Size(736, 39);
+            this.pageBar1.TabIndex = 3;
+            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(1126, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(736, 570);
             this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
             // 
             // panel1
             // 
+            this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_isStatus);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.labelControl10);
             this.panel1.Controls.Add(this.txt_account);
@@ -272,19 +392,28 @@
             this.panel1.Controls.Add(this.labelControl1);
             this.panel1.Controls.Add(this.txt_email);
             this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.labelControl12);
+            this.panel1.Controls.Add(this.tipPwd);
             this.panel1.Controls.Add(this.labelControl9);
             this.panel1.Controls.Add(this.labelControl6);
             this.panel1.Controls.Add(this.labelControl5);
-            this.panel1.Controls.Add(this.txt_isLocked);
             this.panel1.Controls.Add(this.txt_password);
             this.panel1.Controls.Add(this.lbPwd);
             this.panel1.Controls.Add(this.txt_userName);
             this.panel1.Controls.Add(this.labelControl2);
+            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(76, 20);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(585, 426);
             this.panel1.TabIndex = 1;
+            // 
+            // txt_isStatus
+            // 
+            this.txt_isStatus.AutoSize = true;
+            this.txt_isStatus.Location = new System.Drawing.Point(125, 342);
+            this.txt_isStatus.Name = "txt_isStatus";
+            this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
+            this.txt_isStatus.TabIndex = 133;
+            this.txt_isStatus.UseVisualStyleBackColor = true;
             // 
             // labelControl11
             // 
@@ -294,12 +423,13 @@
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
             this.labelControl11.TabIndex = 130;
             this.labelControl11.Text = "涓婚敭锛�";
+            this.labelControl11.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(434, 29);
             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);
@@ -308,79 +438,97 @@
             // 
             // txt_account
             // 
-            this.txt_account.Location = new System.Drawing.Point(109, 16);
+            this.txt_account.Location = new System.Drawing.Point(125, 16);
             this.txt_account.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_account.Name = "txt_account";
-            this.txt_account.Size = new System.Drawing.Size(297, 24);
+            this.txt_account.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_account.Properties.Appearance.Options.UseFont = true;
+            this.txt_account.Size = new System.Drawing.Size(297, 28);
             this.txt_account.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_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(109, 255);
+            this.txt_remark.Location = new System.Drawing.Point(125, 256);
             this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_remark.Name = "txt_remark";
+            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_remark.Properties.Appearance.Options.UseFont = true;
             this.txt_remark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
             this.txt_remark.Size = new System.Drawing.Size(297, 68);
             this.txt_remark.TabIndex = 126;
             // 
             // labelControl7
             // 
-            this.labelControl7.Location = new System.Drawing.Point(61, 268);
+            this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl7.Appearance.Options.UseFont = true;
+            this.labelControl7.Location = new System.Drawing.Point(61, 256);
             this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(45, 18);
+            this.labelControl7.Size = new System.Drawing.Size(51, 21);
             this.labelControl7.TabIndex = 125;
             this.labelControl7.Text = "澶囨敞锛�";
             // 
             // txt_address
             // 
-            this.txt_address.Location = new System.Drawing.Point(109, 223);
+            this.txt_address.Location = new System.Drawing.Point(125, 216);
             this.txt_address.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_address.Name = "txt_address";
-            this.txt_address.Size = new System.Drawing.Size(297, 24);
+            this.txt_address.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_address.Properties.Appearance.Options.UseFont = true;
+            this.txt_address.Size = new System.Drawing.Size(297, 28);
             this.txt_address.TabIndex = 124;
             // 
             // labelControl3
             // 
-            this.labelControl3.Location = new System.Drawing.Point(31, 227);
+            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl3.Appearance.Options.UseFont = true;
+            this.labelControl3.Location = new System.Drawing.Point(31, 220);
             this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(75, 18);
+            this.labelControl3.Size = new System.Drawing.Size(85, 21);
             this.labelControl3.TabIndex = 123;
             this.labelControl3.Text = "浣忓鍦板潃锛�";
             // 
             // txt_tel
             // 
-            this.txt_tel.Location = new System.Drawing.Point(109, 179);
+            this.txt_tel.Location = new System.Drawing.Point(125, 176);
             this.txt_tel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_tel.Name = "txt_tel";
-            this.txt_tel.Size = new System.Drawing.Size(297, 24);
+            this.txt_tel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_tel.Properties.Appearance.Options.UseFont = true;
+            this.txt_tel.Size = new System.Drawing.Size(297, 28);
             this.txt_tel.TabIndex = 122;
             // 
             // labelControl1
             // 
-            this.labelControl1.Location = new System.Drawing.Point(61, 183);
+            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl1.Appearance.Options.UseFont = true;
+            this.labelControl1.Location = new System.Drawing.Point(61, 180);
             this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(45, 18);
+            this.labelControl1.Size = new System.Drawing.Size(51, 21);
             this.labelControl1.TabIndex = 121;
             this.labelControl1.Text = "鐢佃瘽锛�";
             // 
             // txt_email
             // 
-            this.txt_email.Location = new System.Drawing.Point(109, 135);
+            this.txt_email.Location = new System.Drawing.Point(125, 136);
             this.txt_email.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_email.Name = "txt_email";
-            this.txt_email.Size = new System.Drawing.Size(297, 24);
+            this.txt_email.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_email.Properties.Appearance.Options.UseFont = true;
+            this.txt_email.Size = new System.Drawing.Size(297, 28);
             this.txt_email.TabIndex = 120;
             // 
             // lbGuid
@@ -388,25 +536,26 @@
             this.lbGuid.AutoSize = true;
             this.lbGuid.Location = new System.Drawing.Point(112, 388);
             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;
+            this.lbGuid.Visible = false;
             // 
-            // labelControl12
+            // tipPwd
             // 
-            this.labelControl12.Appearance.ForeColor = System.Drawing.Color.Red;
-            this.labelControl12.Appearance.Options.UseForeColor = true;
-            this.labelControl12.Location = new System.Drawing.Point(418, 56);
-            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.tipPwd.Appearance.ForeColor = System.Drawing.Color.Red;
+            this.tipPwd.Appearance.Options.UseForeColor = true;
+            this.tipPwd.Location = new System.Drawing.Point(434, 59);
+            this.tipPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.tipPwd.Name = "tipPwd";
+            this.tipPwd.Size = new System.Drawing.Size(8, 18);
+            this.tipPwd.TabIndex = 107;
+            this.tipPwd.Text = "*";
             // 
             // labelControl9
             // 
             this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
             this.labelControl9.Appearance.Options.UseForeColor = true;
-            this.labelControl9.Location = new System.Drawing.Point(418, 96);
+            this.labelControl9.Location = new System.Drawing.Point(434, 96);
             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);
@@ -415,69 +564,65 @@
             // 
             // labelControl6
             // 
-            this.labelControl6.Location = new System.Drawing.Point(61, 138);
+            this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl6.Appearance.Options.UseFont = true;
+            this.labelControl6.Location = new System.Drawing.Point(61, 140);
             this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl6.Name = "labelControl6";
-            this.labelControl6.Size = new System.Drawing.Size(45, 18);
+            this.labelControl6.Size = new System.Drawing.Size(51, 21);
             this.labelControl6.TabIndex = 103;
             this.labelControl6.Text = "閭锛�";
             // 
             // labelControl5
             // 
-            this.labelControl5.Location = new System.Drawing.Point(31, 344);
+            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl5.Appearance.Options.UseFont = true;
+            this.labelControl5.Location = new System.Drawing.Point(31, 340);
             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_isLocked
-            // 
-            this.txt_isLocked.EditValue = "-璇烽�夋嫨-";
-            this.txt_isLocked.Location = new System.Drawing.Point(109, 340);
-            this.txt_isLocked.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_isLocked.Name = "txt_isLocked";
-            this.txt_isLocked.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_isLocked.Properties.Items.AddRange(new object[] {
-            "-璇烽�夋嫨-",
-            "姝e父",
-            "閿佸畾"});
-            this.txt_isLocked.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_isLocked.Size = new System.Drawing.Size(297, 24);
-            this.txt_isLocked.TabIndex = 100;
+            this.labelControl5.Text = "鍚敤鐘舵�侊細";
             // 
             // txt_password
             // 
-            this.txt_password.Location = new System.Drawing.Point(109, 53);
+            this.txt_password.Location = new System.Drawing.Point(125, 56);
             this.txt_password.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_password.Name = "txt_password";
-            this.txt_password.Size = new System.Drawing.Size(297, 24);
+            this.txt_password.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_password.Properties.Appearance.Options.UseFont = true;
+            this.txt_password.Size = new System.Drawing.Size(297, 28);
             this.txt_password.TabIndex = 99;
             // 
             // lbPwd
             // 
-            this.lbPwd.Location = new System.Drawing.Point(31, 57);
+            this.lbPwd.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lbPwd.Appearance.Options.UseFont = true;
+            this.lbPwd.Location = new System.Drawing.Point(31, 60);
             this.lbPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.lbPwd.Name = "lbPwd";
-            this.lbPwd.Size = new System.Drawing.Size(75, 18);
+            this.lbPwd.Size = new System.Drawing.Size(85, 21);
             this.lbPwd.TabIndex = 98;
             this.lbPwd.Text = "鍒濆瀵嗙爜锛�";
             // 
             // txt_userName
             // 
-            this.txt_userName.Location = new System.Drawing.Point(109, 89);
+            this.txt_userName.Location = new System.Drawing.Point(125, 96);
             this.txt_userName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_userName.Name = "txt_userName";
-            this.txt_userName.Size = new System.Drawing.Size(297, 24);
+            this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_userName.Properties.Appearance.Options.UseFont = true;
+            this.txt_userName.Size = new System.Drawing.Size(297, 28);
             this.txt_userName.TabIndex = 95;
             // 
             // labelControl2
             // 
-            this.labelControl2.Location = new System.Drawing.Point(61, 93);
+            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl2.Appearance.Options.UseFont = true;
+            this.labelControl2.Location = new System.Drawing.Point(61, 100);
             this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(45, 18);
+            this.labelControl2.Size = new System.Drawing.Size(51, 21);
             this.labelControl2.TabIndex = 94;
             this.labelControl2.Text = "濮撳悕锛�";
             // 
@@ -485,13 +630,15 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.ClientSize = new System.Drawing.Size(738, 682);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "User";
             this.Text = "User";
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);
@@ -503,7 +650,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_address.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tel.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_isLocked.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_password.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit();
             this.ResumeLayout(false);
@@ -512,10 +658,9 @@
 
         #endregion
 
-        private UserControl.ToolBarMenu toolBarMenu1;
+        private UserControl.UcToolBarMenu toolBarMenu1;
         private DevExpress.XtraGrid.GridControl gcMain;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn account;
         private DevExpress.XtraGrid.Columns.GridColumn userName;
         private DevExpress.XtraGrid.Columns.GridColumn tel;
         private DevExpress.XtraGrid.Columns.GridColumn email;
@@ -526,7 +671,7 @@
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        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_account;
@@ -539,15 +684,21 @@
         private DevExpress.XtraEditors.LabelControl labelControl1;
         private DevExpress.XtraEditors.TextEdit txt_email;
         private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl labelControl12;
+        private DevExpress.XtraEditors.LabelControl tipPwd;
         private DevExpress.XtraEditors.LabelControl labelControl9;
         private DevExpress.XtraEditors.LabelControl labelControl6;
         private DevExpress.XtraEditors.LabelControl labelControl5;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_isLocked;
         private DevExpress.XtraEditors.TextEdit txt_password;
         private DevExpress.XtraEditors.LabelControl lbPwd;
         private DevExpress.XtraEditors.TextEdit txt_userName;
         private DevExpress.XtraEditors.LabelControl labelControl2;
         private DevExpress.XtraEditors.LabelControl labelControl11;
+        private DevExpress.XtraGrid.Columns.GridColumn colRole;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn account;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+        private System.Windows.Forms.CheckBox txt_isStatus;
+        private DevExpress.XtraGrid.Columns.GridColumn colCreateBy;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3