~tjx/GsMesClient.git

			@@ -40,7 +40,6 @@
			this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
			this.lb_fmanager = new DevExpress.XtraEditors.LabelControl();
			this.txt_fmanager = new DevExpress.XtraEditors.TextEdit();
			this.gv_fmanager = new DevExpress.XtraGrid.Columns.GridColumn();
			this.lb_depextr4 = new DevExpress.XtraEditors.LabelControl();
			this.txt_depextr4 = new DevExpress.XtraEditors.TextEdit();
			this.gv_depextr4 = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -65,6 +64,7 @@
			this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
			this.gcMain = new DevExpress.XtraGrid.GridControl();
			this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
			this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			@@ -72,7 +72,6 @@
			this.panel1 = new System.Windows.Forms.Panel();
			this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
			this.lbGuid = new System.Windows.Forms.Label();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).BeginInit();
			@@ -98,13 +97,13 @@
			this.gv_parentId.AppearanceCell.Options.UseFont = true;
			this.gv_parentId.Caption = "上级部门";
			this.gv_parentId.FieldName = "fParentID";
			this.gv_parentId.MinWidth = 150;
			this.gv_parentId.MinWidth = 50;
			this.gv_parentId.Name = "gv_parentId";
			this.gv_parentId.OptionsColumn.AllowEdit = false;
			this.gv_parentId.OptionsFilter.ImmediateUpdateAutoFilter = false;
			this.gv_parentId.Tag = "query_c.Departmentname";
			this.gv_parentId.Visible = true;
			this.gv_parentId.VisibleIndex = 9;
			this.gv_parentId.VisibleIndex = 8;
			this.gv_parentId.Width = 150;
			//
			// lb_productionWorkshop
			@@ -157,7 +156,7 @@
			this.gv_remark.OptionsFilter.ImmediateUpdateAutoFilter = false;
			this.gv_remark.Tag = "query_a.remark";
			this.gv_remark.Visible = true;
			this.gv_remark.VisibleIndex = 8;
			this.gv_remark.VisibleIndex = 7;
			this.gv_remark.Width = 94;
			//
			// gv_factory
			@@ -166,7 +165,7 @@
			this.gv_factory.AppearanceCell.Options.UseFont = true;
			this.gv_factory.Caption = "使用组织";
			this.gv_factory.FieldName = "fSubsidiary";
			this.gv_factory.MinWidth = 250;
			this.gv_factory.MinWidth = 50;
			this.gv_factory.Name = "gv_factory";
			this.gv_factory.OptionsColumn.AllowEdit = false;
			this.gv_factory.OptionsFilter.AllowFilterModeChanging = DevExpress.Utils.DefaultBoolean.False;
			@@ -194,21 +193,6 @@
			this.txt_fmanager.Properties.Appearance.Options.UseFont = true;
			this.txt_fmanager.Size = new System.Drawing.Size(150, 28);
			this.txt_fmanager.TabIndex = 243;
			//
			// gv_fmanager
			//
			this.gv_fmanager.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_fmanager.AppearanceCell.Options.UseFont = true;
			this.gv_fmanager.Caption = "部门经理";
			this.gv_fmanager.FieldName = "fmanager";
			this.gv_fmanager.MinWidth = 50;
			this.gv_fmanager.Name = "gv_fmanager";
			this.gv_fmanager.OptionsColumn.AllowEdit = false;
			this.gv_fmanager.OptionsFilter.ImmediateUpdateAutoFilter = false;
			this.gv_fmanager.Tag = "query_a.fmanager";
			this.gv_fmanager.Visible = true;
			this.gv_fmanager.VisibleIndex = 7;
			this.gv_fmanager.Width = 94;
			//
			// lb_depextr4
			//
			@@ -303,7 +287,7 @@
			this.gv_depextr2.AppearanceCell.Options.UseFont = true;
			this.gv_depextr2.Caption = "部门分组";
			this.gv_depextr2.FieldName = "depextr2";
			this.gv_depextr2.MinWidth = 100;
			this.gv_depextr2.MinWidth = 50;
			this.gv_depextr2.Name = "gv_depextr2";
			this.gv_depextr2.OptionsColumn.AllowEdit = false;
			this.gv_depextr2.OptionsFilter.ImmediateUpdateAutoFilter = false;
			@@ -337,7 +321,7 @@
			this.gv_depextr1.AppearanceCell.Options.UseFont = true;
			this.gv_depextr1.Caption = "部门属性";
			this.gv_depextr1.FieldName = "depextr1";
			this.gv_depextr1.MinWidth = 100;
			this.gv_depextr1.MinWidth = 50;
			this.gv_depextr1.Name = "gv_depextr1";
			this.gv_depextr1.OptionsColumn.AllowEdit = false;
			this.gv_depextr1.OptionsFilter.ImmediateUpdateAutoFilter = false;
			@@ -371,7 +355,7 @@
			this.gv_departmentname.AppearanceCell.Options.UseFont = true;
			this.gv_departmentname.Caption = "部门名称";
			this.gv_departmentname.FieldName = "departmentname";
			this.gv_departmentname.MinWidth = 150;
			this.gv_departmentname.MinWidth = 50;
			this.gv_departmentname.Name = "gv_departmentname";
			this.gv_departmentname.OptionsColumn.AllowEdit = false;
			this.gv_departmentname.OptionsFilter.ImmediateUpdateAutoFilter = false;
			@@ -405,7 +389,7 @@
			this.gv_departmentcode.AppearanceCell.Options.UseFont = true;
			this.gv_departmentcode.Caption = "部门编号";
			this.gv_departmentcode.FieldName = "departmentcode";
			this.gv_departmentcode.MinWidth = 80;
			this.gv_departmentcode.MinWidth = 50;
			this.gv_departmentcode.Name = "gv_departmentcode";
			this.gv_departmentcode.OptionsColumn.AllowEdit = false;
			this.gv_departmentcode.OptionsFilter.ImmediateUpdateAutoFilter = false;
			@@ -489,7 +473,6 @@
			this.gv_depextr2,
			this.gv_depextr3,
			this.gv_depextr4,
			this.gv_fmanager,
			this.gv_remark,
			this.gv_parentId,
			this.gridColumn1});
			@@ -503,6 +486,17 @@
			this.gridView1.OptionsFind.ShowSearchNavButtons = false;
			this.gridView1.OptionsView.ShowAutoFilterRow = true;
			this.gridView1.OptionsView.ShowGroupPanel = false;
			//
			// gridColumn1
			//
			this.gridColumn1.Caption = "同步时间";
			this.gridColumn1.FieldName = "lastupdateDate";
			this.gridColumn1.MinWidth = 50;
			this.gridColumn1.Name = "gridColumn1";
			this.gridColumn1.Tag = "query_a.lastupdate_date";
			this.gridColumn1.Visible = true;
			this.gridColumn1.VisibleIndex = 9;
			this.gridColumn1.Width = 180;
			//
			// xtraTabControl1
			//
			@@ -593,17 +587,6 @@
			this.lbGuid.TabIndex = 1;
			this.lbGuid.Visible = false;
			//
			// gridColumn1
			//
			this.gridColumn1.Caption = "同步时间";
			this.gridColumn1.FieldName = "lastupdateDate";
			this.gridColumn1.MinWidth = 25;
			this.gridColumn1.Name = "gridColumn1";
			this.gridColumn1.Tag = "query_a.lastupdate_date";
			this.gridColumn1.Visible = true;
			this.gridColumn1.VisibleIndex = 10;
			this.gridColumn1.Width = 180;
			//
			// Frm_Department
			//
			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
			@@ -657,7 +640,6 @@

			private DevExpress.XtraEditors.LabelControl lb_fmanager;
			private DevExpress.XtraEditors.TextEdit txt_fmanager;
			private DevExpress.XtraGrid.Columns.GridColumn gv_fmanager;

			private DevExpress.XtraEditors.LabelControl lb_depextr4;
			private DevExpress.XtraEditors.TextEdit txt_depextr4;