lu
2025-03-23 9096edb026d5d411fddeeb4281b24d67160567d2
查询
已修改19个文件
2478 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs 407 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs 506 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs 718 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs 620 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/Role.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowFilter.cs 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -30,8 +30,6 @@
        /// </summary>
        private void InitializeComponent()
        {
            // this.jyxm1 = new QC.Jyxm("iqc");
            this.jyxm1 = new QC.Jyxm("iqc");
            this.SuspendLayout();
            // 
            // jyxm1
@@ -41,7 +39,7 @@
            this.jyxm1.Name = "jyxm1";
            this.jyxm1.Size = new System.Drawing.Size(1044, 711);
            this.jyxm1.TabIndex = 0;
            this.jyxm1.Load += new System.EventHandler(this.jyxm1_Load);
            // 
            // Frm_MesQmCheckitemDt
            // 
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -21,5 +21,10 @@
        {
            InitializeComponent();
        }
        private void jyxm1_Load(object sender, EventArgs e)
        {
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
@@ -29,172 +29,40 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            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_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((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.SuspendLayout();
            //
            // gv_indepUserCode
            //
            this.gv_indepUserCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
            this.gv_indepUserCode.Caption = "入库人";
            this.gv_indepUserCode.FieldName = "indepUserCode";
            this.gv_indepUserCode.MinWidth = 50;
            this.gv_indepUserCode.Name = "gv_indepUserCode";
            this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
            this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
            this.gv_indepUserCode.Visible = true;
            this.gv_indepUserCode.VisibleIndex = 13;
            this.gv_indepUserCode.Width = 73;
            //
            // gv_ownerType
            //
            this.gv_ownerType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ownerType.AppearanceCell.Options.UseFont = true;
            this.gv_ownerType.Caption = "货主类型";
            this.gv_ownerType.FieldName = "ownerType";
            this.gv_ownerType.MinWidth = 50;
            this.gv_ownerType.Name = "gv_ownerType";
            this.gv_ownerType.OptionsColumn.AllowEdit = false;
            this.gv_ownerType.Tag = "query_a.Owner_Type";
            this.gv_ownerType.Visible = true;
            this.gv_ownerType.VisibleIndex = 10;
            this.gv_ownerType.Width = 73;
            //
            // gv_ownerId
            //
            this.gv_ownerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ownerId.AppearanceCell.Options.UseFont = true;
            this.gv_ownerId.Caption = "货主ID";
            this.gv_ownerId.FieldName = "ownerId";
            this.gv_ownerId.MinWidth = 50;
            this.gv_ownerId.Name = "gv_ownerId";
            this.gv_ownerId.OptionsColumn.AllowEdit = false;
            this.gv_ownerId.Tag = "query_a.Owner_Id";
            this.gv_ownerId.Visible = true;
            this.gv_ownerId.VisibleIndex = 11;
            this.gv_ownerId.Width = 73;
            //
            // gv_depotId
            //
            this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.Caption = "仓库ID";
            this.gv_depotId.FieldName = "depotId";
            this.gv_depotId.MinWidth = 50;
            this.gv_depotId.Name = "gv_depotId";
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
            this.gv_depotId.Visible = true;
            this.gv_depotId.VisibleIndex = 6;
            this.gv_depotId.Width = 73;
            //
            // gv_itemId
            //
            this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
            this.gv_itemId.Caption = "物料ID ";
            this.gv_itemId.FieldName = "itemId";
            this.gv_itemId.MinWidth = 50;
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.ITEM_ID";
            this.gv_itemId.Visible = true;
            this.gv_itemId.VisibleIndex = 0;
            this.gv_itemId.Width = 73;
            //
            // gv_indepDate
            //
            this.gv_indepDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_indepDate.AppearanceCell.Options.UseFont = true;
            this.gv_indepDate.Caption = "入库日期 ";
            this.gv_indepDate.FieldName = "indepDate";
            this.gv_indepDate.MinWidth = 10;
            this.gv_indepDate.Name = "gv_indepDate";
            this.gv_indepDate.OptionsColumn.AllowEdit = false;
            this.gv_indepDate.Tag = "query_a.INDEP_DATE";
            this.gv_indepDate.Visible = true;
            this.gv_indepDate.VisibleIndex = 14;
            this.gv_indepDate.Width = 10;
            //
            // gv_depotSectionsCode
            //
            this.gv_depotSectionsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotSectionsCode.Caption = "货位编号";
            this.gv_depotSectionsCode.FieldName = "depotSectionsCode";
            this.gv_depotSectionsCode.MinWidth = 50;
            this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
            this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
            this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
            this.gv_depotSectionsCode.Visible = true;
            this.gv_depotSectionsCode.VisibleIndex = 9;
            this.gv_depotSectionsCode.Width = 73;
            //
            // gv_quantity
            //
            this.gv_quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_quantity.AppearanceCell.Options.UseFont = true;
            this.gv_quantity.Caption = "数量 ";
            this.gv_quantity.FieldName = "quantity";
            this.gv_quantity.MinWidth = 50;
            this.gv_quantity.Name = "gv_quantity";
            this.gv_quantity.OptionsColumn.AllowEdit = false;
            this.gv_quantity.Tag = "query_a.QUANTITY";
            this.gv_quantity.Visible = true;
            this.gv_quantity.VisibleIndex = 5;
            this.gv_quantity.Width = 73;
            //
            // gv_itemBarcode
            //
            this.gv_itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gv_itemBarcode.Caption = "物料条码";
            this.gv_itemBarcode.FieldName = "itemBarcode";
            this.gv_itemBarcode.MinWidth = 50;
            this.gv_itemBarcode.Name = "gv_itemBarcode";
            this.gv_itemBarcode.OptionsColumn.AllowEdit = false;
            this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gv_itemBarcode.Visible = true;
            this.gv_itemBarcode.VisibleIndex = 4;
            this.gv_itemBarcode.Width = 73;
            //
            // gv_guid
            //
            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键GUID";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Width = 94;
            // 
            // toolBarMenu1
            // 
@@ -212,6 +80,44 @@
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            // 
            // 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(1128, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
            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(1126, 570);
            this.split1.SplitterPosition = 558;
            this.split1.TabIndex = 0;
            //
            // gcMain1
            // 
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -219,8 +125,8 @@
            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(1126, 531);
            this.gcMain1.TabIndex = 1;
            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
@@ -252,6 +158,32 @@
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gv_guid
            //
            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键GUID";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Width = 94;
            //
            // gv_itemId
            //
            this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
            this.gv_itemId.Caption = "物料ID ";
            this.gv_itemId.FieldName = "itemId";
            this.gv_itemId.MinWidth = 50;
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.ITEM_ID";
            this.gv_itemId.Visible = true;
            this.gv_itemId.VisibleIndex = 0;
            this.gv_itemId.Width = 73;
            //
            // gridColumn3
            // 
            this.gridColumn3.Caption = "物料编码";
@@ -282,6 +214,48 @@
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 73;
            // 
            // gv_itemBarcode
            //
            this.gv_itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gv_itemBarcode.Caption = "物料条码";
            this.gv_itemBarcode.FieldName = "itemBarcode";
            this.gv_itemBarcode.MinWidth = 50;
            this.gv_itemBarcode.Name = "gv_itemBarcode";
            this.gv_itemBarcode.OptionsColumn.AllowEdit = false;
            this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gv_itemBarcode.Visible = true;
            this.gv_itemBarcode.VisibleIndex = 4;
            this.gv_itemBarcode.Width = 73;
            //
            // gv_quantity
            //
            this.gv_quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_quantity.AppearanceCell.Options.UseFont = true;
            this.gv_quantity.Caption = "数量 ";
            this.gv_quantity.FieldName = "quantity";
            this.gv_quantity.MinWidth = 50;
            this.gv_quantity.Name = "gv_quantity";
            this.gv_quantity.OptionsColumn.AllowEdit = false;
            this.gv_quantity.Tag = "query_a.QUANTITY";
            this.gv_quantity.Visible = true;
            this.gv_quantity.VisibleIndex = 5;
            this.gv_quantity.Width = 73;
            //
            // gv_depotId
            //
            this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.Caption = "仓库ID";
            this.gv_depotId.FieldName = "depotId";
            this.gv_depotId.MinWidth = 50;
            this.gv_depotId.Name = "gv_depotId";
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
            this.gv_depotId.Visible = true;
            this.gv_depotId.VisibleIndex = 6;
            this.gv_depotId.Width = 73;
            //
            // gridColumn6
            // 
            this.gridColumn6.Caption = "仓库编号";
@@ -302,6 +276,48 @@
            this.gridColumn1.VisibleIndex = 8;
            this.gridColumn1.Width = 73;
            // 
            // gv_depotSectionsCode
            //
            this.gv_depotSectionsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotSectionsCode.Caption = "货位编号";
            this.gv_depotSectionsCode.FieldName = "depotSectionsCode";
            this.gv_depotSectionsCode.MinWidth = 50;
            this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
            this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
            this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
            this.gv_depotSectionsCode.Visible = true;
            this.gv_depotSectionsCode.VisibleIndex = 9;
            this.gv_depotSectionsCode.Width = 73;
            //
            // gv_ownerType
            //
            this.gv_ownerType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ownerType.AppearanceCell.Options.UseFont = true;
            this.gv_ownerType.Caption = "货主类型";
            this.gv_ownerType.FieldName = "ownerType";
            this.gv_ownerType.MinWidth = 50;
            this.gv_ownerType.Name = "gv_ownerType";
            this.gv_ownerType.OptionsColumn.AllowEdit = false;
            this.gv_ownerType.Tag = "query_a.Owner_Type";
            this.gv_ownerType.Visible = true;
            this.gv_ownerType.VisibleIndex = 10;
            this.gv_ownerType.Width = 73;
            //
            // gv_ownerId
            //
            this.gv_ownerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ownerId.AppearanceCell.Options.UseFont = true;
            this.gv_ownerId.Caption = "货主ID";
            this.gv_ownerId.FieldName = "ownerId";
            this.gv_ownerId.MinWidth = 50;
            this.gv_ownerId.Name = "gv_ownerId";
            this.gv_ownerId.OptionsColumn.AllowEdit = false;
            this.gv_ownerId.Tag = "query_a.Owner_Id";
            this.gv_ownerId.Visible = true;
            this.gv_ownerId.VisibleIndex = 11;
            this.gv_ownerId.Width = 73;
            //
            // gridColumn5
            // 
            this.gridColumn5.Caption = "货主名称";
@@ -312,35 +328,44 @@
            this.gridColumn5.VisibleIndex = 12;
            this.gridColumn5.Width = 73;
            // 
            // xtraTabControl1
            // gv_indepUserCode
            // 
            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(1128, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1});
            this.gv_indepUserCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
            this.gv_indepUserCode.Caption = "入库人";
            this.gv_indepUserCode.FieldName = "indepUserCode";
            this.gv_indepUserCode.MinWidth = 50;
            this.gv_indepUserCode.Name = "gv_indepUserCode";
            this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
            this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
            this.gv_indepUserCode.Visible = true;
            this.gv_indepUserCode.VisibleIndex = 13;
            this.gv_indepUserCode.Width = 73;
            // 
            // xtraTabPage1
            // gv_indepDate
            // 
            this.xtraTabPage1.Controls.Add(this.gcMain1);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage1.Text = "数据查询";
            this.gv_indepDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_indepDate.AppearanceCell.Options.UseFont = true;
            this.gv_indepDate.Caption = "入库日期 ";
            this.gv_indepDate.FieldName = "indepDate";
            this.gv_indepDate.MinWidth = 10;
            this.gv_indepDate.Name = "gv_indepDate";
            this.gv_indepDate.OptionsColumn.AllowEdit = false;
            this.gv_indepDate.Tag = "query_a.INDEP_DATE";
            this.gv_indepDate.Visible = true;
            this.gv_indepDate.VisibleIndex = 14;
            this.gv_indepDate.Width = 10;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 531);
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            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(1126, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // CKTmkc
@@ -353,36 +378,42 @@
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.Name = "CKTmkc";
            this.Text = "条码库存";
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((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.ResumeLayout(false);
        }
        #endregion
      private UserControl.UcToolBarMenu toolBarMenu1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private UserControls.Data.UcPageBar pageBar1;
 private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
 private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
 private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
 private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
 private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
 private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
 private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;
 private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
 private DevExpress.XtraGrid.Columns.GridColumn gv_itemBarcode;
 private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemBarcode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
        private UserControls.Data.UcPageBar pageBar1;
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -31,6 +31,22 @@
        {
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            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_checkStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_docCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ruleFormat = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_noLength = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_flagSpilitNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_resetZero = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_flagIncludeDocCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createdBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = 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.txt_resetZero = new DevExpress.XtraEditors.CheckEdit();
@@ -58,25 +74,17 @@
            this.txt_docCode = new DevExpress.XtraEditors.LookUpEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            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_checkStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_docCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ruleFormat = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_noLength = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_flagSpilitNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_resetZero = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_flagIncludeDocCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createdBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            ((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();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_resetZero.Properties)).BeginInit();
@@ -92,14 +100,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem2.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_docCode.Properties)).BeginInit();
            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();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
@@ -130,6 +130,227 @@
            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(1072, 548);
            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.Panel1
            //
            this.split1.Panel1.Controls.Add(this.gcMain1);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            //
            // split1.Panel2
            //
            this.split1.Panel2.Text = "Panel2";
            this.split1.Size = new System.Drawing.Size(1072, 548);
            this.split1.SplitterPosition = 536;
            this.split1.TabIndex = 4;
            //
            // 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(1072, 498);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_checkStatus,
            this.gv_docCode,
            this.gv_ruleFormat,
            this.gv_noLength,
            this.gv_flagSpilitNo,
            this.gv_resetZero,
            this.gv_flagIncludeDocCode,
            this.gv_createdBy,
            this.gv_createDate,
            this.gridColumn1,
            this.gridColumn2});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_checkStatus
            //
            this.gv_checkStatus.Caption = "审核";
            this.gv_checkStatus.FieldName = "checkStatus";
            this.gv_checkStatus.MaxWidth = 50;
            this.gv_checkStatus.MinWidth = 50;
            this.gv_checkStatus.Name = "gv_checkStatus";
            this.gv_checkStatus.OptionsColumn.AllowEdit = false;
            this.gv_checkStatus.Tag = "query_check_status";
            this.gv_checkStatus.Visible = true;
            this.gv_checkStatus.VisibleIndex = 0;
            this.gv_checkStatus.Width = 50;
            //
            // gv_docCode
            //
            this.gv_docCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_docCode.AppearanceCell.Options.UseFont = true;
            this.gv_docCode.Caption = "单据类型";
            this.gv_docCode.FieldName = "docCode";
            this.gv_docCode.MinWidth = 10;
            this.gv_docCode.Name = "gv_docCode";
            this.gv_docCode.OptionsColumn.AllowEdit = false;
            this.gv_docCode.Tag = "query_DOC_CODE";
            this.gv_docCode.Visible = true;
            this.gv_docCode.VisibleIndex = 1;
            this.gv_docCode.Width = 150;
            //
            // gv_ruleFormat
            //
            this.gv_ruleFormat.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ruleFormat.AppearanceCell.Options.UseFont = true;
            this.gv_ruleFormat.Caption = "编码规则";
            this.gv_ruleFormat.FieldName = "docFormat";
            this.gv_ruleFormat.MinWidth = 10;
            this.gv_ruleFormat.Name = "gv_ruleFormat";
            this.gv_ruleFormat.OptionsColumn.AllowEdit = false;
            this.gv_ruleFormat.Tag = "query_DOC_FORMAT";
            this.gv_ruleFormat.Visible = true;
            this.gv_ruleFormat.VisibleIndex = 2;
            this.gv_ruleFormat.Width = 300;
            //
            // gv_noLength
            //
            this.gv_noLength.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_noLength.AppearanceCell.Options.UseFont = true;
            this.gv_noLength.Caption = "序号长度";
            this.gv_noLength.FieldName = "noLength";
            this.gv_noLength.MinWidth = 10;
            this.gv_noLength.Name = "gv_noLength";
            this.gv_noLength.OptionsColumn.AllowEdit = false;
            this.gv_noLength.Tag = "query_NO_LENGTH";
            this.gv_noLength.Visible = true;
            this.gv_noLength.VisibleIndex = 3;
            this.gv_noLength.Width = 94;
            //
            // gv_flagSpilitNo
            //
            this.gv_flagSpilitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_flagSpilitNo.AppearanceCell.Options.UseFont = true;
            this.gv_flagSpilitNo.Caption = "序号前分隔符";
            this.gv_flagSpilitNo.FieldName = "isSpilit";
            this.gv_flagSpilitNo.MinWidth = 10;
            this.gv_flagSpilitNo.Name = "gv_flagSpilitNo";
            this.gv_flagSpilitNo.OptionsColumn.AllowEdit = false;
            this.gv_flagSpilitNo.Tag = "query_IS_SPILIT";
            this.gv_flagSpilitNo.Visible = true;
            this.gv_flagSpilitNo.VisibleIndex = 4;
            this.gv_flagSpilitNo.Width = 94;
            //
            // gv_resetZero
            //
            this.gv_resetZero.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_resetZero.AppearanceCell.Options.UseFont = true;
            this.gv_resetZero.Caption = "每天归零";
            this.gv_resetZero.FieldName = "resetZero";
            this.gv_resetZero.MinWidth = 10;
            this.gv_resetZero.Name = "gv_resetZero";
            this.gv_resetZero.OptionsColumn.AllowEdit = false;
            this.gv_resetZero.Tag = "query_RESET_ZERO";
            this.gv_resetZero.Visible = true;
            this.gv_resetZero.VisibleIndex = 5;
            this.gv_resetZero.Width = 94;
            //
            // gv_flagIncludeDocCode
            //
            this.gv_flagIncludeDocCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_flagIncludeDocCode.AppearanceCell.Options.UseFont = true;
            this.gv_flagIncludeDocCode.Caption = "包含单据类型";
            this.gv_flagIncludeDocCode.FieldName = "isIncludeDoc";
            this.gv_flagIncludeDocCode.MinWidth = 10;
            this.gv_flagIncludeDocCode.Name = "gv_flagIncludeDocCode";
            this.gv_flagIncludeDocCode.OptionsColumn.AllowEdit = false;
            this.gv_flagIncludeDocCode.Tag = "query_IS_INCLUDE_DOC";
            this.gv_flagIncludeDocCode.Visible = true;
            this.gv_flagIncludeDocCode.VisibleIndex = 6;
            this.gv_flagIncludeDocCode.Width = 94;
            //
            // gv_createdBy
            //
            this.gv_createdBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createdBy.AppearanceCell.Options.UseFont = true;
            this.gv_createdBy.Caption = "建立者";
            this.gv_createdBy.FieldName = "createBy";
            this.gv_createdBy.MinWidth = 10;
            this.gv_createdBy.Name = "gv_createdBy";
            this.gv_createdBy.OptionsColumn.AllowEdit = false;
            this.gv_createdBy.Tag = "query_check_by";
            this.gv_createdBy.Visible = true;
            this.gv_createdBy.VisibleIndex = 7;
            this.gv_createdBy.Width = 94;
            //
            // gv_createDate
            //
            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "建立日期";
            this.gv_createDate.FieldName = "createTime";
            this.gv_createDate.MinWidth = 10;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_check_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 8;
            this.gv_createDate.Width = 180;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "审核者";
            this.gridColumn1.FieldName = "checkBy";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 9;
            this.gridColumn1.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "审核日期";
            this.gridColumn2.FieldName = "checkDate";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 10;
            this.gridColumn2.Width = 94;
            //
            // pageBar1
            //
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 498);
            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(1072, 38);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // xtraTabPage2
            // 
