lu
2025-03-21 291223fea1cc18ce9e7b17ece1c6cf1eeb99383c
查询
已修改4个文件
1358 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs 1107 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs 188 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowFilter.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -31,430 +31,156 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_productionWorkshop = new DevExpress.XtraEditors.LabelControl();
            this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit();
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_fmanager = new DevExpress.XtraEditors.LabelControl();
            this.txt_fmanager = new DevExpress.XtraEditors.TextEdit();
            this.lb_depextr4 = new DevExpress.XtraEditors.LabelControl();
            this.txt_depextr4 = new DevExpress.XtraEditors.TextEdit();
            this.gv_depextr4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_depextr3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_depextr3 = new DevExpress.XtraEditors.TextEdit();
            this.gv_depextr3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_depextr2 = new DevExpress.XtraEditors.LabelControl();
            this.txt_depextr2 = new DevExpress.XtraEditors.TextEdit();
            this.gv_depextr2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_depextr1 = new DevExpress.XtraEditors.LabelControl();
            this.txt_depextr1 = new DevExpress.XtraEditors.TextEdit();
            this.gv_depextr1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_departmentname = new DevExpress.XtraEditors.LabelControl();
            this.txt_departmentname = new DevExpress.XtraEditors.TextEdit();
            this.gv_departmentname = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_departmentcode = new DevExpress.XtraEditors.LabelControl();
            this.txt_departmentcode = new DevExpress.XtraEditors.TextEdit();
            this.gv_departmentcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_departmentid = new DevExpress.XtraEditors.LabelControl();
            this.txt_departmentid = new DevExpress.XtraEditors.TextEdit();
            this.gv_departmentid = new DevExpress.XtraGrid.Columns.GridColumn();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            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.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_departmentid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_departmentcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_departmentname = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depextr1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depextr2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depextr3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depextr4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_fmanager = new DevExpress.XtraEditors.TextEdit();
            this.txt_depextr3 = new DevExpress.XtraEditors.TextEdit();
            this.txt_depextr1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_departmentname = new DevExpress.XtraEditors.TextEdit();
            this.txt_departmentcode = new DevExpress.XtraEditors.TextEdit();
            this.txt_departmentid = new DevExpress.XtraEditors.TextEdit();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
            this.split1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
            this.split1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            this.xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
            this.splitMx1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depextr4.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depextr3.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depextr2.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depextr1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            this.xtraTabPage2.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            this.SuspendLayout();
            //
            // gv_parentId
            //
            this.gv_parentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_parentId.AppearanceCell.Options.UseFont = true;
            this.gv_parentId.Caption = "上级部门";
            this.gv_parentId.FieldName = "fParentID";
            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 = 8;
            this.gv_parentId.Width = 150;
            //
            // lb_productionWorkshop
            //
            this.lb_productionWorkshop.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_productionWorkshop.Appearance.Options.UseFont = true;
            this.lb_productionWorkshop.Location = new System.Drawing.Point(28, 154);
            this.lb_productionWorkshop.Name = "lb_productionWorkshop";
            this.lb_productionWorkshop.Size = new System.Drawing.Size(73, 21);
            this.lb_productionWorkshop.TabIndex = 285;
            this.lb_productionWorkshop.Text = "生产车间 ";
            //
            // txt_productionWorkshop
            //
            this.txt_productionWorkshop.Location = new System.Drawing.Point(107, 150);
            this.txt_productionWorkshop.Name = "txt_productionWorkshop";
            this.txt_productionWorkshop.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true;
            this.txt_productionWorkshop.Size = new System.Drawing.Size(150, 28);
            this.txt_productionWorkshop.TabIndex = 285;
            //
            // lb_remark
            //
            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark.Appearance.Options.UseFont = true;
            this.lb_remark.Location = new System.Drawing.Point(304, 154);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(39, 21);
            this.lb_remark.TabIndex = 273;
            this.lb_remark.Text = "备注 ";
            //
            // txt_remark
            //
            this.txt_remark.Location = new System.Drawing.Point(349, 150);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(150, 28);
            this.txt_remark.TabIndex = 273;
            //
            // gv_remark
            //
            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 7;
            this.gv_remark.Width = 94;
            //
            // gv_factory
            //
            this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_factory.AppearanceCell.Options.UseFont = true;
            this.gv_factory.Caption = "使用组织";
            this.gv_factory.FieldName = "fSubsidiary";
            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;
            this.gv_factory.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_factory.Tag = "org.fnamber";
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 0;
            this.gv_factory.Width = 250;
            //
            // lb_fmanager
            //
            this.lb_fmanager.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fmanager.Appearance.Options.UseFont = true;
            this.lb_fmanager.Location = new System.Drawing.Point(28, 119);
            this.lb_fmanager.Name = "lb_fmanager";
            this.lb_fmanager.Size = new System.Drawing.Size(73, 21);
            this.lb_fmanager.TabIndex = 243;
            this.lb_fmanager.Text = "部门经理 ";
            //
            // txt_fmanager
            //
            this.txt_fmanager.Location = new System.Drawing.Point(107, 115);
            this.txt_fmanager.Name = "txt_fmanager";
            this.txt_fmanager.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fmanager.Properties.Appearance.Options.UseFont = true;
            this.txt_fmanager.Size = new System.Drawing.Size(150, 28);
            this.txt_fmanager.TabIndex = 243;
            //
            // lb_depextr4
            //
            this.lb_depextr4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_depextr4.Appearance.Options.UseFont = true;
            this.lb_depextr4.Location = new System.Drawing.Point(7, 87);
            this.lb_depextr4.Name = "lb_depextr4";
            this.lb_depextr4.Size = new System.Drawing.Size(94, 21);
            this.lb_depextr4.TabIndex = 228;
            this.lb_depextr4.Text = "A启用B禁用 ";
            //
            // txt_depextr4
            //
            this.txt_depextr4.Location = new System.Drawing.Point(107, 83);
            this.txt_depextr4.Name = "txt_depextr4";
            this.txt_depextr4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_depextr4.Properties.Appearance.Options.UseFont = true;
            this.txt_depextr4.Size = new System.Drawing.Size(150, 28);
            this.txt_depextr4.TabIndex = 228;
            //
            // gv_depextr4
            //
            this.gv_depextr4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depextr4.AppearanceCell.Options.UseFont = true;
            this.gv_depextr4.Caption = "禁用状态";
            this.gv_depextr4.FieldName = "depextr4";
            this.gv_depextr4.MinWidth = 50;
            this.gv_depextr4.Name = "gv_depextr4";
            this.gv_depextr4.OptionsColumn.AllowEdit = false;
            this.gv_depextr4.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr4.Tag = "query_a.depextr4";
            this.gv_depextr4.Visible = true;
            this.gv_depextr4.VisibleIndex = 6;
            this.gv_depextr4.Width = 50;
            //
            // lb_depextr3
            //
            this.lb_depextr3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_depextr3.Appearance.Options.UseFont = true;
            this.lb_depextr3.Location = new System.Drawing.Point(274, 119);
            this.lb_depextr3.Name = "lb_depextr3";
            this.lb_depextr3.Size = new System.Drawing.Size(69, 21);
            this.lb_depextr3.TabIndex = 226;
            this.lb_depextr3.Text = "WIP仓库 ";
            //
            // txt_depextr3
            //
            this.txt_depextr3.Location = new System.Drawing.Point(349, 115);
            this.txt_depextr3.Name = "txt_depextr3";
            this.txt_depextr3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_depextr3.Properties.Appearance.Options.UseFont = true;
            this.txt_depextr3.Size = new System.Drawing.Size(150, 28);
            this.txt_depextr3.TabIndex = 226;
            //
            // gv_depextr3
            //
            this.gv_depextr3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depextr3.AppearanceCell.Options.UseFont = true;
            this.gv_depextr3.Caption = "WIP仓库";
            this.gv_depextr3.FieldName = "depextr3";
            this.gv_depextr3.MinWidth = 50;
            this.gv_depextr3.Name = "gv_depextr3";
            this.gv_depextr3.OptionsColumn.AllowEdit = false;
            this.gv_depextr3.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr3.Tag = "query_a.depextr3";
            this.gv_depextr3.Visible = true;
            this.gv_depextr3.VisibleIndex = 5;
            this.gv_depextr3.Width = 94;
            //
            // lb_depextr2
            //
            this.lb_depextr2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_depextr2.Appearance.Options.UseFont = true;
            this.lb_depextr2.Location = new System.Drawing.Point(274, 87);
            this.lb_depextr2.Name = "lb_depextr2";
            this.lb_depextr2.Size = new System.Drawing.Size(73, 21);
            this.lb_depextr2.TabIndex = 222;
            this.lb_depextr2.Text = "部门分组 ";
            //
            // txt_depextr2
            //
            this.txt_depextr2.Location = new System.Drawing.Point(349, 83);
            this.txt_depextr2.Name = "txt_depextr2";
            this.txt_depextr2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_depextr2.Properties.Appearance.Options.UseFont = true;
            this.txt_depextr2.Size = new System.Drawing.Size(150, 28);
            this.txt_depextr2.TabIndex = 222;
            //
            // gv_depextr2
            //
            this.gv_depextr2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depextr2.AppearanceCell.Options.UseFont = true;
            this.gv_depextr2.Caption = "部门分组";
            this.gv_depextr2.FieldName = "depextr2";
            this.gv_depextr2.MinWidth = 50;
            this.gv_depextr2.Name = "gv_depextr2";
            this.gv_depextr2.OptionsColumn.AllowEdit = false;
            this.gv_depextr2.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr2.Tag = "query_a.depextr2";
            this.gv_depextr2.Visible = true;
            this.gv_depextr2.VisibleIndex = 4;
            this.gv_depextr2.Width = 100;
            //
            // lb_depextr1
            //
            this.lb_depextr1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_depextr1.Appearance.Options.UseFont = true;
            this.lb_depextr1.Location = new System.Drawing.Point(270, 52);
            this.lb_depextr1.Name = "lb_depextr1";
            this.lb_depextr1.Size = new System.Drawing.Size(73, 21);
            this.lb_depextr1.TabIndex = 219;
            this.lb_depextr1.Text = "部门属性 ";
            //
            // txt_depextr1
            //
            this.txt_depextr1.Location = new System.Drawing.Point(349, 48);
            this.txt_depextr1.Name = "txt_depextr1";
            this.txt_depextr1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_depextr1.Properties.Appearance.Options.UseFont = true;
            this.txt_depextr1.Size = new System.Drawing.Size(150, 28);
            this.txt_depextr1.TabIndex = 219;
            //
            // gv_depextr1
            //
            this.gv_depextr1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depextr1.AppearanceCell.Options.UseFont = true;
            this.gv_depextr1.Caption = "部门属性";
            this.gv_depextr1.FieldName = "depextr1";
            this.gv_depextr1.MinWidth = 50;
            this.gv_depextr1.Name = "gv_depextr1";
            this.gv_depextr1.OptionsColumn.AllowEdit = false;
            this.gv_depextr1.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr1.Tag = "query_a.depextr1";
            this.gv_depextr1.Visible = true;
            this.gv_depextr1.VisibleIndex = 3;
            this.gv_depextr1.Width = 100;
            //
            // lb_departmentname
            //
            this.lb_departmentname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_departmentname.Appearance.Options.UseFont = true;
            this.lb_departmentname.Location = new System.Drawing.Point(28, 52);
            this.lb_departmentname.Name = "lb_departmentname";
            this.lb_departmentname.Size = new System.Drawing.Size(73, 21);
            this.lb_departmentname.TabIndex = 217;
            this.lb_departmentname.Text = "部门名称 ";
            //
            // txt_departmentname
            //
            this.txt_departmentname.Location = new System.Drawing.Point(107, 48);
            this.txt_departmentname.Name = "txt_departmentname";
            this.txt_departmentname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_departmentname.Properties.Appearance.Options.UseFont = true;
            this.txt_departmentname.Size = new System.Drawing.Size(150, 28);
            this.txt_departmentname.TabIndex = 217;
            //
            // gv_departmentname
            //
            this.gv_departmentname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_departmentname.AppearanceCell.Options.UseFont = true;
            this.gv_departmentname.Caption = "部门名称";
            this.gv_departmentname.FieldName = "departmentname";
            this.gv_departmentname.MinWidth = 50;
            this.gv_departmentname.Name = "gv_departmentname";
            this.gv_departmentname.OptionsColumn.AllowEdit = false;
            this.gv_departmentname.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_departmentname.Tag = "query_a.departmentname";
            this.gv_departmentname.Visible = true;
            this.gv_departmentname.VisibleIndex = 2;
            this.gv_departmentname.Width = 150;
            //
            // lb_departmentcode
            //
            this.lb_departmentcode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_departmentcode.Appearance.Options.UseFont = true;
            this.lb_departmentcode.Location = new System.Drawing.Point(270, 14);
            this.lb_departmentcode.Name = "lb_departmentcode";
            this.lb_departmentcode.Size = new System.Drawing.Size(73, 21);
            this.lb_departmentcode.TabIndex = 216;
            this.lb_departmentcode.Text = "部门编号 ";
            //
            // txt_departmentcode
            //
            this.txt_departmentcode.Location = new System.Drawing.Point(349, 14);
            this.txt_departmentcode.Name = "txt_departmentcode";
            this.txt_departmentcode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_departmentcode.Properties.Appearance.Options.UseFont = true;
            this.txt_departmentcode.Size = new System.Drawing.Size(150, 28);
            this.txt_departmentcode.TabIndex = 216;
            //
            // gv_departmentcode
            //
            this.gv_departmentcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_departmentcode.AppearanceCell.Options.UseFont = true;
            this.gv_departmentcode.Caption = "部门编号";
            this.gv_departmentcode.FieldName = "departmentcode";
            this.gv_departmentcode.MinWidth = 50;
            this.gv_departmentcode.Name = "gv_departmentcode";
            this.gv_departmentcode.OptionsColumn.AllowEdit = false;
            this.gv_departmentcode.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_departmentcode.Tag = "query_a.departmentcode";
            this.gv_departmentcode.Visible = true;
            this.gv_departmentcode.VisibleIndex = 1;
            this.gv_departmentcode.Width = 94;
            //
            // lb_departmentid
            //
            this.lb_departmentid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_departmentid.Appearance.Options.UseFont = true;
            this.lb_departmentid.Location = new System.Drawing.Point(44, 14);
            this.lb_departmentid.Name = "lb_departmentid";
            this.lb_departmentid.Size = new System.Drawing.Size(57, 21);
            this.lb_departmentid.TabIndex = 213;
            this.lb_departmentid.Text = "部门ID ";
            //
            // txt_departmentid
            //
            this.txt_departmentid.Location = new System.Drawing.Point(107, 14);
            this.txt_departmentid.Name = "txt_departmentid";
            this.txt_departmentid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_departmentid.Properties.Appearance.Options.UseFont = true;
            this.txt_departmentid.Size = new System.Drawing.Size(150, 28);
            this.txt_departmentid.TabIndex = 213;
            //
            // gv_departmentid
            //
            this.gv_departmentid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_departmentid.AppearanceCell.Options.UseFont = true;
            this.gv_departmentid.Caption = "部门ID";
            this.gv_departmentid.FieldName = "departmentid";
            this.gv_departmentid.MinWidth = 50;
            this.gv_departmentid.Name = "gv_departmentid";
            this.gv_departmentid.OptionsColumn.AllowEdit = false;
            this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_departmentid.Tag = "query_a.departmentid";
            this.gv_departmentid.Width = 94;
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.defaultActions = 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.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(930, 80);
            this.toolBarMenu1.Size = new System.Drawing.Size(1149, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = "xlsOut_department{}";
            // 
            // gcMain
            // xtraTabControl1
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(928, 385);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            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(1149, 627);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1147, 595);
            this.xtraTabPage1.Text = "数据列表";
            //
            // split1
            //
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
            //
            // split1.split1_Panel1
            //
            this.split1.Panel1.Controls.Add(this.gcMain1);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            //
            // split1.split1_Panel2
            //
            this.split1.Panel2.Text = "Panel2";
            this.split1.Size = new System.Drawing.Size(1147, 595);
            this.split1.SplitterPosition = 583;
            this.split1.TabIndex = 0;
            //
            // gcMain1
            //
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1147, 544);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
            // gridView1
