From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 06 三月 2025 08:13:37 +0800
Subject: [PATCH] 版面

---
 DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs |  340 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 216 insertions(+), 124 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index 2b11f21..0762d5e 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -29,30 +29,43 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(User));
+            DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
+            DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(User));
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = 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.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             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.gridColumn3 = 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 DevExpress.XtraEditors.CheckEdit();
+            this.txt_staffId = new Gs.DevApp.UserControl.UcLookStaff();
+            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
             this.txt_account = new DevExpress.XtraEditors.TextEdit();
@@ -69,7 +82,6 @@
             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();
@@ -77,30 +89,52 @@
             ((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();
             this.xtraTabPage2.SuspendLayout();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_account.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
             ((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.MaxWidth = 50;
+            this.isLocked.MinWidth = 50;
+            this.isLocked.Name = "isLocked";
+            this.isLocked.OptionsColumn.AllowEdit = false;
+            this.isLocked.Tag = "query_IS_STATUS";
+            this.isLocked.UnboundDataType = typeof(bool);
+            this.isLocked.Visible = true;
+            this.isLocked.VisibleIndex = 0;
+            this.isLocked.Width = 50;
+            // 
             // toolBarMenu1
             // 
-            this.toolBarMenu1.actions = ((System.Collections.Generic.List<string>)(resources.GetObject("toolBarMenu1.actions")));
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = 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(1004, 80);
             this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
             // 
             // gcMain
             // 
@@ -110,31 +144,58 @@
             this.gcMain.MainView = this.gridView1;
             this.gcMain.Name = "gcMain";
             this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1});
-            this.gcMain.Size = new System.Drawing.Size(1126, 531);
+            this.repositoryItemButtonEdit1,
+            this.repositoryItemButtonEdit2});
+            this.gcMain.Size = new System.Drawing.Size(1002, 531);
             this.gcMain.TabIndex = 1;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
             // 
             // gridView1
             // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.isLocked,
+            this.gridColumn2,
             this.account,
             this.userName,
-            this.tel,
-            this.email,
+            this.colCreateBy,
             this.createTime,
             this.lastLoginTime,
-            this.isLocked,
             this.loginCounter,
-            this.colRole});
+            this.gridColumn3,
+            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.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鍦ㄧ嚎鐘舵��";
+            this.gridColumn2.FieldName = "flagOnline";
+            this.gridColumn2.MaxWidth = 50;
+            this.gridColumn2.MinWidth = 50;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.OptionsColumn.AllowEdit = false;
+            this.gridColumn2.Tag = "query_flag_Online";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 1;
+            this.gridColumn2.Width = 50;
             // 
             // account
             // 
@@ -142,51 +203,39 @@
             this.account.AppearanceCell.Options.UseFont = true;
             this.account.Caption = "鐧诲綍璐﹀彿";
             this.account.FieldName = "account";
-            this.account.MinWidth = 25;
+            this.account.MinWidth = 50;
             this.account.Name = "account";
             this.account.OptionsColumn.AllowEdit = false;
+            this.account.Tag = "query_ACCOUNT";
             this.account.Visible = true;
-            this.account.VisibleIndex = 0;
+            this.account.VisibleIndex = 2;
             this.account.Width = 94;
             // 
             // userName
             // 
             this.userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.userName.AppearanceCell.Options.UseFont = true;
-            this.userName.Caption = "鐢ㄦ埛鍚�";
+            this.userName.Caption = "鐧诲綍鍚嶇О";
             this.userName.FieldName = "userName";
-            this.userName.MinWidth = 25;
+            this.userName.MinWidth = 50;
             this.userName.Name = "userName";
             this.userName.OptionsColumn.AllowEdit = false;
+            this.userName.Tag = "query_USER_NAME";
             this.userName.Visible = true;
-            this.userName.VisibleIndex = 1;
+            this.userName.VisibleIndex = 3;
             this.userName.Width = 94;
             // 
-            // tel
+            // colCreateBy
             // 