@@ -499,227 +720,6 @@
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            // 
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1072, 548);
            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.Panel1
            //
            this.split1.Panel1.Controls.Add(this.gcMain1);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            //
            // split1.Panel2
            //
            this.split1.Panel2.Text = "Panel2";
            this.split1.Size = new System.Drawing.Size(1072, 548);
            this.split1.SplitterPosition = 536;
            this.split1.TabIndex = 4;
            //
            // 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(1072, 498);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_checkStatus,
            this.gv_docCode,
            this.gv_ruleFormat,
            this.gv_noLength,
            this.gv_flagSpilitNo,
            this.gv_resetZero,
            this.gv_flagIncludeDocCode,
            this.gv_createdBy,
            this.gv_createDate,
            this.gridColumn1,
            this.gridColumn2});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_checkStatus
            //
            this.gv_checkStatus.Caption = "审核";
            this.gv_checkStatus.FieldName = "checkStatus";
            this.gv_checkStatus.MaxWidth = 50;
            this.gv_checkStatus.MinWidth = 50;
            this.gv_checkStatus.Name = "gv_checkStatus";
            this.gv_checkStatus.OptionsColumn.AllowEdit = false;
            this.gv_checkStatus.Tag = "query_check_status";
            this.gv_checkStatus.Visible = true;
            this.gv_checkStatus.VisibleIndex = 0;
            this.gv_checkStatus.Width = 50;
            //
            // gv_docCode
            //
            this.gv_docCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_docCode.AppearanceCell.Options.UseFont = true;
            this.gv_docCode.Caption = "单据类型";
            this.gv_docCode.FieldName = "docCode";
            this.gv_docCode.MinWidth = 10;
            this.gv_docCode.Name = "gv_docCode";
            this.gv_docCode.OptionsColumn.AllowEdit = false;
            this.gv_docCode.Tag = "query_DOC_CODE";
            this.gv_docCode.Visible = true;
            this.gv_docCode.VisibleIndex = 1;
            this.gv_docCode.Width = 150;
            //
            // gv_ruleFormat
            //
            this.gv_ruleFormat.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ruleFormat.AppearanceCell.Options.UseFont = true;
            this.gv_ruleFormat.Caption = "编码规则";
            this.gv_ruleFormat.FieldName = "docFormat";
            this.gv_ruleFormat.MinWidth = 10;
            this.gv_ruleFormat.Name = "gv_ruleFormat";
            this.gv_ruleFormat.OptionsColumn.AllowEdit = false;
            this.gv_ruleFormat.Tag = "query_DOC_FORMAT";
            this.gv_ruleFormat.Visible = true;
            this.gv_ruleFormat.VisibleIndex = 2;
            this.gv_ruleFormat.Width = 300;
            //
            // gv_noLength
            //
            this.gv_noLength.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_noLength.AppearanceCell.Options.UseFont = true;
            this.gv_noLength.Caption = "序号长度";
            this.gv_noLength.FieldName = "noLength";
            this.gv_noLength.MinWidth = 10;
            this.gv_noLength.Name = "gv_noLength";
            this.gv_noLength.OptionsColumn.AllowEdit = false;
            this.gv_noLength.Tag = "query_NO_LENGTH";
            this.gv_noLength.Visible = true;
            this.gv_noLength.VisibleIndex = 3;
            this.gv_noLength.Width = 94;
            //
            // gv_flagSpilitNo
            //
            this.gv_flagSpilitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_flagSpilitNo.AppearanceCell.Options.UseFont = true;
            this.gv_flagSpilitNo.Caption = "序号前分隔符";
            this.gv_flagSpilitNo.FieldName = "isSpilit";
            this.gv_flagSpilitNo.MinWidth = 10;
            this.gv_flagSpilitNo.Name = "gv_flagSpilitNo";
            this.gv_flagSpilitNo.OptionsColumn.AllowEdit = false;
            this.gv_flagSpilitNo.Tag = "query_IS_SPILIT";
            this.gv_flagSpilitNo.Visible = true;
            this.gv_flagSpilitNo.VisibleIndex = 4;
            this.gv_flagSpilitNo.Width = 94;
            //
            // gv_resetZero
            //
            this.gv_resetZero.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_resetZero.AppearanceCell.Options.UseFont = true;
            this.gv_resetZero.Caption = "每天归零";
            this.gv_resetZero.FieldName = "resetZero";
            this.gv_resetZero.MinWidth = 10;
            this.gv_resetZero.Name = "gv_resetZero";
            this.gv_resetZero.OptionsColumn.AllowEdit = false;
            this.gv_resetZero.Tag = "query_RESET_ZERO";
            this.gv_resetZero.Visible = true;
            this.gv_resetZero.VisibleIndex = 5;
            this.gv_resetZero.Width = 94;
            //
            // gv_flagIncludeDocCode
            //
            this.gv_flagIncludeDocCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_flagIncludeDocCode.AppearanceCell.Options.UseFont = true;
            this.gv_flagIncludeDocCode.Caption = "包含单据类型";
            this.gv_flagIncludeDocCode.FieldName = "isIncludeDoc";
            this.gv_flagIncludeDocCode.MinWidth = 10;
            this.gv_flagIncludeDocCode.Name = "gv_flagIncludeDocCode";
            this.gv_flagIncludeDocCode.OptionsColumn.AllowEdit = false;
            this.gv_flagIncludeDocCode.Tag = "query_IS_INCLUDE_DOC";
            this.gv_flagIncludeDocCode.Visible = true;
            this.gv_flagIncludeDocCode.VisibleIndex = 6;
            this.gv_flagIncludeDocCode.Width = 94;
            //
            // gv_createdBy
            //
            this.gv_createdBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createdBy.AppearanceCell.Options.UseFont = true;
            this.gv_createdBy.Caption = "建立者";
            this.gv_createdBy.FieldName = "createBy";
            this.gv_createdBy.MinWidth = 10;
            this.gv_createdBy.Name = "gv_createdBy";
            this.gv_createdBy.OptionsColumn.AllowEdit = false;
            this.gv_createdBy.Tag = "query_check_by";
            this.gv_createdBy.Visible = true;
            this.gv_createdBy.VisibleIndex = 7;
            this.gv_createdBy.Width = 94;
            //
            // gv_createDate
            //
            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "建立日期";
            this.gv_createDate.FieldName = "createTime";
            this.gv_createDate.MinWidth = 10;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_check_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 8;
            this.gv_createDate.Width = 180;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "审核者";
            this.gridColumn1.FieldName = "checkBy";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 9;
            this.gridColumn1.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "审核日期";
            this.gridColumn2.FieldName = "checkDate";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 10;
            this.gridColumn2.Width = 94;
            //
            // pageBar1
            //
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 498);
            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(1072, 38);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            //
            // picCheckBox
            // 
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -743,6 +743,14 @@
            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);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