@@ -476,7 +202,7 @@
            this.gv_remark,
            this.gv_parentId,
            this.gridColumn1});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsCustomization.AllowFilter = false;
@@ -486,6 +212,155 @@
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_factory
            //
            this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_factory.AppearanceCell.Options.UseFont = true;
            this.gv_factory.Caption = "使用组织";
            this.gv_factory.FieldName = "fSubsidiary";
            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;
            this.gv_factory.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_factory.Tag = "org.fnamber";
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 0;
            this.gv_factory.Width = 250;
            //
            // gv_departmentid
            //
            this.gv_departmentid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_departmentid.AppearanceCell.Options.UseFont = true;
            this.gv_departmentid.Caption = "部门ID";
            this.gv_departmentid.FieldName = "departmentid";
            this.gv_departmentid.MinWidth = 50;
            this.gv_departmentid.Name = "gv_departmentid";
            this.gv_departmentid.OptionsColumn.AllowEdit = false;
            this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_departmentid.Tag = "query_a.departmentid";
            this.gv_departmentid.Width = 94;
            //
            // gv_departmentcode
            //
            this.gv_departmentcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_departmentcode.AppearanceCell.Options.UseFont = true;
            this.gv_departmentcode.Caption = "部门编号";
            this.gv_departmentcode.FieldName = "departmentcode";
            this.gv_departmentcode.MinWidth = 50;
            this.gv_departmentcode.Name = "gv_departmentcode";
            this.gv_departmentcode.OptionsColumn.AllowEdit = false;
            this.gv_departmentcode.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_departmentcode.Tag = "query_a.departmentcode";
            this.gv_departmentcode.Visible = true;
            this.gv_departmentcode.VisibleIndex = 1;
            this.gv_departmentcode.Width = 94;
            //
            // gv_departmentname
            //
            this.gv_departmentname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_departmentname.AppearanceCell.Options.UseFont = true;
            this.gv_departmentname.Caption = "部门名称";
            this.gv_departmentname.FieldName = "departmentname";
            this.gv_departmentname.MinWidth = 50;
            this.gv_departmentname.Name = "gv_departmentname";
            this.gv_departmentname.OptionsColumn.AllowEdit = false;
            this.gv_departmentname.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_departmentname.Tag = "query_a.departmentname";
            this.gv_departmentname.Visible = true;
            this.gv_departmentname.VisibleIndex = 2;
            this.gv_departmentname.Width = 150;
            //
            // gv_depextr1
            //
            this.gv_depextr1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depextr1.AppearanceCell.Options.UseFont = true;
            this.gv_depextr1.Caption = "部门属性";
            this.gv_depextr1.FieldName = "depextr1";
            this.gv_depextr1.MinWidth = 50;
            this.gv_depextr1.Name = "gv_depextr1";
            this.gv_depextr1.OptionsColumn.AllowEdit = false;
            this.gv_depextr1.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr1.Tag = "query_a.depextr1";
            this.gv_depextr1.Visible = true;
            this.gv_depextr1.VisibleIndex = 3;
            this.gv_depextr1.Width = 100;
            //
            // gv_depextr2
            //
            this.gv_depextr2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depextr2.AppearanceCell.Options.UseFont = true;
            this.gv_depextr2.Caption = "部门分组";
            this.gv_depextr2.FieldName = "depextr2";
            this.gv_depextr2.MinWidth = 50;
            this.gv_depextr2.Name = "gv_depextr2";
            this.gv_depextr2.OptionsColumn.AllowEdit = false;
            this.gv_depextr2.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr2.Tag = "query_a.depextr2";
            this.gv_depextr2.Visible = true;
            this.gv_depextr2.VisibleIndex = 4;
            this.gv_depextr2.Width = 100;
            //
            // gv_depextr3
            //
            this.gv_depextr3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depextr3.AppearanceCell.Options.UseFont = true;
            this.gv_depextr3.Caption = "WIP仓库";
            this.gv_depextr3.FieldName = "depextr3";
            this.gv_depextr3.MinWidth = 50;
            this.gv_depextr3.Name = "gv_depextr3";
            this.gv_depextr3.OptionsColumn.AllowEdit = false;
            this.gv_depextr3.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr3.Tag = "query_a.depextr3";
            this.gv_depextr3.Visible = true;
            this.gv_depextr3.VisibleIndex = 5;
            this.gv_depextr3.Width = 94;
            //
            // gv_depextr4
            //
            this.gv_depextr4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depextr4.AppearanceCell.Options.UseFont = true;
            this.gv_depextr4.Caption = "禁用状态";
            this.gv_depextr4.FieldName = "depextr4";
            this.gv_depextr4.MinWidth = 50;
            this.gv_depextr4.Name = "gv_depextr4";
            this.gv_depextr4.OptionsColumn.AllowEdit = false;
            this.gv_depextr4.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_depextr4.Tag = "query_a.depextr4";
            this.gv_depextr4.Visible = true;
            this.gv_depextr4.VisibleIndex = 6;
            this.gv_depextr4.Width = 50;
            //
            // gv_remark
            //
            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.OptionsFilter.ImmediateUpdateAutoFilter = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 7;
            this.gv_remark.Width = 94;
            //
            // gv_parentId
            //
            this.gv_parentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_parentId.AppearanceCell.Options.UseFont = true;
            this.gv_parentId.Caption = "上级部门";
            this.gv_parentId.FieldName = "fParentID";
            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 = 8;
            this.gv_parentId.Width = 150;
            // 
            // gridColumn1
            // 