-            this.tel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.tel.AppearanceCell.Options.UseFont = true;
-            this.tel.Caption = "鑱旂郴鐢佃瘽";
-            this.tel.FieldName = "tel";
-            this.tel.MinWidth = 25;
-            this.tel.Name = "tel";
-            this.tel.OptionsColumn.AllowEdit = false;
-            this.tel.Visible = true;
-            this.tel.VisibleIndex = 2;
-            this.tel.Width = 94;
-            // 
-            // email
-            // 
-            this.email.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.email.AppearanceCell.Options.UseFont = true;
-            this.email.Caption = "閭";
-            this.email.FieldName = "email";
-            this.email.MinWidth = 25;
-            this.email.Name = "email";
-            this.email.OptionsColumn.AllowEdit = false;
-            this.email.Visible = true;
-            this.email.VisibleIndex = 3;
-            this.email.Width = 94;
+            this.colCreateBy.Caption = "寤虹珛鑰�";
+            this.colCreateBy.FieldName = "createBy";
+            this.colCreateBy.MinWidth = 50;
+            this.colCreateBy.Name = "colCreateBy";
+            this.colCreateBy.OptionsColumn.AllowEdit = false;
+            this.colCreateBy.Tag = "query_CREATE_BY";
+            this.colCreateBy.Visible = true;
+            this.colCreateBy.VisibleIndex = 4;
+            this.colCreateBy.Width = 94;
             // 
             // createTime
             // 
@@ -194,38 +243,27 @@
             this.createTime.AppearanceCell.Options.UseFont = true;
             this.createTime.Caption = "寤虹珛鏃堕棿";
             this.createTime.FieldName = "createTime";
-            this.createTime.MinWidth = 25;
+            this.createTime.MinWidth = 50;
             this.createTime.Name = "createTime";
             this.createTime.OptionsColumn.AllowEdit = false;
+            this.createTime.Tag = "query_CREATE_TIME";
             this.createTime.Visible = true;
-            this.createTime.VisibleIndex = 4;
-            this.createTime.Width = 94;
+            this.createTime.VisibleIndex = 5;
+            this.createTime.Width = 180;
             // 
             // lastLoginTime
             // 
             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.MinWidth = 25;
+            this.lastLoginTime.FieldName = "lastloginTime";
+            this.lastLoginTime.MinWidth = 50;
             this.lastLoginTime.Name = "lastLoginTime";
             this.lastLoginTime.OptionsColumn.AllowEdit = false;
+            this.lastLoginTime.Tag = "query_LASTLOGIN_TIME";
             this.lastLoginTime.Visible = true;
-            this.lastLoginTime.VisibleIndex = 5;
-            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.OptionsColumn.AllowEdit = false;
-            this.isLocked.Visible = true;
-            this.isLocked.VisibleIndex = 6;
-            this.isLocked.Width = 94;
+            this.lastLoginTime.VisibleIndex = 6;
+            this.lastLoginTime.Width = 180;
             // 
             // loginCounter
             // 
@@ -236,9 +274,20 @@
             this.loginCounter.MinWidth = 25;
             this.loginCounter.Name = "loginCounter";
             this.loginCounter.OptionsColumn.AllowEdit = false;
+            this.loginCounter.Tag = "query_LOGIN_COUNTER";
             this.loginCounter.Visible = true;
             this.loginCounter.VisibleIndex = 7;
             this.loginCounter.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鍏宠仈鍛樺伐";
+            this.gridColumn3.FieldName = "staffId";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 8;
+            this.gridColumn3.Width = 94;
             // 
             // colRole
             // 
@@ -249,14 +298,15 @@
             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 = 8;
+            this.colRole.VisibleIndex = 9;
             this.colRole.Width = 94;
             // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.bouser_16x161;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
             editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             serializableAppearanceObject1.Font = new System.Drawing.Font("Tahoma", 10F);
             serializableAppearanceObject1.Options.UseFont = true;
