~tjx/GsMesClient.git

			@@ -63,7 +63,6 @@
			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();
			@@ -79,11 +78,12 @@
			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_password = new DevExpress.XtraEditors.TextEdit();
			this.lbPwd = new DevExpress.XtraEditors.LabelControl();
			this.txt_userName = new DevExpress.XtraEditors.TextEdit();
			this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
			this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
			this.txt_isStatus = new System.Windows.Forms.CheckBox();
			((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
			@@ -112,6 +112,7 @@
			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 = 7;
			this.isLocked.Width = 94;
			@@ -373,7 +374,6 @@
			//
			this.xtraTabPage2.Controls.Add(this.panel1);
			this.xtraTabPage2.Name = "xtraTabPage2";

			this.xtraTabPage2.Size = new System.Drawing.Size(736, 570);
			this.xtraTabPage2.Text = "数据详细";
			//
			@@ -406,15 +406,6 @@
			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
			//
			@@ -574,17 +565,6 @@
			this.labelControl6.TabIndex = 103;
			this.labelControl6.Text = "邮箱：";
			//
			// labelControl5
			//
			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(85, 21);
			this.labelControl5.TabIndex = 101;
			this.labelControl5.Text = "启用状态：";
			//
			// txt_password
			//
			this.txt_password.Location = new System.Drawing.Point(125, 56);
			@@ -627,6 +607,26 @@
			this.labelControl2.TabIndex = 94;
			this.labelControl2.Text = "姓名：";
			//
			// labelControl5
			//
			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(85, 21);
			this.labelControl5.TabIndex = 101;
			this.labelControl5.Text = "启用状态：";
			//
			// 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;
			//
			// User
			//
			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
			@@ -635,7 +635,7 @@
			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();
			@@ -688,7 +688,6 @@
			private DevExpress.XtraEditors.LabelControl tipPwd;
			private DevExpress.XtraEditors.LabelControl labelControl9;
			private DevExpress.XtraEditors.LabelControl labelControl6;
			private DevExpress.XtraEditors.LabelControl labelControl5;
			private DevExpress.XtraEditors.TextEdit txt_password;
			private DevExpress.XtraEditors.LabelControl lbPwd;
			private DevExpress.XtraEditors.TextEdit txt_userName;
			@@ -699,7 +698,8 @@
			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;
			private System.Windows.Forms.CheckBox txt_isStatus;
			private DevExpress.XtraEditors.LabelControl labelControl5;
			}
			}