@@ -498,176 +373,378 @@
            this.gridColumn1.VisibleIndex = 9;
            this.gridColumn1.Width = 180;
            // 
            // 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(930, 456);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(928, 424);
            this.xtraTabPage1.Text = "数据列表";
            //
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 385);
            this.pageBar1.Location = new System.Drawing.Point(0, 544);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(928, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.Size = new System.Drawing.Size(1147, 39);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // xtraTabPage2
            // 
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Controls.Add(this.splitMx1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(928, 424);
            this.xtraTabPage2.Size = new System.Drawing.Size(1147, 595);
            this.xtraTabPage2.Text = "数据详细";
            // 
            // panel1
            // splitMx1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_productionWorkshop);
            this.panel1.Controls.Add(this.txt_productionWorkshop);
            this.panel1.Controls.Add(this.lb_remark);
            this.panel1.Controls.Add(this.txt_remark);
            this.panel1.Controls.Add(this.lb_fmanager);
            this.panel1.Controls.Add(this.txt_fmanager);
            this.panel1.Controls.Add(this.lb_depextr4);
            this.panel1.Controls.Add(this.txt_depextr4);
            this.panel1.Controls.Add(this.lb_depextr3);
            this.panel1.Controls.Add(this.txt_depextr3);
            this.panel1.Controls.Add(this.lb_depextr2);
            this.panel1.Controls.Add(this.txt_depextr2);
            this.panel1.Controls.Add(this.lb_depextr1);
            this.panel1.Controls.Add(this.txt_depextr1);
            this.panel1.Controls.Add(this.lb_departmentname);
            this.panel1.Controls.Add(this.txt_departmentname);
            this.panel1.Controls.Add(this.lb_departmentcode);
            this.panel1.Controls.Add(this.txt_departmentcode);
            this.panel1.Controls.Add(this.lb_departmentid);
            this.panel1.Controls.Add(this.txt_departmentid);
            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(579, 262);
            this.panel1.TabIndex = 1;
            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx1.Horizontal = false;
            this.splitMx1.Location = new System.Drawing.Point(0, 0);
            this.splitMx1.Name = "splitMx1";
            // 
            // labelControl11
            // splitMx1.splitMx1_Panel1
            // 
            this.labelControl11.Location = new System.Drawing.Point(69, 209);
            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
            this.labelControl11.TabIndex = 130;
            this.labelControl11.Text = "主键:";
            this.labelControl11.Visible = false;
            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
            this.splitMx1.Panel1.Text = "Panel1";
            //
            // splitMx1.splitMx1_Panel2
            //
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.Size = new System.Drawing.Size(1147, 595);
            this.splitMx1.SplitterPosition = 99;
            this.splitMx1.TabIndex = 0;
            // 
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(120, 209);
            this.lbGuid.Location = new System.Drawing.Point(687, 131);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.Size = new System.Drawing.Size(221, 56);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Text = "lbGuid";
            this.lbGuid.Visible = false;
            //
            // txt_productionWorkshop
            //
            this.txt_productionWorkshop.Location = new System.Drawing.Point(534, 51);
            this.txt_productionWorkshop.Name = "txt_productionWorkshop";
            this.txt_productionWorkshop.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true;
            this.txt_productionWorkshop.Size = new System.Drawing.Size(149, 28);
            this.txt_productionWorkshop.StyleController = this.layoutMx1;
            this.txt_productionWorkshop.TabIndex = 285;
            //
            // txt_remark
            //
            this.txt_remark.Location = new System.Drawing.Point(759, 51);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(149, 28);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 273;
            //
            // txt_fmanager
            //
            this.txt_fmanager.Location = new System.Drawing.Point(534, 12);
            this.txt_fmanager.Name = "txt_fmanager";
            this.txt_fmanager.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fmanager.Properties.Appearance.Options.UseFont = true;
            this.txt_fmanager.Size = new System.Drawing.Size(149, 28);
            this.txt_fmanager.StyleController = this.layoutMx1;
            this.txt_fmanager.TabIndex = 243;
            //
            // txt_depextr3
            //
            this.txt_depextr3.Location = new System.Drawing.Point(759, 12);
            this.txt_depextr3.Name = "txt_depextr3";
            this.txt_depextr3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_depextr3.Properties.Appearance.Options.UseFont = true;
            this.txt_depextr3.Size = new System.Drawing.Size(149, 28);
            this.txt_depextr3.StyleController = this.layoutMx1;
            this.txt_depextr3.TabIndex = 226;
            //
            // txt_depextr1
            //
            this.txt_depextr1.Location = new System.Drawing.Point(309, 51);
            this.txt_depextr1.Name = "txt_depextr1";
            this.txt_depextr1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_depextr1.Properties.Appearance.Options.UseFont = true;
            this.txt_depextr1.Size = new System.Drawing.Size(149, 28);
            this.txt_depextr1.StyleController = this.layoutMx1;
            this.txt_depextr1.TabIndex = 219;
            //
            // txt_departmentname
            //
            this.txt_departmentname.Location = new System.Drawing.Point(84, 51);
            this.txt_departmentname.Name = "txt_departmentname";
            this.txt_departmentname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_departmentname.Properties.Appearance.Options.UseFont = true;
            this.txt_departmentname.Size = new System.Drawing.Size(149, 28);
            this.txt_departmentname.StyleController = this.layoutMx1;
            this.txt_departmentname.TabIndex = 217;
            //
            // txt_departmentcode
            //
            this.txt_departmentcode.Location = new System.Drawing.Point(309, 12);
            this.txt_departmentcode.Name = "txt_departmentcode";
            this.txt_departmentcode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_departmentcode.Properties.Appearance.Options.UseFont = true;
            this.txt_departmentcode.Size = new System.Drawing.Size(149, 28);
            this.txt_departmentcode.StyleController = this.layoutMx1;
            this.txt_departmentcode.TabIndex = 216;
            //
            // txt_departmentid
            //
            this.txt_departmentid.Location = new System.Drawing.Point(84, 12);
            this.txt_departmentid.Name = "txt_departmentid";
            this.txt_departmentid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_departmentid.Properties.Appearance.Options.UseFont = true;
            this.txt_departmentid.Size = new System.Drawing.Size(149, 28);
            this.txt_departmentid.StyleController = this.layoutMx1;
            this.txt_departmentid.TabIndex = 213;
            //
            // layoutMx1
            //
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_productionWorkshop);
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_departmentid);
            this.layoutMx1.Controls.Add(this.txt_departmentname);
            this.layoutMx1.Controls.Add(this.txt_departmentcode);
            this.layoutMx1.Controls.Add(this.txt_depextr3);
            this.layoutMx1.Controls.Add(this.txt_fmanager);
            this.layoutMx1.Controls.Add(this.txt_depextr1);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem11});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1147, 99);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            //
            // Root
            //
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.Root.GroupBordersVisible = false;
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem1,
            this.layoutControlItem2,
            this.layoutControlItem3,
            this.layoutControlItem4,
            this.layoutControlItem7,
            this.layoutControlItem8,
            this.layoutControlItem9,
            this.layoutControlItem10});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition6,
            columnDefinition7,
            columnDefinition8,
            columnDefinition9,
            columnDefinition10});
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition3,
            rowDefinition4});
            this.Root.Size = new System.Drawing.Size(1147, 99);
            this.Root.TextVisible = false;
            //
            // layoutControlItem1
            //
            this.layoutControlItem1.Control = this.txt_departmentid;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(225, 39);
            this.layoutControlItem1.Text = "部门ID";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_departmentname;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 39);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(225, 40);
            this.layoutControlItem2.Text = "部门名称";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_departmentcode;
            this.layoutControlItem3.Location = new System.Drawing.Point(225, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(225, 39);
            this.layoutControlItem3.Text = "部门编号";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_depextr1;
            this.layoutControlItem4.Location = new System.Drawing.Point(225, 39);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(225, 40);
            this.layoutControlItem4.Text = "部门属性";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_fmanager;
            this.layoutControlItem7.Location = new System.Drawing.Point(450, 0);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(225, 39);
            this.layoutControlItem7.Text = "部门经理";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.txt_productionWorkshop;
            this.layoutControlItem8.Location = new System.Drawing.Point(450, 39);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(225, 40);
            this.layoutControlItem8.Text = "生产车间";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem9
            //
            this.layoutControlItem9.Control = this.txt_depextr3;
            this.layoutControlItem9.Location = new System.Drawing.Point(675, 0);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(225, 39);
            this.layoutControlItem9.Text = "部门分组";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_remark;
            this.layoutControlItem10.Location = new System.Drawing.Point(675, 39);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(225, 40);
            this.layoutControlItem10.Text = "WIP仓库";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.lbGuid;
            this.layoutControlItem11.Location = new System.Drawing.Point(675, 119);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(225, 60);
            this.layoutControlItem11.Text = "lbGuid";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // Frm_Department
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(930, 536);
            this.ClientSize = new System.Drawing.Size(1149, 707);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_Department";
            this.Text = "部门信息";
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
            this.split1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
            this.split1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            this.xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
            this.splitMx1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depextr4.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depextr3.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depextr2.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depextr1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).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.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private UserControl.UcToolBarMenu toolBarMenu1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private UserControls.Data.UcPageBar pageBar1;
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.LabelControl labelControl11;
        private DevExpress.XtraGrid.Columns.GridColumn gv_parentId;
        private DevExpress.XtraEditors.LabelControl lb_productionWorkshop;
        private DevExpress.XtraEditors.TextEdit txt_productionWorkshop;
        private DevExpress.XtraEditors.LabelControl lb_remark;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
        private DevExpress.XtraEditors.LabelControl lb_fmanager;
        private DevExpress.XtraEditors.TextEdit txt_fmanager;
        private DevExpress.XtraEditors.LabelControl lb_depextr4;
        private DevExpress.XtraEditors.TextEdit txt_depextr4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depextr4;
        private DevExpress.XtraEditors.LabelControl lb_depextr3;
        private DevExpress.XtraEditors.TextEdit txt_depextr3;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depextr3;
        private DevExpress.XtraEditors.LabelControl lb_depextr2;
        private DevExpress.XtraEditors.TextEdit txt_depextr2;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depextr2;
        private DevExpress.XtraEditors.LabelControl lb_depextr1;
        private DevExpress.XtraEditors.TextEdit txt_depextr1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depextr1;
        private DevExpress.XtraEditors.LabelControl lb_departmentname;
        private DevExpress.XtraEditors.TextEdit txt_departmentname;
        private DevExpress.XtraGrid.Columns.GridColumn gv_departmentname;
        private DevExpress.XtraEditors.LabelControl lb_departmentcode;
        private DevExpress.XtraEditors.TextEdit txt_departmentcode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_departmentcode;
        private DevExpress.XtraEditors.LabelControl lb_departmentid;
        private DevExpress.XtraEditors.TextEdit txt_departmentid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_departmentid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_departmentcode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_departmentname;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depextr1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depextr2;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depextr3;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depextr4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
        private DevExpress.XtraGrid.Columns.GridColumn gv_parentId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.TextEdit txt_productionWorkshop;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraEditors.TextEdit txt_fmanager;
        private DevExpress.XtraEditors.TextEdit txt_depextr3;
        private DevExpress.XtraEditors.TextEdit txt_depextr1;
        private DevExpress.XtraEditors.TextEdit txt_departmentname;
        private DevExpress.XtraEditors.TextEdit txt_departmentcode;
        private DevExpress.XtraEditors.TextEdit txt_departmentid;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -20,9 +20,7 @@
            InitializeComponent();
            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gvList.Add(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -64,9 +62,10 @@
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList);
            var frm = new ShowFilter(gridView1.Columns, _filterList,this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
        /// <summary>
@@ -121,16 +120,16 @@
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gcMain1.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
@@ -171,7 +170,7 @@
                {
                    var dy = _rtn.rtnData;
                    lbGuid.Text = strGuid;
                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
                }
                else
                {
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -29,11 +29,16 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            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();
            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();
            this.panel1 = new System.Windows.Forms.Panel();
            this.btnEsc = new DevExpress.XtraEditors.SimpleButton();
            this.btnQuery = new DevExpress.XtraEditors.SimpleButton();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -43,16 +48,72 @@
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.panel1 = new System.Windows.Forms.Panel();
            this.btnEsc = new DevExpress.XtraEditors.SimpleButton();
            this.btnQuery = new DevExpress.XtraEditors.SimpleButton();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcQuery = new DevExpress.XtraGrid.GridControl();
            this.gvQuery = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.panel2 = new System.Windows.Forms.Panel();
            this.btnQueryEsc = new DevExpress.XtraEditors.SimpleButton();
            this.btnQuerySave = new DevExpress.XtraEditors.SimpleButton();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.panel1.SuspendLayout();
            this.xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcQuery)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvQuery)).BeginInit();
            this.panel2.SuspendLayout();
            this.SuspendLayout();
            //
            // panel1
            //
            this.panel1.Controls.Add(this.btnEsc);
            this.panel1.Controls.Add(this.btnQuery);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel1.Location = new System.Drawing.Point(0, 405);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(734, 56);
            this.panel1.TabIndex = 1;
            //
            // btnEsc
            //
            this.btnEsc.Location = new System.Drawing.Point(391, 15);
            this.btnEsc.Name = "btnEsc";
            this.btnEsc.Size = new System.Drawing.Size(94, 29);
            this.btnEsc.TabIndex = 1;
            this.btnEsc.Text = "取消";
            //
            // btnQuery
            //
            this.btnQuery.Location = new System.Drawing.Point(270, 15);
            this.btnQuery.Name = "btnQuery";
            this.btnQuery.Size = new System.Drawing.Size(94, 29);
            this.btnQuery.TabIndex = 0;
            this.btnQuery.Text = "确定查询";
            //
            // xtraTabControl1
            //
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(736, 493);
            this.xtraTabControl1.TabIndex = 2;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.panel1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(734, 461);
            this.xtraTabPage1.Text = "查询条件";
            // 
            // gcMain
            // 