@@ -266,13 +316,37 @@
             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;
+            editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image")));
+            editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             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(1004, 602);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -283,8 +357,8 @@
             this.xtraTabPage1.Controls.Add(this.gcMain);
             this.xtraTabPage1.Controls.Add(this.pageBar1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1002, 570);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // pageBar1
             // 
@@ -294,8 +368,7 @@
             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.Size = new System.Drawing.Size(1002, 39);
             this.pageBar1.TabIndex = 3;
             this.pageBar1.TotalPages = 0;
             // 
@@ -303,13 +376,15 @@
             // 
             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.Text = "鏁版嵁缂栬緫";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1002, 570);
+            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_isStatus);
+            this.panel1.Controls.Add(this.txt_staffId);
+            this.panel1.Controls.Add(this.labelControl4);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.labelControl10);
             this.panel1.Controls.Add(this.txt_account);
@@ -326,7 +401,6 @@
             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);
@@ -334,8 +408,36 @@
             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.Size = new System.Drawing.Size(795, 426);
             this.panel1.TabIndex = 1;
+            // 
+            // txt_isStatus
+            // 
+            this.txt_isStatus.Location = new System.Drawing.Point(125, 286);
+            this.txt_isStatus.Name = "txt_isStatus";
+            this.txt_isStatus.Properties.Caption = "";
+            this.txt_isStatus.Size = new System.Drawing.Size(94, 24);
+            this.txt_isStatus.TabIndex = 227;
+            this.txt_isStatus.Tag = "moren.true";
+            // 
+            // txt_staffId
+            // 
+            this.txt_staffId.IsReadly = false;
+            this.txt_staffId.Location = new System.Drawing.Point(473, 48);
+            this.txt_staffId.Name = "txt_staffId";
+            this.txt_staffId.Size = new System.Drawing.Size(274, 30);
+            this.txt_staffId.TabIndex = 135;
+            // 
+            // labelControl4
+            // 
+            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl4.Appearance.Options.UseFont = true;
+            this.labelControl4.Location = new System.Drawing.Point(473, 20);
+            this.labelControl4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.labelControl4.Name = "labelControl4";
+            this.labelControl4.Size = new System.Drawing.Size(85, 21);
+            this.labelControl4.TabIndex = 134;
+            this.labelControl4.Text = "鍏宠仈鍛樺伐锛�";
             // 
             // labelControl11
             // 
@@ -345,6 +447,7 @@
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
             this.labelControl11.TabIndex = 130;
             this.labelControl11.Text = "涓婚敭锛�";
+            this.labelControl11.Visible = false;
             // 
             // labelControl10
             // 
@@ -371,7 +474,7 @@
             // 
             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.Location = new System.Drawing.Point(36, 20);
             this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl8.Name = "labelControl8";
             this.labelControl8.Size = new System.Drawing.Size(85, 21);
@@ -380,7 +483,7 @@
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(125, 256);
+            this.txt_remark.Location = new System.Drawing.Point(125, 216);
             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);
@@ -393,7 +496,7 @@
             // 
             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.Location = new System.Drawing.Point(70, 216);
             this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl7.Name = "labelControl7";
             this.labelControl7.Size = new System.Drawing.Size(51, 21);
@@ -402,7 +505,7 @@
             // 
             // txt_address
             // 
-            this.txt_address.Location = new System.Drawing.Point(125, 216);
+            this.txt_address.Location = new System.Drawing.Point(125, 182);
             this.txt_address.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_address.Name = "txt_address";
             this.txt_address.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -414,7 +517,7 @@
             // 
             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.Location = new System.Drawing.Point(36, 186);
             this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl3.Name = "labelControl3";
             this.labelControl3.Size = new System.Drawing.Size(85, 21);
@@ -423,7 +526,7 @@
             // 
             // txt_tel
             // 