@@ -760,14 +768,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem2.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_docCode.Properties)).EndInit();
            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();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -1,21 +1,12 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Windows.Forms;
using DevExpress.Office.Utils;
using DevExpress.XtraBars.Ribbon;
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Menu;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System.Linq;
namespace Gs.DevApp.DevFrm.Sys
{
@@ -32,9 +23,7 @@
            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            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, picCheckBox, this, "checkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs
@@ -58,7 +58,7 @@
            // environmentSettings1
            // 
            designerSettings2.ApplicationConnection = null;
            designerSettings2.DefaultFont = new System.Drawing.Font("宋体",10F);
            designerSettings2.DefaultFont = new System.Drawing.Font("宋体", 9F);
            designerSettings2.Icon = null;
            designerSettings2.Restrictions = designerRestrictions2;
            designerSettings2.Text = "";
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
@@ -29,220 +29,86 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            this.lb_pageStatus = new DevExpress.XtraEditors.LabelControl();
            this.gv_pageStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_pageIdx = new DevExpress.XtraEditors.LabelControl();
            this.gv_pageIdx = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_pageGroup = new DevExpress.XtraEditors.LabelControl();
            this.txt_pageGroup = new DevExpress.XtraEditors.TextEdit();
            this.gv_pageGroup = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_icoimg = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_path = new DevExpress.XtraEditors.LabelControl();
            this.txt_path = new DevExpress.XtraEditors.TextEdit();
            this.gv_path = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_pageView = new DevExpress.XtraEditors.LabelControl();
            this.txt_pageView = new DevExpress.XtraEditors.TextEdit();
            this.gv_pageView = new DevExpress.XtraGrid.Columns.GridColumn();
            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.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            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.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            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_pageView = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_path = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_icoimg = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_pageGroup = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_pageIdx = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_pageStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_pageIdx = new System.Windows.Forms.NumericUpDown();
            this.txt_pageStatus = new DevExpress.XtraEditors.CheckEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.lbGuid = new System.Windows.Forms.Label();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageGroup.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_path.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageView.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.txt_pageIdx = new System.Windows.Forms.NumericUpDown();
            this.txt_pageView = new DevExpress.XtraEditors.TextEdit();
            this.txt_path = new DevExpress.XtraEditors.TextEdit();
            this.txt_pageGroup = new DevExpress.XtraEditors.TextEdit();
            this.txt_pageStatus = new DevExpress.XtraEditors.CheckEdit();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            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.layoutControlItem5 = 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();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.xtraTabPage2.SuspendLayout();
            this.panel1.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.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageIdx)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageView.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_path.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageGroup.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageStatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((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.layoutControlItem5)).BeginInit();
            this.SuspendLayout();
            //
            // lb_pageStatus
            //
            this.lb_pageStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_pageStatus.Appearance.Options.UseFont = true;
            this.lb_pageStatus.Location = new System.Drawing.Point(424, 61);
            this.lb_pageStatus.Name = "lb_pageStatus";
            this.lb_pageStatus.Size = new System.Drawing.Size(34, 21);
            this.lb_pageStatus.TabIndex = 222;
            this.lb_pageStatus.Text = "状态";
            //
            // gv_pageStatus
            //
            this.gv_pageStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pageStatus.AppearanceCell.Options.UseFont = true;
            this.gv_pageStatus.Caption = "状态";
            this.gv_pageStatus.FieldName = "pageStatus";
            this.gv_pageStatus.MinWidth = 50;
            this.gv_pageStatus.Name = "gv_pageStatus";
            this.gv_pageStatus.OptionsColumn.AllowEdit = false;
            this.gv_pageStatus.Tag = "query_a.PAGE_STATUS";
            this.gv_pageStatus.UnboundDataType = typeof(bool);
            this.gv_pageStatus.Visible = true;
            this.gv_pageStatus.VisibleIndex = 5;
            this.gv_pageStatus.Width = 94;
            //
            // lb_pageIdx
            //
            this.lb_pageIdx.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_pageIdx.Appearance.Options.UseFont = true;
            this.lb_pageIdx.Location = new System.Drawing.Point(424, 20);
            this.lb_pageIdx.Name = "lb_pageIdx";
            this.lb_pageIdx.Size = new System.Drawing.Size(34, 21);
            this.lb_pageIdx.TabIndex = 219;
            this.lb_pageIdx.Text = "排序";
            //
            // gv_pageIdx
            //
            this.gv_pageIdx.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pageIdx.AppearanceCell.Options.UseFont = true;
            this.gv_pageIdx.Caption = "排序";
            this.gv_pageIdx.FieldName = "pageIdx";
            this.gv_pageIdx.MinWidth = 50;
            this.gv_pageIdx.Name = "gv_pageIdx";
            this.gv_pageIdx.OptionsColumn.AllowEdit = false;
            this.gv_pageIdx.Tag = "query_a.PAGE_IDX";
            this.gv_pageIdx.Visible = true;
            this.gv_pageIdx.VisibleIndex = 4;
            this.gv_pageIdx.Width = 94;
            //
            // lb_pageGroup
            //
            this.lb_pageGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_pageGroup.Appearance.Options.UseFont = true;
            this.lb_pageGroup.Location = new System.Drawing.Point(95, 103);
            this.lb_pageGroup.Name = "lb_pageGroup";
            this.lb_pageGroup.Size = new System.Drawing.Size(34, 21);
            this.lb_pageGroup.TabIndex = 217;
            this.lb_pageGroup.Text = "组别";
            //
            // txt_pageGroup
            //
            this.txt_pageGroup.Location = new System.Drawing.Point(134, 99);
            this.txt_pageGroup.Name = "txt_pageGroup";
            this.txt_pageGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_pageGroup.Properties.Appearance.Options.UseFont = true;
            this.txt_pageGroup.Size = new System.Drawing.Size(244, 28);
            this.txt_pageGroup.TabIndex = 217;
            //
            // gv_pageGroup
            //
            this.gv_pageGroup.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pageGroup.AppearanceCell.Options.UseFont = true;
            this.gv_pageGroup.Caption = "分组";
            this.gv_pageGroup.FieldName = "pageGroup";
            this.gv_pageGroup.MinWidth = 50;
            this.gv_pageGroup.Name = "gv_pageGroup";
            this.gv_pageGroup.OptionsColumn.AllowEdit = false;
            this.gv_pageGroup.Tag = "query_a.PAGE_GROUP";
            this.gv_pageGroup.Visible = true;
            this.gv_pageGroup.VisibleIndex = 3;
            this.gv_pageGroup.Width = 94;
            //
            // gv_icoimg
            //
            this.gv_icoimg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_icoimg.AppearanceCell.Options.UseFont = true;
            this.gv_icoimg.Caption = "页面图标";
            this.gv_icoimg.FieldName = "icoImg2";
            this.gv_icoimg.MinWidth = 250;
            this.gv_icoimg.Name = "gv_icoimg";
            this.gv_icoimg.OptionsColumn.AllowEdit = false;
            this.gv_icoimg.Tag = "query_a.ICOIMG";
            this.gv_icoimg.Visible = true;
            this.gv_icoimg.VisibleIndex = 2;
            this.gv_icoimg.Width = 250;
            //
            // lb_path
            //
            this.lb_path.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_path.Appearance.Options.UseFont = true;
            this.lb_path.Location = new System.Drawing.Point(56, 61);
            this.lb_path.Name = "lb_path";
            this.lb_path.Size = new System.Drawing.Size(73, 21);
            this.lb_path.TabIndex = 213;
            this.lb_path.Text = "页面路径 ";
            //
            // txt_path
            //
            this.txt_path.Location = new System.Drawing.Point(135, 57);
            this.txt_path.Name = "txt_path";
            this.txt_path.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_path.Properties.Appearance.Options.UseFont = true;
            this.txt_path.Size = new System.Drawing.Size(244, 28);
            this.txt_path.TabIndex = 213;
            //
            // gv_path
            //
            this.gv_path.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_path.AppearanceCell.Options.UseFont = true;
            this.gv_path.Caption = "页面路径";
            this.gv_path.FieldName = "path";
            this.gv_path.MinWidth = 250;
            this.gv_path.Name = "gv_path";
            this.gv_path.OptionsColumn.AllowEdit = false;
            this.gv_path.Tag = "query_a.PATH";
            this.gv_path.Visible = true;
            this.gv_path.VisibleIndex = 1;
            this.gv_path.Width = 250;
            //
            // lb_pageView
            //
            this.lb_pageView.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_pageView.Appearance.Options.UseFont = true;
            this.lb_pageView.Location = new System.Drawing.Point(39, 20);
            this.lb_pageView.Name = "lb_pageView";
            this.lb_pageView.Size = new System.Drawing.Size(90, 21);
            this.lb_pageView.TabIndex = 211;
            this.lb_pageView.Text = "页面中文名 ";
            //
            // txt_pageView
            //
            this.txt_pageView.Location = new System.Drawing.Point(135, 16);
            this.txt_pageView.Name = "txt_pageView";
            this.txt_pageView.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_pageView.Properties.Appearance.Options.UseFont = true;
            this.txt_pageView.Size = new System.Drawing.Size(244, 28);
            this.txt_pageView.TabIndex = 211;
            //
            // gv_pageView
            //
            this.gv_pageView.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pageView.AppearanceCell.Options.UseFont = true;
            this.gv_pageView.Caption = "页面名";
            this.gv_pageView.FieldName = "pageView";
            this.gv_pageView.MinWidth = 120;
            this.gv_pageView.Name = "gv_pageView";
            this.gv_pageView.OptionsColumn.AllowEdit = false;
            this.gv_pageView.Tag = "query_a.PAGE_VIEW";
            this.gv_pageView.Visible = true;
            this.gv_pageView.VisibleIndex = 0;
            this.gv_pageView.Width = 120;
            // 
            // 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;