@@ -64,7 +125,7 @@
            this.repositoryItemComboBox1,
            this.repositoryItemComboBox2,
            this.repositoryItemButtonEdit1});
            this.gcMain.Size = new System.Drawing.Size(591, 285);
            this.gcMain.Size = new System.Drawing.Size(734, 405);
            this.gcMain.TabIndex = 0;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -100,7 +161,7 @@
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "条件";
            this.gridColumn2.Caption = "查询条件";
            this.gridColumn2.ColumnEdit = this.repositoryItemComboBox2;
            this.gridColumn2.FieldName = "fieldWhere";
            this.gridColumn2.MinWidth = 25;
@@ -118,7 +179,7 @@
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "值";
            this.gridColumn3.Caption = "查询值";
            this.gridColumn3.FieldName = "fieldValue";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
@@ -140,47 +201,70 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // panel1
            // xtraTabPage2
            // 
            this.panel1.Controls.Add(this.btnEsc);
            this.panel1.Controls.Add(this.btnQuery);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel1.Location = new System.Drawing.Point(0, 285);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(591, 56);
            this.panel1.TabIndex = 1;
            this.xtraTabPage2.Controls.Add(this.panel2);
            this.xtraTabPage2.Controls.Add(this.gcQuery);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(734, 461);
            this.xtraTabPage2.Text = "高级查询配置";
            // 
            // btnEsc
            // gcQuery
            // 
            this.btnEsc.Location = new System.Drawing.Point(391, 15);
            this.btnEsc.Name = "btnEsc";
            this.btnEsc.Size = new System.Drawing.Size(94, 29);
            this.btnEsc.TabIndex = 1;
            this.btnEsc.Text = "取消";
            this.gcQuery.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcQuery.Location = new System.Drawing.Point(0, 0);
            this.gcQuery.MainView = this.gvQuery;
            this.gcQuery.Name = "gcQuery";
            this.gcQuery.Size = new System.Drawing.Size(734, 461);
            this.gcQuery.TabIndex = 0;
            this.gcQuery.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvQuery});
            // 
            // btnQuery
            // gvQuery
            // 
            this.btnQuery.Location = new System.Drawing.Point(270, 15);
            this.btnQuery.Name = "btnQuery";
            this.btnQuery.Size = new System.Drawing.Size(94, 29);
            this.btnQuery.TabIndex = 0;
            this.btnQuery.Text = "确定查询";
            this.gvQuery.GridControl = this.gcQuery;
            this.gvQuery.Name = "gvQuery";
            //
            // panel2
            //
            this.panel2.Controls.Add(this.btnQueryEsc);
            this.panel2.Controls.Add(this.btnQuerySave);
            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel2.Location = new System.Drawing.Point(0, 405);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(734, 56);
            this.panel2.TabIndex = 2;
            //
            // btnQueryEsc
            //
            this.btnQueryEsc.Location = new System.Drawing.Point(391, 15);
            this.btnQueryEsc.Name = "btnQueryEsc";
            this.btnQueryEsc.Size = new System.Drawing.Size(94, 29);
            this.btnQueryEsc.TabIndex = 1;
            this.btnQueryEsc.Text = "取消";
            //
            // btnQuerySave
            //
            this.btnQuerySave.Location = new System.Drawing.Point(270, 15);
            this.btnQuerySave.Name = "btnQuerySave";
            this.btnQuerySave.Size = new System.Drawing.Size(94, 29);
            this.btnQuerySave.TabIndex = 0;
            this.btnQuerySave.Text = "确定保存";
            // 
            // ShowFilter
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(591, 341);
            this.Controls.Add(this.gcMain);
            this.Controls.Add(this.panel1);
            this.ClientSize = new System.Drawing.Size(736, 493);
            this.Controls.Add(this.xtraTabControl1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
@@ -188,29 +272,43 @@
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "请增加查询条件";
            this.TopMost = true;
            this.panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.panel1.ResumeLayout(false);
            this.xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcQuery)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvQuery)).EndInit();
            this.panel2.ResumeLayout(false);
            this.ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private System.Windows.Forms.Panel panel1;
        private DevExpress.XtraEditors.SimpleButton btnEsc;
        private DevExpress.XtraEditors.SimpleButton btnQuery;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private System.Windows.Forms.Panel panel2;
        private DevExpress.XtraEditors.SimpleButton btnQueryEsc;
        private DevExpress.XtraEditors.SimpleButton btnQuerySave;
        private DevExpress.XtraGrid.GridControl gcQuery;
        private DevExpress.XtraGrid.Views.Grid.GridView gvQuery;
    }
}
DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -7,6 +7,8 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Base.ViewInfo;
using FastReport.MSChart;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -15,12 +17,19 @@
    public partial class ShowFilter : XtraForm
    {
        private readonly GridColumnCollection _columns;
        private readonly string _fullName;
        /// <summary>
        ///
        /// </summary>
        /// <param name="Columns">列名</param>
        /// <param name="list">默认值</param>
        /// <param name="FullName">类名</param>
        public ShowFilter(GridColumnCollection Columns,
            List<FilterEntity> list = null)
            List<FilterEntity> list = null, string FullName = "")
        {
            FilterList = list;
            _columns = Columns;
            _fullName = FullName;
            InitializeComponent();
            repositoryItemComboBox1.TextEditStyle =
                TextEditStyles.DisableTextEditor;
@@ -40,6 +49,8 @@
            btnEsc.Click += BtnEsc_Click;
            btnQuery.Click += BtnQuery_Click;
            getPageList();
            //下面为查询配置
            getPageListQuery();
        }
        /// <summary>
@@ -203,5 +214,36 @@
                return;
            }
        }
        #region MyRegion
        private void getPageListQuery()
        {
            var _colList = new List<dynamic>();
            foreach (GridColumn col in _columns)
            {
                _colList.Add(col.Name.ToString());
            }
            var _obj = new
            {
                formPath = this._fullName,
                colArray = _colList
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    "Fm/GetQuery", JsonConvert.SerializeObject(_obj));
                var dt = UtilityHelper.ReturnToList(strJson);
                DataTable _newTable = dt.rtnData;
                gcQuery.BindingContext = new BindingContext();
                gcQuery.DataSource = _newTable;
                gcQuery.ForceInitialize();
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        #endregion
    }
}