~tjx/GsMesClient.git

			@@ -27,11 +27,11 @@
			/// </summary>
			private void InitializeComponent()
			{
			DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
			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.gvMx1bld014 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1bld012 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
			@@ -107,6 +107,7 @@
			this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
			this.gcMain = new DevExpress.XtraGrid.GridControl();
			this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
			this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
			this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			@@ -123,7 +124,6 @@
			this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
			this.lbGuid = new System.Windows.Forms.Label();
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
			this.tabMxPage1.SuspendLayout();
			@@ -494,10 +494,10 @@
			// repositoryItemButtonEdit1
			//
			this.repositoryItemButtonEdit1.AutoHeight = false;
			editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
			editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
			editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
			editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
			this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
			new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
			new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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);
			@@ -1076,6 +1076,17 @@
			this.gridView1.OptionsView.ShowAutoFilterRow = true;
			this.gridView1.OptionsView.ShowGroupPanel = false;
			//
			// gridColumn9
			//
			this.gridColumn9.Caption = "组织";
			this.gridColumn9.FieldName = "fSubsidiary";
			this.gridColumn9.MinWidth = 25;
			this.gridColumn9.Name = "gridColumn9";
			this.gridColumn9.Tag = "org.Fnamber";
			this.gridColumn9.Visible = true;
			this.gridColumn9.VisibleIndex = 19;
			this.gridColumn9.Width = 94;
			//
			// xtraTabControl1
			//
			this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
			@@ -1113,7 +1124,6 @@
			this.xtraTabPage2.Controls.Add(this.tabMx);
			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 = "数据编辑";
			//
			@@ -1263,17 +1273,6 @@
			this.picCheckBox.TabIndex = 7;
			this.picCheckBox.TabStop = false;
			this.picCheckBox.Visible = false;
			//
			// gridColumn9
			//
			this.gridColumn9.Caption = "组织";
			this.gridColumn9.FieldName = "fSubsidiary";
			this.gridColumn9.MinWidth = 25;
			this.gridColumn9.Name = "gridColumn9";
			this.gridColumn9.Tag = "org.Fnamber";
			this.gridColumn9.Visible = true;
			this.gridColumn9.VisibleIndex = 19;
			this.gridColumn9.Width = 94;
			//
			// UcBlcl
			//