@@ -254,6 +120,45 @@
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            // 
            // 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(1128, 602);
            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(1126, 570);
            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.Panel1
            //
            this.split1.Panel1.Controls.Add(this.gcMain1);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            //
            // split1.Panel2
            //
            this.split1.Panel2.Text = "Panel2";
            this.split1.Size = new System.Drawing.Size(1126, 570);
            this.split1.SplitterPosition = 558;
            this.split1.TabIndex = 0;
            //
            // gcMain1
            // 
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -263,8 +168,8 @@
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMain1.Size = new System.Drawing.Size(1126, 531);
            this.gcMain1.TabIndex = 1;
            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
@@ -287,6 +192,91 @@
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gv_pageView
            //
            this.gv_pageView.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pageView.AppearanceCell.Options.UseFont = true;
            this.gv_pageView.Caption = "页面名";
            this.gv_pageView.FieldName = "pageView";
            this.gv_pageView.MinWidth = 120;
            this.gv_pageView.Name = "gv_pageView";
            this.gv_pageView.OptionsColumn.AllowEdit = false;
            this.gv_pageView.Tag = "query_a.PAGE_VIEW";
            this.gv_pageView.Visible = true;
            this.gv_pageView.VisibleIndex = 0;
            this.gv_pageView.Width = 120;
            //
            // gv_path
            //
            this.gv_path.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_path.AppearanceCell.Options.UseFont = true;
            this.gv_path.Caption = "页面路径";
            this.gv_path.FieldName = "path";
            this.gv_path.MinWidth = 250;
            this.gv_path.Name = "gv_path";
            this.gv_path.OptionsColumn.AllowEdit = false;
            this.gv_path.Tag = "query_a.PATH";
            this.gv_path.Visible = true;
            this.gv_path.VisibleIndex = 1;
            this.gv_path.Width = 250;
            //
            // gv_icoimg
            //
            this.gv_icoimg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_icoimg.AppearanceCell.Options.UseFont = true;
            this.gv_icoimg.Caption = "页面图标";
            this.gv_icoimg.FieldName = "icoImg2";
            this.gv_icoimg.MinWidth = 250;
            this.gv_icoimg.Name = "gv_icoimg";
            this.gv_icoimg.OptionsColumn.AllowEdit = false;
            this.gv_icoimg.Tag = "query_a.ICOIMG";
            this.gv_icoimg.Visible = true;
            this.gv_icoimg.VisibleIndex = 2;
            this.gv_icoimg.Width = 250;
            //
            // gv_pageGroup
            //
            this.gv_pageGroup.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pageGroup.AppearanceCell.Options.UseFont = true;
            this.gv_pageGroup.Caption = "分组";
            this.gv_pageGroup.FieldName = "pageGroup";
            this.gv_pageGroup.MinWidth = 50;
            this.gv_pageGroup.Name = "gv_pageGroup";
            this.gv_pageGroup.OptionsColumn.AllowEdit = false;
            this.gv_pageGroup.Tag = "query_a.PAGE_GROUP";
            this.gv_pageGroup.Visible = true;
            this.gv_pageGroup.VisibleIndex = 3;
            this.gv_pageGroup.Width = 94;
            //
            // gv_pageIdx
            //
            this.gv_pageIdx.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pageIdx.AppearanceCell.Options.UseFont = true;
            this.gv_pageIdx.Caption = "排序";
            this.gv_pageIdx.FieldName = "pageIdx";
            this.gv_pageIdx.MinWidth = 50;
            this.gv_pageIdx.Name = "gv_pageIdx";
            this.gv_pageIdx.OptionsColumn.AllowEdit = false;
            this.gv_pageIdx.Tag = "query_a.PAGE_IDX";
            this.gv_pageIdx.Visible = true;
            this.gv_pageIdx.VisibleIndex = 4;
            this.gv_pageIdx.Width = 94;
            //
            // gv_pageStatus
            //
            this.gv_pageStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pageStatus.AppearanceCell.Options.UseFont = true;
            this.gv_pageStatus.Caption = "状态";
            this.gv_pageStatus.FieldName = "pageStatus";
            this.gv_pageStatus.MinWidth = 50;
            this.gv_pageStatus.Name = "gv_pageStatus";
            this.gv_pageStatus.OptionsColumn.AllowEdit = false;
            this.gv_pageStatus.Tag = "query_a.PAGE_STATUS";
            this.gv_pageStatus.UnboundDataType = typeof(bool);
            this.gv_pageStatus.Visible = true;
            this.gv_pageStatus.VisibleIndex = 5;
            this.gv_pageStatus.Width = 94;
            //
            // gridColumn1
            // 
            this.gridColumn1.Caption = "上传图标";
