~tjx/GsMesClient.git

			@@ -49,7 +49,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.labelControl1 = new DevExpress.XtraEditors.LabelControl();
			this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
			this.txt_roleName = new DevExpress.XtraEditors.TextEdit();
			@@ -59,6 +58,7 @@
			this.lbGuid = new System.Windows.Forms.Label();
			this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
			this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
			this.txt_isStatus = new DevExpress.XtraEditors.CheckEdit();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			this.xtraTabPage1.SuspendLayout();
			@@ -69,6 +69,7 @@
			this.panel1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
			this.SuspendLayout();
			//
			// toolBarMenu1
			@@ -152,13 +153,14 @@
			//
			this.rolRemark.Caption = "功能备注";
			this.rolRemark.FieldName = "roleRemark";
			this.rolRemark.MaxWidth = 400;
			this.rolRemark.MinWidth = 10;
			this.rolRemark.Name = "rolRemark";
			this.rolRemark.OptionsColumn.AllowEdit = false;
			this.rolRemark.Tag = "query_role_Remark";
			this.rolRemark.Visible = true;
			this.rolRemark.VisibleIndex = 1;
			this.rolRemark.Width = 362;
			this.rolRemark.Width = 300;
			//
			// status
			//
			@@ -255,15 +257,6 @@
			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, 158);
			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
			//
			this.labelControl1.Location = new System.Drawing.Point(61, 226);
			@@ -308,20 +301,20 @@
			//
			// txt_roleRemark
			//
			this.txt_roleRemark.Location = new System.Drawing.Point(123, 67);
			this.txt_roleRemark.Location = new System.Drawing.Point(123, 56);
			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.Size = new System.Drawing.Size(297, 84);
			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.Location = new System.Drawing.Point(31, 56);
			this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
			this.labelControl7.Name = "labelControl7";
			this.labelControl7.Size = new System.Drawing.Size(85, 21);
			@@ -341,7 +334,7 @@
			//
			this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
			this.labelControl9.Appearance.Options.UseForeColor = true;
			this.labelControl9.Location = new System.Drawing.Point(426, 73);
			this.labelControl9.Location = new System.Drawing.Point(426, 62);
			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);
			@@ -352,12 +345,21 @@
			//
			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.Location = new System.Drawing.Point(31, 149);
			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.Location = new System.Drawing.Point(123, 148);
			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 = 226;
			this.txt_isStatus.Tag = "moren.true";
			//
			// Role
			//
			@@ -379,6 +381,7 @@
			this.panel1.PerformLayout();
			((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
			this.ResumeLayout(false);

			}
			@@ -406,8 +409,8 @@
			private DevExpress.XtraEditors.LabelControl labelControl1;
			private DevExpress.XtraGrid.Columns.GridColumn createDate;
			private DevExpress.XtraGrid.Columns.GridColumn roleCreateBy;
			private System.Windows.Forms.CheckBox txt_isStatus;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
			private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
			private DevExpress.XtraEditors.CheckEdit txt_isStatus;
			}
			}