-            this.txt_tel.Location = new System.Drawing.Point(125, 176);
+            this.txt_tel.Location = new System.Drawing.Point(125, 149);
             this.txt_tel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_tel.Name = "txt_tel";
             this.txt_tel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -435,7 +538,7 @@
             // 
             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.Location = new System.Drawing.Point(70, 153);
             this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl1.Name = "labelControl1";
             this.labelControl1.Size = new System.Drawing.Size(51, 21);
@@ -444,7 +547,7 @@
             // 
             // txt_email
             // 
-            this.txt_email.Location = new System.Drawing.Point(125, 136);
+            this.txt_email.Location = new System.Drawing.Point(125, 115);
             this.txt_email.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_email.Name = "txt_email";
             this.txt_email.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -459,12 +562,13 @@
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
+            this.lbGuid.Visible = false;
             // 
             // tipPwd
             // 
             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.Location = new System.Drawing.Point(434, 54);
             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);
@@ -475,7 +579,7 @@
             // 
             this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
             this.labelControl9.Appearance.Options.UseForeColor = true;
-            this.labelControl9.Location = new System.Drawing.Point(434, 96);
+            this.labelControl9.Location = new System.Drawing.Point(434, 82);
             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);
@@ -486,7 +590,7 @@
             // 
             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.Location = new System.Drawing.Point(70, 119);
             this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl6.Name = "labelControl6";
             this.labelControl6.Size = new System.Drawing.Size(51, 21);
@@ -497,34 +601,16 @@
             // 
             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.Location = new System.Drawing.Point(36, 288);
             this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl5.Name = "labelControl5";
             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(125, 336);
-            this.txt_isLocked.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_isLocked.Name = "txt_isLocked";
-            this.txt_isLocked.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_isLocked.Properties.Appearance.Options.UseFont = true;
-            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, 28);
-            this.txt_isLocked.TabIndex = 100;
+            this.labelControl5.Text = "鍚敤鐘舵�侊細";
             // 
             // txt_password
             // 
-            this.txt_password.Location = new System.Drawing.Point(125, 56);
+            this.txt_password.Location = new System.Drawing.Point(125, 49);
             this.txt_password.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_password.Name = "txt_password";
             this.txt_password.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -536,7 +622,7 @@
             // 
             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.Location = new System.Drawing.Point(36, 53);
             this.lbPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.lbPwd.Name = "lbPwd";
             this.lbPwd.Size = new System.Drawing.Size(85, 21);
@@ -545,7 +631,7 @@
             // 
             // txt_userName
             // 
-            this.txt_userName.Location = new System.Drawing.Point(125, 96);
+            this.txt_userName.Location = new System.Drawing.Point(125, 82);
             this.txt_userName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_userName.Name = "txt_userName";
             this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -557,37 +643,38 @@
             // 
             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.Location = new System.Drawing.Point(36, 86);
             this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(51, 21);
+            this.labelControl2.Size = new System.Drawing.Size(85, 21);
             this.labelControl2.TabIndex = 94;
-            this.labelControl2.Text = "濮撳悕锛�";
+            this.labelControl2.Text = "璐﹀彿鍚嶇О锛�";
             // 
             // User
             // 
             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(1004, 682);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "User";
-            this.Text = "User";
+            this.Text = "鐢ㄦ埛绠$悊";
             ((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);
             this.xtraTabPage2.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_account.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
             ((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);
@@ -596,13 +683,10 @@
 
         #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;
         private DevExpress.XtraGrid.Columns.GridColumn createTime;
         private DevExpress.XtraGrid.Columns.GridColumn lastLoginTime;
         private DevExpress.XtraGrid.Columns.GridColumn isLocked;
@@ -610,7 +694,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;
@@ -626,8 +710,6 @@
         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;
@@ -635,5 +717,15 @@
         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 DevExpress.XtraGrid.Columns.GridColumn colCreateBy;
+        private DevExpress.XtraEditors.LabelControl labelControl5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraEditors.LabelControl labelControl4;
+        private UserControl.UcLookStaff txt_staffId;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraEditors.CheckEdit txt_isStatus;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3