@@ -301,79 +291,85 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.upload_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.cleartablestyle_16x161;
            editorButtonImageOptions2.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            //
            // 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(1128, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.gcMain1);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage1.Text = "数据列表";
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 531);
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            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(1126, 39);
            this.pageBar1.TabIndex = 3;
            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(1126, 570);
            this.xtraTabPage2.Text = "数据详细";
            // 
            // panel1
            // splitMx1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_pageIdx);
            this.panel1.Controls.Add(this.txt_pageStatus);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_pageStatus);
            this.panel1.Controls.Add(this.lb_pageIdx);
            this.panel1.Controls.Add(this.lb_pageGroup);
            this.panel1.Controls.Add(this.txt_pageGroup);
            this.panel1.Controls.Add(this.lb_path);
            this.panel1.Controls.Add(this.txt_path);
            this.panel1.Controls.Add(this.lb_pageView);
            this.panel1.Controls.Add(this.txt_pageView);
            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(744, 267);
            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";
            //
            // splitMx1.Panel1
            //
            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
            this.splitMx1.Panel1.Text = "Panel1";
            //
            // splitMx1.Panel2
            //
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
            this.splitMx1.SplitterPosition = 86;
            this.splitMx1.TabIndex = 4;
            //
            // layoutMx1
            //
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_pageIdx);
            this.layoutMx1.Controls.Add(this.txt_pageView);
            this.layoutMx1.Controls.Add(this.txt_path);
            this.layoutMx1.Controls.Add(this.txt_pageGroup);
            this.layoutMx1.Controls.Add(this.txt_pageStatus);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem6});
            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(1126, 86);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            //
            // lbGuid
            //
            this.lbGuid.Location = new System.Drawing.Point(564, 45);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(272, 29);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Text = "lbGuid";
            this.lbGuid.Visible = false;
            // 
            // txt_pageIdx
            // 
            this.txt_pageIdx.Location = new System.Drawing.Point(469, 16);
            this.txt_pageIdx.Location = new System.Drawing.Point(375, 45);
            this.txt_pageIdx.Name = "txt_pageIdx";
            this.txt_pageIdx.Size = new System.Drawing.Size(150, 28);
            this.txt_pageIdx.Size = new System.Drawing.Size(185, 26);
            this.txt_pageIdx.TabIndex = 224;
            this.txt_pageIdx.Value = new decimal(new int[] {
            2,
@@ -381,32 +377,141 @@
            0,
            0});
            // 
            // txt_pageView
            //
            this.txt_pageView.Location = new System.Drawing.Point(99, 12);
            this.txt_pageView.Name = "txt_pageView";
            this.txt_pageView.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_pageView.Properties.Appearance.Options.UseFont = true;
            this.txt_pageView.Size = new System.Drawing.Size(185, 28);
            this.txt_pageView.StyleController = this.layoutMx1;
            this.txt_pageView.TabIndex = 211;
            //
            // txt_path
            //
            this.txt_path.Location = new System.Drawing.Point(375, 12);
            this.txt_path.Name = "txt_path";
            this.txt_path.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_path.Properties.Appearance.Options.UseFont = true;
            this.txt_path.Size = new System.Drawing.Size(185, 28);
            this.txt_path.StyleController = this.layoutMx1;
            this.txt_path.TabIndex = 213;
            //
            // txt_pageGroup
            //
            this.txt_pageGroup.Location = new System.Drawing.Point(99, 45);
            this.txt_pageGroup.Name = "txt_pageGroup";
            this.txt_pageGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_pageGroup.Properties.Appearance.Options.UseFont = true;
            this.txt_pageGroup.Size = new System.Drawing.Size(185, 28);
            this.txt_pageGroup.StyleController = this.layoutMx1;
            this.txt_pageGroup.TabIndex = 217;
            //
            // txt_pageStatus
            // 
            this.txt_pageStatus.Location = new System.Drawing.Point(469, 59);
            this.txt_pageStatus.Location = new System.Drawing.Point(564, 12);
            this.txt_pageStatus.Name = "txt_pageStatus";
            this.txt_pageStatus.Properties.Caption = "";
            this.txt_pageStatus.Size = new System.Drawing.Size(94, 24);
            this.txt_pageStatus.TabIndex = 223;
            this.txt_pageStatus.Properties.Caption = "状态";
            this.txt_pageStatus.Size = new System.Drawing.Size(272, 24);
            this.txt_pageStatus.StyleController = this.layoutMx1;
            this.txt_pageStatus.TabIndex = 225;
            // 
            // labelControl11
            // layoutControlItem6
            // 
            this.labelControl11.Location = new System.Drawing.Point(72, 166);
            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.layoutControlItem6.Control = this.lbGuid;
            this.layoutControlItem6.Location = new System.Drawing.Point(552, 33);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem6.Text = "lbGuid";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem6.TextVisible = false;
            // 
            // lbGuid
            // Root
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(123, 166);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            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.layoutControlItem5});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            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;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            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(1126, 86);
            this.Root.TextVisible = false;
            //
            // layoutControlItem1
            //
            this.layoutControlItem1.Control = this.txt_pageView;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem1.Text = "页面中文名";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_path;
            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem2.Text = "页面路径";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_pageGroup;
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 33);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem3.Text = "组别";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_pageIdx;
            this.layoutControlItem4.Location = new System.Drawing.Point(276, 33);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem4.Text = "排序";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_pageStatus;
            this.layoutControlItem5.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem5.TextVisible = false;
            // 
            // Frm_MesSysPageview
            // 
@@ -417,56 +522,71 @@
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesSysPageview";
            this.Text = "PDA页面维护";
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageGroup.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_path.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageView.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((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();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.xtraTabPage2.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((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.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageIdx)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageView.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_path.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageGroup.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pageStatus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((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.layoutControlItem5)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
      private UserControl.UcToolBarMenu toolBarMenu1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private UserControls.Data.UcPageBar pageBar1;
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.LabelControl labelControl11;
       //BQCreateConrolObejct
private DevExpress.XtraEditors.LabelControl lb_pageStatus;
 private DevExpress.XtraGrid.Columns.GridColumn gv_pageStatus;
private DevExpress.XtraEditors.LabelControl lb_pageIdx;
 private DevExpress.XtraGrid.Columns.GridColumn gv_pageIdx;
private DevExpress.XtraEditors.LabelControl lb_pageGroup;
private DevExpress.XtraEditors.TextEdit txt_pageGroup;
 private DevExpress.XtraGrid.Columns.GridColumn gv_pageGroup;
 private DevExpress.XtraGrid.Columns.GridColumn gv_icoimg;
private DevExpress.XtraEditors.LabelControl lb_path;
private DevExpress.XtraEditors.TextEdit txt_path;
 private DevExpress.XtraGrid.Columns.GridColumn gv_path;
private DevExpress.XtraEditors.LabelControl lb_pageView;
private DevExpress.XtraEditors.TextEdit txt_pageView;
 private DevExpress.XtraGrid.Columns.GridColumn gv_pageView;
        private DevExpress.XtraEditors.CheckEdit txt_pageStatus;
        private System.Windows.Forms.NumericUpDown txt_pageIdx;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_pageView;
        private DevExpress.XtraGrid.Columns.GridColumn gv_path;
        private DevExpress.XtraGrid.Columns.GridColumn gv_icoimg;
        private DevExpress.XtraGrid.Columns.GridColumn gv_pageGroup;
        private DevExpress.XtraGrid.Columns.GridColumn gv_pageIdx;
        private DevExpress.XtraGrid.Columns.GridColumn gv_pageStatus;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private System.Windows.Forms.NumericUpDown txt_pageIdx;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.TextEdit txt_pageGroup;
        private DevExpress.XtraEditors.TextEdit txt_path;
        private DevExpress.XtraEditors.TextEdit txt_pageView;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraEditors.CheckEdit txt_pageStatus;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -135,7 +135,7 @@
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
            UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
        }
        /// <summary>
        /// 新增事件
@@ -146,7 +146,7 @@
        {
            lbGuid.Text = "";
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            UtilityHelper.CleanValueByControl(panel1.Controls, true);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
        }
        /// <summary>
        /// 保存事件
@@ -193,7 +193,7 @@
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
                }
            }
            catch (Exception ex)
@@ -226,7 +226,7 @@
                    pageBar1.TotalPages = dddd;
                    pageBar1.RecordCount = dd.rtnData.total;//记录总数
                    pageBar1.CurrentPage = curPage;//当前页
                    gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    gridView1.BestFitColumns();
                }
                else
                {
@@ -266,7 +266,7 @@
                {
                    dynamic dy = _rtn.rtnData;
                    lbGuid.Text = strGuid;
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -277,11 +277,6 @@
            }
        }
        /// <summary>
        /// 上传图片
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gridView1.FocusedRowHandle;
@@ -300,7 +295,5 @@
                frm.ShowDialog();
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
@@ -29,180 +29,72 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_port = new DevExpress.XtraEditors.LabelControl();
            this.txt_port = new DevExpress.XtraEditors.TextEdit();
            this.gv_port = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_ip = new DevExpress.XtraEditors.LabelControl();
            this.txt_ip = new DevExpress.XtraEditors.TextEdit();
            this.gv_ip = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_printNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_printNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_printNo = new DevExpress.XtraGrid.Columns.GridColumn();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = 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.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_printNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ip = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_port = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remark = 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_remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_port = new DevExpress.XtraEditors.TextEdit();
            this.txt_ip = new DevExpress.XtraEditors.TextEdit();
            this.txt_printNo = 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.layoutControlItem5 = 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_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_port.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ip.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_printNo.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.layoutControlItem5)).BeginInit();
            this.SuspendLayout();
            //
            // 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(70, 129);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(40, 21);
            this.lb_remark.TabIndex = 217;
            this.lb_remark.Text = "备注:";
            //
            // txt_remark
            //
            this.txt_remark.Location = new System.Drawing.Point(117, 125);
            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(178, 28);
            this.txt_remark.TabIndex = 217;
            //
            // 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 = 100;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 3;
            this.gv_remark.Width = 100;
            //
            // lb_port
            //
            this.lb_port.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_port.Appearance.Options.UseFont = true;
            this.lb_port.Location = new System.Drawing.Point(19, 91);
            this.lb_port.Name = "lb_port";
            this.lb_port.Size = new System.Drawing.Size(91, 21);
            this.lb_port.TabIndex = 216;
            this.lb_port.Text = "打印机端口:";
            //
            // txt_port
            //
            this.txt_port.Location = new System.Drawing.Point(117, 87);
            this.txt_port.Name = "txt_port";
            this.txt_port.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_port.Properties.Appearance.Options.UseFont = true;
            this.txt_port.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
            this.txt_port.Properties.MaskSettings.Set("mask", "\\d+");
            this.txt_port.Size = new System.Drawing.Size(178, 28);
            this.txt_port.TabIndex = 216;
            this.txt_port.Tag = "moren.9100";
            //
            // gv_port
            //
            this.gv_port.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_port.AppearanceCell.Options.UseFont = true;
            this.gv_port.Caption = "打印机端口 ";
            this.gv_port.FieldName = "port";
            this.gv_port.MinWidth = 50;
            this.gv_port.Name = "gv_port";
            this.gv_port.OptionsColumn.AllowEdit = false;
            this.gv_port.Tag = "query_a.port";
            this.gv_port.Visible = true;
            this.gv_port.VisibleIndex = 2;
            this.gv_port.Width = 94;
            //
            // lb_ip
            //
            this.lb_ip.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_ip.Appearance.Options.UseFont = true;
            this.lb_ip.Location = new System.Drawing.Point(38, 54);
            this.lb_ip.Name = "lb_ip";
            this.lb_ip.Size = new System.Drawing.Size(72, 21);
            this.lb_ip.TabIndex = 213;
            this.lb_ip.Text = "打印机IP:";
            //
            // txt_ip
            //
            this.txt_ip.Location = new System.Drawing.Point(117, 50);
            this.txt_ip.Name = "txt_ip";
            this.txt_ip.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_ip.Properties.Appearance.Options.UseFont = true;
            this.txt_ip.Size = new System.Drawing.Size(178, 28);
            this.txt_ip.TabIndex = 213;
            //
            // gv_ip
            //
            this.gv_ip.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ip.AppearanceCell.Options.UseFont = true;
            this.gv_ip.Caption = "打印机IP ";
            this.gv_ip.FieldName = "ip";
            this.gv_ip.MinWidth = 150;
            this.gv_ip.Name = "gv_ip";
            this.gv_ip.OptionsColumn.AllowEdit = false;
            this.gv_ip.Tag = "query_a.ip";
            this.gv_ip.Visible = true;
            this.gv_ip.VisibleIndex = 1;
            this.gv_ip.Width = 150;
            //
            // lb_printNo
            //
            this.lb_printNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_printNo.Appearance.Options.UseFont = true;
            this.lb_printNo.Location = new System.Drawing.Point(19, 20);
            this.lb_printNo.Name = "lb_printNo";
            this.lb_printNo.Size = new System.Drawing.Size(91, 21);
            this.lb_printNo.TabIndex = 211;
            this.lb_printNo.Text = "打印机编号:";
            //
            // txt_printNo
            //
            this.txt_printNo.Location = new System.Drawing.Point(117, 16);
            this.txt_printNo.Name = "txt_printNo";
            this.txt_printNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_printNo.Properties.Appearance.Options.UseFont = true;
            this.txt_printNo.Size = new System.Drawing.Size(178, 28);
            this.txt_printNo.TabIndex = 211;
            //
            // gv_printNo
            //
            this.gv_printNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_printNo.AppearanceCell.Options.UseFont = true;
            this.gv_printNo.Caption = "打印机编号 ";
            this.gv_printNo.FieldName = "printNo";
            this.gv_printNo.MinWidth = 100;
            this.gv_printNo.Name = "gv_printNo";
            this.gv_printNo.OptionsColumn.AllowEdit = false;
            this.gv_printNo.Tag = "query_a.print_no";
            this.gv_printNo.Visible = true;
            this.gv_printNo.VisibleIndex = 0;
            this.gv_printNo.Width = 100;
            // 
            // 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;
@@ -213,34 +105,6 @@
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            //
            // gcMain
            //
            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(1126, 531);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_printNo,
            this.gv_ip,
            this.gv_port,
            this.gv_remark});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // xtraTabControl1
            // 
@@ -256,68 +120,308 @@
            // 
            // xtraTabPage1
            // 
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage1.Text = "数据查询";
            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.Panel1
            //
            this.split1.Panel1.Controls.Add(this.gcMain1);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            //
            // split1.Panel2
            //
            this.split1.Panel2.Text = "Panel2";
            this.split1.Size = new System.Drawing.Size(1126, 570);
            this.split1.SplitterPosition = 558;
            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(1126, 519);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_printNo,
            this.gv_ip,
            this.gv_port,
            this.gv_remark});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_printNo
            //
            this.gv_printNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_printNo.AppearanceCell.Options.UseFont = true;
            this.gv_printNo.Caption = "打印机编号 ";
            this.gv_printNo.FieldName = "printNo";
            this.gv_printNo.MinWidth = 100;
            this.gv_printNo.Name = "gv_printNo";
            this.gv_printNo.OptionsColumn.AllowEdit = false;
            this.gv_printNo.Tag = "query_a.print_no";
            this.gv_printNo.Visible = true;
            this.gv_printNo.VisibleIndex = 0;
            this.gv_printNo.Width = 100;
            //
            // gv_ip
            //
            this.gv_ip.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ip.AppearanceCell.Options.UseFont = true;
            this.gv_ip.Caption = "打印机IP ";
            this.gv_ip.FieldName = "ip";
            this.gv_ip.MinWidth = 150;
            this.gv_ip.Name = "gv_ip";
            this.gv_ip.OptionsColumn.AllowEdit = false;
            this.gv_ip.Tag = "query_a.ip";
            this.gv_ip.Visible = true;
            this.gv_ip.VisibleIndex = 1;
            this.gv_ip.Width = 150;
            //
            // gv_port
            //
            this.gv_port.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_port.AppearanceCell.Options.UseFont = true;
            this.gv_port.Caption = "打印机端口 ";
            this.gv_port.FieldName = "port";
            this.gv_port.MinWidth = 50;
            this.gv_port.Name = "gv_port";
            this.gv_port.OptionsColumn.AllowEdit = false;
            this.gv_port.Tag = "query_a.port";
            this.gv_port.Visible = true;
            this.gv_port.VisibleIndex = 2;
            this.gv_port.Width = 94;
            //
            // 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 = 100;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 3;
            this.gv_remark.Width = 100;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 531);
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            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(1126, 39);
            this.pageBar1.TabIndex = 3;
            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(1126, 570);
            this.xtraTabPage2.Text = "数据编辑";
            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_remark);
            this.panel1.Controls.Add(this.txt_remark);
            this.panel1.Controls.Add(this.lb_port);
            this.panel1.Controls.Add(this.txt_port);
            this.panel1.Controls.Add(this.lb_ip);
            this.panel1.Controls.Add(this.txt_ip);
            this.panel1.Controls.Add(this.lb_printNo);
            this.panel1.Controls.Add(this.txt_printNo);
            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(441, 208);
            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.Panel1
            // 
            this.labelControl11.Location = new System.Drawing.Point(334, 23);
            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.Panel2
            //
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
            this.splitMx1.SplitterPosition = 96;
            this.splitMx1.TabIndex = 0;
            // 
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(385, 23);
            this.lbGuid.Location = new System.Drawing.Point(564, 93);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.Size = new System.Drawing.Size(272, 78);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Text = "lbGuid";
            this.lbGuid.Visible = false;
            //
            // txt_remark
            //
            this.txt_remark.Location = new System.Drawing.Point(375, 50);
            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(185, 28);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 217;
            //
            // txt_port
            //
            this.txt_port.Location = new System.Drawing.Point(99, 50);
            this.txt_port.Name = "txt_port";
            this.txt_port.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_port.Properties.Appearance.Options.UseFont = true;
            this.txt_port.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
            this.txt_port.Properties.MaskSettings.Set("mask", "\\d+");
            this.txt_port.Size = new System.Drawing.Size(185, 28);
            this.txt_port.StyleController = this.layoutMx1;
            this.txt_port.TabIndex = 216;
            this.txt_port.Tag = "moren.9100";
            //
            // txt_ip
            //
            this.txt_ip.Location = new System.Drawing.Point(375, 12);
            this.txt_ip.Name = "txt_ip";
            this.txt_ip.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_ip.Properties.Appearance.Options.UseFont = true;
            this.txt_ip.Size = new System.Drawing.Size(185, 28);
            this.txt_ip.StyleController = this.layoutMx1;
            this.txt_ip.TabIndex = 213;
            //
            // txt_printNo
            //
            this.txt_printNo.Location = new System.Drawing.Point(99, 12);
            this.txt_printNo.Name = "txt_printNo";
            this.txt_printNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_printNo.Properties.Appearance.Options.UseFont = true;
            this.txt_printNo.Size = new System.Drawing.Size(185, 28);
            this.txt_printNo.StyleController = this.layoutMx1;
            this.txt_printNo.TabIndex = 211;
            //
            // layoutMx1
            //
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_printNo);
            this.layoutMx1.Controls.Add(this.txt_port);
            this.layoutMx1.Controls.Add(this.txt_ip);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem5});
            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(1126, 96);
            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.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2});
            this.Root.Size = new System.Drawing.Size(1126, 96);
            this.Root.TextVisible = false;
            //
            // layoutControlItem1
            //
            this.layoutControlItem1.Control = this.txt_printNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 38);
            this.layoutControlItem1.Text = "打印机编号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_ip;
            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 38);
            this.layoutControlItem2.Text = "打印机IP";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_port;
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 38);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 38);
            this.layoutControlItem3.Text = "打印机端口";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_remark;
            this.layoutControlItem4.Location = new System.Drawing.Point(276, 38);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 38);
            this.layoutControlItem4.Text = "备注";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.lbGuid;
            this.layoutControlItem5.Location = new System.Drawing.Point(552, 81);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 82);
            this.layoutControlItem5.Text = "主键Guid";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem5.TextVisible = false;
            // 
            // Frm_PrintInfo
            // 
@@ -328,48 +432,62 @@
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_PrintInfo";
            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_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_port.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ip.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_printNo.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.layoutControlItem5)).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 DevExpress.XtraEditors.SplitContainerControl split1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_printNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ip;
        private DevExpress.XtraGrid.Columns.GridColumn gv_port;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
        private UserControls.Data.UcPageBar pageBar1;
        private System.Windows.Forms.Panel panel1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.LabelControl labelControl11;
       //BQCreateConrolObejct
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
 private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraEditors.LabelControl lb_port;
private DevExpress.XtraEditors.TextEdit txt_port;
 private DevExpress.XtraGrid.Columns.GridColumn gv_port;
private DevExpress.XtraEditors.LabelControl lb_ip;
private DevExpress.XtraEditors.TextEdit txt_ip;
 private DevExpress.XtraGrid.Columns.GridColumn gv_ip;
private DevExpress.XtraEditors.LabelControl lb_printNo;
private DevExpress.XtraEditors.TextEdit txt_printNo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_printNo;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraEditors.TextEdit txt_port;
        private DevExpress.XtraEditors.TextEdit txt_ip;
        private DevExpress.XtraEditors.TextEdit txt_printNo;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
@@ -28,9 +28,7 @@
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.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);
@@ -178,7 +176,7 @@
            }
            else
            {
                UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
            }
        }
        /// <summary>
@@ -190,7 +188,7 @@
        {
            lbGuid.Text = "";
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            UtilityHelper.CleanValueByControl(panel1.Controls, true);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
        }
        /// <summary>
@@ -241,7 +239,7 @@
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
                }
            }
            catch (Exception ex)
@@ -269,15 +267,15 @@
                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();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
@@ -321,7 +319,7 @@
                {
                    dynamic dy = _rtn.rtnData;
                    lbGuid.Text = strGuid;
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
@@ -26,9 +26,7 @@
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.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);
DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs
@@ -20,10 +20,7 @@
            InitializeComponent();
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.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);
            getPageList(1, UtilityHelper.GetPageSize());
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
        }
@@ -34,22 +31,9 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
            Gs.DevApp.ToolBox.MsgHelper.ShowInformation("该窗体不支持查询,若想更新页面,请点击 刷新");
        }
        /// <summary>
        /// 查询回调
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        {
            _filterList = e.FilterList;
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
        /// 刷新事件
        /// </summary>
@@ -57,7 +41,8 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            getPageList(1, UtilityHelper.GetPageSize());
            _filterList.Clear();
            getPageList(1);
        }
        /// <summary>
@@ -65,10 +50,10 @@
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        private void getPageList(int curPage)
        {
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "a.idx", "asc", "", _sbSqlWhere.ToString());
            PageQueryModel pgq = new PageQueryModel(curPage, 999999, "a.idx", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -108,7 +93,7 @@
                frm.UpdateParent += (ss, ee) =>
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation("上传成功!");
                    getPageList(1, UtilityHelper.GetPageSize());
                    getPageList(1);
                };
                frm.ShowDialog();
            }
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -64,13 +64,13 @@
            this.txt_rtnJson = new DevExpress.XtraEditors.MemoEdit();
            this.txt_msg = new DevExpress.XtraEditors.MemoEdit();
            this.txt_sendJson = new DevExpress.XtraEditors.MemoEdit();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            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.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -100,13 +100,13 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_rtnJson.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sendJson.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((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.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            this.SuspendLayout();
@@ -115,6 +115,7 @@
            // 
            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;
@@ -388,6 +389,18 @@
            this.txt_sendJson.StyleController = this.layoutMx1;
            this.txt_sendJson.TabIndex = 12;
            // 
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.lbGuid;
            this.layoutControlItem8.Location = new System.Drawing.Point(828, 30);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem8.Text = "lbGuid";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
            //
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -487,18 +500,6 @@
            this.layoutControlItem5.Text = "操作详情";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.lbGuid;
            this.layoutControlItem8.Location = new System.Drawing.Point(828, 30);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem8.Text = "lbGuid";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
            //
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_sendJson;
@@ -559,13 +560,13 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_rtnJson.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sendJson.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((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.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            this.ResumeLayout(false);
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -8,7 +8,6 @@
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Gs.DevApp.DevFrm.Sys
{
@@ -38,7 +37,7 @@
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            await Task.Delay(100);
            getPageList(1);
        }
@@ -62,7 +61,7 @@
            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();
        }
DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -43,7 +43,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -68,7 +68,7 @@
            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();
        }
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1671,10 +1671,10 @@
            btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 距离顶部10像素
        }
        #region 设置搜索
        public static FilterEntity getFilterEntityWord(string id, string idDec, string val)
        public static FilterEntity getFilterEntityWord(string id, string idDec, string val, string type)
        {
            return new FilterEntity(id, idDec + ")", " like ", "包含)", "%" + val + "%");
            return new FilterEntity(id, idDec + ")", " like ", "包含)", "%" + val + "%", type);
        }
        public static List<FilterEntity> GetDilter(GridColumnCollection Columns, GridView gridView1 = null)
        {
@@ -1693,7 +1693,7 @@
                //  fiList.Add(new FilterEntity("b.FNumber", "使用组织", " like ", "包含", "%" + filter.Value + "%"));
                string[] ddd = filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "").Split(',');
                //Contains([fSubsidiary], '005')
                fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim()));
                fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim(), col.UnboundExpression));
            }
            return fiList;
        }
@@ -1718,8 +1718,18 @@
                    }
                }
                else
                    _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
                                      itm.fileValue + "'");
                {
                    switch (itm.fileType)
                    {
                        case "时间类型":
                            _sbSqlWhere.Append(" and CONVERT(nvarchar(30)," + itm.fileId+ ",23)"  + itm.fileOper + "'" + itm.fileValue + "'");
                            break;
                        default:
                            _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
                            break;
                    }
                }
            }
            return _sbSqlWhere.ToString();
        }
@@ -1775,7 +1785,7 @@
                    column.OptionsColumn.ReadOnly = true;
                if (column.Tag == null || column.Tag.ToString().Length <= 0)
                    column.OptionsFilter.AllowAutoFilter = false;
            }
            gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False;
            gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -2094,10 +2104,11 @@
        {
        }
        public CboItemEntity(string val, string text)
        public CboItemEntity(string val, string text,string fType="")
        {
            Text = text;
            Value = val;
            FType = fType;
        }
        /// <summary>
@@ -2109,6 +2120,8 @@
        ///     对象值
        /// </summary>
        public object Value { get; set; } = "";
        public object FType { get; set; } = "";
        public override string ToString()
        {
@@ -2130,13 +2143,14 @@
        /// <param name="operDec">操作符备注</param>
        /// <param name="val"></param>
        public FilterEntity(string id, string idDec, string oper,
            string operDec, string val)
            string operDec, string val, string type)
        {
            fileId = id;
            fileIdDec = idDec;
            fileOper = oper;
            fileOperDec = operDec;
            fileValue = val;
            fileType = type;
        }
        public string fileId { get; set; }
@@ -2148,5 +2162,7 @@
        public string fileOperDec { get; set; }
        public string fileValue { get; set; }
        public string fileType { get; set; }
    }
}
DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs
@@ -56,6 +56,7 @@
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
@@ -177,6 +178,7 @@
            this.gridColumn1,
            this.gridColumn2,
            this.gridColumn3,
            this.gridColumn8,
            this.gridColumn4});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.Name = "gridView1";
@@ -200,6 +202,7 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
            this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.repositoryItemComboBox1.SelectedValueChanged += new System.EventHandler(this.repositoryItemComboBox1_SelectedValueChanged);
            // 
            // gridColumn2
            // 
@@ -229,6 +232,14 @@
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 100;
            //
            // gridColumn8
            //
            this.gridColumn8.Caption = "字段类型";
            this.gridColumn8.FieldName = "fieldType";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Width = 94;
            // 
            // gridColumn4
            // 
@@ -601,5 +612,6 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3Sql;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
    }
}
DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -67,7 +67,7 @@
                    getPageListQuery();
            };
        }
        /// <summary>
        ///     查询集合
        /// </summary>
@@ -102,13 +102,15 @@
                    .GetRowCellValue(i, "fieldWhere").ToString());
                var _fieldValue = gridView1.GetRowCellValue(i, "fieldValue")
                    .ToString();
                var _fieldType = gridView1.GetRowCellValue(i, "fieldType")
                  .ToString();
                if (_fileWhere.Contains("like"))
                {
                    _fileWhere = " like ";
                    _fieldValue = "%" + _fieldValue + "%";
                }
                list.Add(new FilterEntity(_fieId, _fileIdDec, _fileWhere,
                    _fileWhereDec, _fieldValue));
                    _fileWhereDec, _fieldValue, _fieldType));
            }
            UpdateParent?.Invoke(this,
                new UpdateParentEventArgs { FilterList = list });
@@ -123,9 +125,10 @@
                if (col.Tag != null && !string.IsNullOrEmpty(col.Tag.ToString()))
                {
                    var item = new CboItemEntity();
                    item.Text = col.Tag.ToString() + "(" + col.Caption + ")";
                    item.Text = col.Tag.ToString() + "(" + col.Caption + ")";
                    //item.Value = col.FieldName;
                    item.Value = col.Tag.ToString();
                    item.FType = col.UnboundExpression;
                    repositoryItemComboBox1.Items.Add(item);
                }
@@ -138,7 +141,7 @@
            foreach (var kvp in d2)
            {
                var item = new CboItemEntity();
                item.Text = kvp.Key + "(" + kvp.Value + ")";
                item.Text = kvp.Key + "(" + kvp.Value + ")";
                item.Value = kvp.Key;
                repositoryItemComboBox2.Items.Add(item);
            }
@@ -147,13 +150,15 @@
                var dt = new DataTable();
                dt.Columns.Add("field", typeof(string));
                dt.Columns.Add("fieldWhere", typeof(string));
                dt.Columns.Add("fieldValue", typeof(string));
                dt.Columns.Add("fieldValue", typeof(string));
                dt.Columns.Add("fieldType", typeof(string));
                foreach (var _sql in FilterList)
                {
                    var dr = dt.NewRow();
                    dr["field"] = _sql.fileId + "(" + _sql.fileIdDec;
                    dr["fieldWhere"] = _sql.fileOper + "(" + _sql.fileOperDec;
                    dr["field"] = _sql.fileId + "(" + _sql.fileIdDec;
                    dr["fieldWhere"] = _sql.fileOper + "(" + _sql.fileOperDec;
                    dr["fieldValue"] = _sql.fileValue.Replace("%", "");
                    dr["fieldType"] = _sql.fileType;
                    dt.Rows.Add(dr);
                }
                gcMain.BindingContext = new BindingContext();
@@ -168,7 +173,7 @@
        private (string, string) _getFiled(string _field)
        {
            return (_field.Split('(')[0], _field.Split('(')[1]);
            return (_field.Split('(')[0], _field.Split('(')[1]);
        }
        private void BtnEsc_Click(object sender, EventArgs e)
@@ -193,10 +198,25 @@
            {
                e.Value = e.Value.ToString();
                e.Handled = true;
            }
        }
        private void repositoryItemComboBox1_SelectedValueChanged(object sender, EventArgs e)
        {
            ComboBoxEdit comboBox = sender as ComboBoxEdit;
            if (comboBox != null)
            {
                CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
                string dddd = _itm.Value.ToString();
                string ccc = _itm.Text.ToString();
                string yyy = _itm.FType.ToString();
                GridView myView = (gcMain.MainView as GridView);
                int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
                myView.CloseEditor();
                myView.UpdateCurrentRow();
                myView.SetRowCellValue(dataIndex, "fieldType", yyy);
            }
        }
        /// <summary>
        /// 移出一行
@@ -468,8 +488,7 @@
                }
            }
        }
        #endregion
    }
}
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1239,11 +1239,13 @@
                            {
                                string _gvColName = a["gvColName"].ToString();
                                string _sqlField = a["sqlField"].ToString();
                                string _sqlFieldType = a["sqlFieldType"].ToString();
                                var column = gv1.Columns.Cast<DevExpress.XtraGrid.Columns.GridColumn>()
                                                .FirstOrDefault(c => c.Name == _gvColName);
                                if (column != null)
                                {
                                    column.Tag = _sqlField;
                                    column.UnboundExpression = _sqlFieldType;
                                }
                            }
                        }