lg
2024-09-15 0690da14b9781dbcc509f9c07652a0a15dc1d729
基础资料
已修改14个文件
已删除1个文件
1858 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/BasicData/FrmCustomer.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmCustomer.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmDictionary.Designer.cs 683 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmDictionary.cs 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmItemType.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmItemType.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmPosition.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmPosition.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmStaff.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmStaff.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 83 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources1.Designer.cs 913 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmCustomer.Designer.cs
@@ -670,6 +670,7 @@
            this.gv_saleGuid,
            this.gv_isStatus});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmCustomer.cs
@@ -22,8 +22,16 @@
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            gridView1.CustomDrawRowIndicator += GridView1_CustomDrawRowIndicator;
            getPageList(1, UtilityHelper.GetPageSize());
        }
        private void GridView1_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e)
        {
            if (e.Info.IsRowIndicator && e.RowHandle >= 0)
            {
                e.Info.DisplayText = (e.RowHandle + 1).ToString();
            }
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            //// èŽ·å–GridView组件
DevApp/Gs.DevApp/DevFrm/BasicData/FrmDictionary.Designer.cs
@@ -5,6 +5,8 @@
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
@@ -31,338 +33,29 @@
        /// </summary>
        private void InitializeComponent()
        {
            //BQSetControlObject
            this.lb_lastUpdateTime = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
            this.gv_lastUpdateTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastUpdateBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastUpdateBy = new DevExpress.XtraEditors.TextEdit();
            this.gv_lastUpdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_createTime = new DevExpress.XtraEditors.LabelControl();
            this.txt_createTime = new DevExpress.XtraEditors.TextEdit();
            this.gv_createTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_isStatus = new DevExpress.XtraEditors.LabelControl();
            this.txt_isStatus = new DevExpress.XtraEditors.TextEdit();
            this.gv_isStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_category = new DevExpress.XtraEditors.LabelControl();
            this.txt_category = new DevExpress.XtraEditors.TextEdit();
            this.gv_category = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_name = new DevExpress.XtraEditors.LabelControl();
            this.txt_name = new DevExpress.XtraEditors.TextEdit();
            this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_guid = new DevExpress.XtraEditors.LabelControl();
            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            //BQSetControlInfo
            //
            //lb_lastUpdateTime
            //
            this.lb_lastUpdateTime.Location = new System.Drawing.Point(270, 84);
            this.lb_lastUpdateTime.Name = "lb_lastUpdateTime";
            this.lb_lastUpdateTime.Size = new System.Drawing.Size(150, 21);
            this.lb_lastUpdateTime.TabIndex = 231;
            this.lb_lastUpdateTime.Tag = "lastUpdateTime";
            this.lb_lastUpdateTime.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastUpdateTime.Text = "更新时间:";
            //
            //txt_lastUpdateTime
            //
            this.txt_lastUpdateTime.Location = new System.Drawing.Point(330, 84);
            this.txt_lastUpdateTime.Name = "lb_lastUpdateTime";
            this.txt_lastUpdateTime.Size = new System.Drawing.Size(150, 21);
            this.txt_lastUpdateTime.TabIndex = 231;
            this.txt_lastUpdateTime.Tag = "lastUpdateTime";
            this.txt_lastUpdateTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastUpdateTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
            this.gv_lastUpdateTime.Caption = "更新时间";
            this.gv_lastUpdateTime.MinWidth = 25;
            this.gv_lastUpdateTime.Visible = true;
            this.gv_lastUpdateTime.Width = 94;
            this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateTime.VisibleIndex = 0;
            //
            //lb_lastUpdateBy
            //
            this.lb_lastUpdateBy.Location = new System.Drawing.Point(20, 84);
            this.lb_lastUpdateBy.Name = "lb_lastUpdateBy";
            this.lb_lastUpdateBy.Size = new System.Drawing.Size(150, 21);
            this.lb_lastUpdateBy.TabIndex = 228;
            this.lb_lastUpdateBy.Tag = "lastUpdateBy";
            this.lb_lastUpdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastUpdateBy.Text = "更新者:";
            //
            //txt_lastUpdateBy
            //
            this.txt_lastUpdateBy.Location = new System.Drawing.Point(80, 84);
            this.txt_lastUpdateBy.Name = "lb_lastUpdateBy";
            this.txt_lastUpdateBy.Size = new System.Drawing.Size(150, 21);
            this.txt_lastUpdateBy.TabIndex = 228;
            this.txt_lastUpdateBy.Tag = "lastUpdateBy";
            this.txt_lastUpdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastUpdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastUpdateBy.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateBy.FieldName = "lastUpdateBy";
            this.gv_lastUpdateBy.Caption = "更新者";
            this.gv_lastUpdateBy.MinWidth = 25;
            this.gv_lastUpdateBy.Visible = true;
            this.gv_lastUpdateBy.Width = 94;
            this.gv_lastUpdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateBy.VisibleIndex = 0;
            //
            //lb_remark
            //
            this.lb_remark.Location = new System.Drawing.Point(770, 52);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(150, 21);
            this.lb_remark.TabIndex = 226;
            this.lb_remark.Tag = "remark";
            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark.Text = "备注:";
            //
            //txt_remark
            //
            this.txt_remark.Location = new System.Drawing.Point(830, 52);
            this.txt_remark.Name = "lb_remark";
            this.txt_remark.Size = new System.Drawing.Size(150, 21);
            this.txt_remark.TabIndex = 226;
            this.txt_remark.Tag = "remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.FieldName = "remark";
            this.gv_remark.Caption = "备注";
            this.gv_remark.MinWidth = 25;
            this.gv_remark.Visible = true;
            this.gv_remark.Width = 94;
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.VisibleIndex = 0;
            //
            //lb_createTime
            //
            this.lb_createTime.Location = new System.Drawing.Point(520, 52);
            this.lb_createTime.Name = "lb_createTime";
            this.lb_createTime.Size = new System.Drawing.Size(150, 21);
            this.lb_createTime.TabIndex = 222;
            this.lb_createTime.Tag = "createTime";
            this.lb_createTime.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createTime.Text = "建立时间:";
            //
            //txt_createTime
            //
            this.txt_createTime.Location = new System.Drawing.Point(580, 52);
            this.txt_createTime.Name = "lb_createTime";
            this.txt_createTime.Size = new System.Drawing.Size(150, 21);
            this.txt_createTime.TabIndex = 222;
            this.txt_createTime.Tag = "createTime";
            this.txt_createTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createTime.AppearanceCell.Options.UseFont = true;
            this.gv_createTime.FieldName = "createTime";
            this.gv_createTime.Caption = "建立时间";
            this.gv_createTime.MinWidth = 25;
            this.gv_createTime.Visible = true;
            this.gv_createTime.Width = 94;
            this.gv_createTime.OptionsColumn.AllowEdit = false;
            this.gv_createTime.VisibleIndex = 0;
            //
            //lb_createBy
            //
            this.lb_createBy.Location = new System.Drawing.Point(270, 52);
            this.lb_createBy.Name = "lb_createBy";
            this.lb_createBy.Size = new System.Drawing.Size(150, 21);
            this.lb_createBy.TabIndex = 219;
            this.lb_createBy.Tag = "createBy";
            this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createBy.Text = "建立者:";
            //
            //txt_createBy
            //
            this.txt_createBy.Location = new System.Drawing.Point(330, 52);
            this.txt_createBy.Name = "lb_createBy";
            this.txt_createBy.Size = new System.Drawing.Size(150, 21);
            this.txt_createBy.TabIndex = 219;
            this.txt_createBy.Tag = "createBy";
            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.FieldName = "createBy";
            this.gv_createBy.Caption = "建立者";
            this.gv_createBy.MinWidth = 25;
            this.gv_createBy.Visible = true;
            this.gv_createBy.Width = 94;
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.VisibleIndex = 0;
            //
            //lb_isStatus
            //
            this.lb_isStatus.Location = new System.Drawing.Point(20, 52);
            this.lb_isStatus.Name = "lb_isStatus";
            this.lb_isStatus.Size = new System.Drawing.Size(150, 21);
            this.lb_isStatus.TabIndex = 217;
            this.lb_isStatus.Tag = "isStatus";
            this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_isStatus.Text = "状态:";
            //
            //txt_isStatus
            //
            this.txt_isStatus.Location = new System.Drawing.Point(80, 52);
            this.txt_isStatus.Name = "lb_isStatus";
            this.txt_isStatus.Size = new System.Drawing.Size(150, 21);
            this.txt_isStatus.TabIndex = 217;
            this.txt_isStatus.Tag = "isStatus";
            this.txt_isStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isStatus.AppearanceCell.Options.UseFont = true;
            this.gv_isStatus.FieldName = "isStatus";
            this.gv_isStatus.Caption = "状态";
            this.gv_isStatus.MinWidth = 25;
            this.gv_isStatus.Visible = true;
            this.gv_isStatus.Width = 94;
            this.gv_isStatus.OptionsColumn.AllowEdit = false;
            this.gv_isStatus.VisibleIndex = 0;
            //
            //lb_category
            //
            this.lb_category.Location = new System.Drawing.Point(770, 20);
            this.lb_category.Name = "lb_category";
            this.lb_category.Size = new System.Drawing.Size(150, 21);
            this.lb_category.TabIndex = 216;
            this.lb_category.Tag = "category";
            this.lb_category.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_category.Text = "类别:";
            //
            //txt_category
            //
            this.txt_category.Location = new System.Drawing.Point(830, 20);
            this.txt_category.Name = "lb_category";
            this.txt_category.Size = new System.Drawing.Size(150, 21);
            this.txt_category.TabIndex = 216;
            this.txt_category.Tag = "category";
            this.txt_category.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_category.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_category.AppearanceCell.Options.UseFont = true;
            this.gv_category.FieldName = "category";
            this.gv_category.Caption = "类别";
            this.gv_category.MinWidth = 25;
            this.gv_category.Visible = true;
            this.gv_category.Width = 94;
            this.gv_category.OptionsColumn.AllowEdit = false;
            this.gv_category.VisibleIndex = 0;
            //
            //lb_name
            //
            this.lb_name.Location = new System.Drawing.Point(520, 20);
            this.lb_name.Name = "lb_name";
            this.lb_name.Size = new System.Drawing.Size(150, 21);
            this.lb_name.TabIndex = 213;
            this.lb_name.Tag = "name";
            this.lb_name.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_name.Text = "名称:";
            //
            //txt_name
            //
            this.txt_name.Location = new System.Drawing.Point(580, 20);
            this.txt_name.Name = "lb_name";
            this.txt_name.Size = new System.Drawing.Size(150, 21);
            this.txt_name.TabIndex = 213;
            this.txt_name.Tag = "name";
            this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_name.AppearanceCell.Options.UseFont = true;
            this.gv_name.FieldName = "name";
            this.gv_name.Caption = "名称";
            this.gv_name.MinWidth = 25;
            this.gv_name.Visible = true;
            this.gv_name.Width = 94;
            this.gv_name.OptionsColumn.AllowEdit = false;
            this.gv_name.VisibleIndex = 0;
            //
            //lb_itemNo
            //
            this.lb_itemNo.Location = new System.Drawing.Point(270, 20);
            this.lb_itemNo.Name = "lb_itemNo";
            this.lb_itemNo.Size = new System.Drawing.Size(150, 21);
            this.lb_itemNo.TabIndex = 211;
            this.lb_itemNo.Tag = "itemNo";
            this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemNo.Text = "编号:";
            //
            //txt_itemNo
            //
            this.txt_itemNo.Location = new System.Drawing.Point(330, 20);
            this.txt_itemNo.Name = "lb_itemNo";
            this.txt_itemNo.Size = new System.Drawing.Size(150, 21);
            this.txt_itemNo.TabIndex = 211;
            this.txt_itemNo.Tag = "itemNo";
            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
            this.gv_itemNo.FieldName = "itemNo";
            this.gv_itemNo.Caption = "编号";
            this.gv_itemNo.MinWidth = 25;
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.Width = 94;
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.VisibleIndex = 0;
            //
            //lb_guid
            //
            this.lb_guid.Location = new System.Drawing.Point(20, 20);
            this.lb_guid.Name = "lb_guid";
            this.lb_guid.Size = new System.Drawing.Size(150, 21);
            this.lb_guid.TabIndex = 210;
            this.lb_guid.Tag = "guid";
            this.lb_guid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_guid.Text = "guid:";
            //
            //txt_guid
            //
            this.txt_guid.Location = new System.Drawing.Point(80, 20);
            this.txt_guid.Name = "lb_guid";
            this.txt_guid.Size = new System.Drawing.Size(150, 21);
            this.txt_guid.TabIndex = 210;
            this.txt_guid.Tag = "guid";
            this.txt_guid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.FieldName = "guid";
            this.gv_guid.Caption = "guid";
            this.gv_guid.MinWidth = 25;
            this.gv_guid.Visible = true;
            this.gv_guid.Width = 94;
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.VisibleIndex = 0;
            this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -373,6 +66,13 @@
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createTime.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_category.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -382,13 +82,277 @@
            this.panel1.SuspendLayout();
            this.SuspendLayout();
            // 
            // gv_lastUpdateTime
            //
            this.gv_lastUpdateTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateTime.Caption = "更新时间";
            this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
            this.gv_lastUpdateTime.MinWidth = 25;
            this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
            this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateTime.Visible = true;
            this.gv_lastUpdateTime.VisibleIndex = 8;
            this.gv_lastUpdateTime.Width = 94;
            //
            // gv_lastUpdateBy
            //
            this.gv_lastUpdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastUpdateBy.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateBy.Caption = "更新者";
            this.gv_lastUpdateBy.FieldName = "lastUpdateBy";
            this.gv_lastUpdateBy.MinWidth = 25;
            this.gv_lastUpdateBy.Name = "gv_lastUpdateBy";
            this.gv_lastUpdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateBy.Visible = true;
            this.gv_lastUpdateBy.VisibleIndex = 7;
            this.gv_lastUpdateBy.Width = 94;
            //
            // 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(20, 154);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(51, 21);
            this.lb_remark.TabIndex = 228;
            this.lb_remark.Tag = "remark";
            this.lb_remark.Text = "备注:";
            //
            // txt_remark
            //
            this.txt_remark.Location = new System.Drawing.Point(80, 150);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(150, 28);
            this.txt_remark.TabIndex = 228;
            this.txt_remark.Tag = "remark";
            //
            // 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 = 25;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 6;
            this.gv_remark.Width = 94;
            //
            // lb_createTime
            //
            this.lb_createTime.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createTime.Appearance.Options.UseFont = true;
            this.lb_createTime.Location = new System.Drawing.Point(291, 64);
            this.lb_createTime.Name = "lb_createTime";
            this.lb_createTime.Size = new System.Drawing.Size(85, 21);
            this.lb_createTime.TabIndex = 226;
            this.lb_createTime.Tag = "createTime";
            this.lb_createTime.Text = "建立时间:";
            //
            // txt_createTime
            //
            this.txt_createTime.Location = new System.Drawing.Point(388, 60);
            this.txt_createTime.Name = "txt_createTime";
            this.txt_createTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createTime.Properties.Appearance.Options.UseFont = true;
            this.txt_createTime.Size = new System.Drawing.Size(150, 28);
            this.txt_createTime.TabIndex = 226;
            this.txt_createTime.Tag = "createTime";
            //
            // gv_createTime
            //
            this.gv_createTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createTime.AppearanceCell.Options.UseFont = true;
            this.gv_createTime.Caption = "建立时间";
            this.gv_createTime.FieldName = "createTime";
            this.gv_createTime.MinWidth = 25;
            this.gv_createTime.Name = "gv_createTime";
            this.gv_createTime.OptionsColumn.AllowEdit = false;
            this.gv_createTime.Visible = true;
            this.gv_createTime.VisibleIndex = 5;
            this.gv_createTime.Width = 94;
            //
            // lb_createBy
            //
            this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createBy.Appearance.Options.UseFont = true;
            this.lb_createBy.Location = new System.Drawing.Point(308, 18);
            this.lb_createBy.Name = "lb_createBy";
            this.lb_createBy.Size = new System.Drawing.Size(68, 21);
            this.lb_createBy.TabIndex = 222;
            this.lb_createBy.Tag = "createBy";
            this.lb_createBy.Text = "建立者:";
            //
            // txt_createBy
            //
            this.txt_createBy.Location = new System.Drawing.Point(388, 14);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
            this.txt_createBy.Size = new System.Drawing.Size(150, 28);
            this.txt_createBy.TabIndex = 222;
            this.txt_createBy.Tag = "createBy";
            //
            // gv_createBy
            //
            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "建立者";
            this.gv_createBy.FieldName = "createBy";
            this.gv_createBy.MinWidth = 25;
            this.gv_createBy.Name = "gv_createBy";
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 4;
            this.gv_createBy.Width = 94;
            //
            // lb_isStatus
            //
            this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_isStatus.Appearance.Options.UseFont = true;
            this.lb_isStatus.Location = new System.Drawing.Point(325, 154);
            this.lb_isStatus.Name = "lb_isStatus";
            this.lb_isStatus.Size = new System.Drawing.Size(51, 21);
            this.lb_isStatus.TabIndex = 219;
            this.lb_isStatus.Tag = "isStatus";
            this.lb_isStatus.Text = "状态:";
            //
            // txt_isStatus
            //
            this.txt_isStatus.Location = new System.Drawing.Point(388, 150);
            this.txt_isStatus.Name = "txt_isStatus";
            this.txt_isStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_isStatus.Properties.Appearance.Options.UseFont = true;
            this.txt_isStatus.Size = new System.Drawing.Size(150, 28);
            this.txt_isStatus.TabIndex = 219;
            this.txt_isStatus.Tag = "isStatus";
            //
            // gv_isStatus
            //
            this.gv_isStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isStatus.AppearanceCell.Options.UseFont = true;
            this.gv_isStatus.Caption = "状态";
            this.gv_isStatus.FieldName = "isStatusTxt";
            this.gv_isStatus.MinWidth = 25;
            this.gv_isStatus.Name = "gv_isStatus";
            this.gv_isStatus.OptionsColumn.AllowEdit = false;
            this.gv_isStatus.Visible = true;
            this.gv_isStatus.VisibleIndex = 3;
            this.gv_isStatus.Width = 94;
            //
            // lb_category
            //
            this.lb_category.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_category.Appearance.Options.UseFont = true;
            this.lb_category.Location = new System.Drawing.Point(20, 111);
            this.lb_category.Name = "lb_category";
            this.lb_category.Size = new System.Drawing.Size(51, 21);
            this.lb_category.TabIndex = 217;
            this.lb_category.Tag = "category";
            this.lb_category.Text = "类别:";
            //
            // txt_category
            //
            this.txt_category.Location = new System.Drawing.Point(80, 107);
            this.txt_category.Name = "txt_category";
            this.txt_category.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_category.Properties.Appearance.Options.UseFont = true;
            this.txt_category.Size = new System.Drawing.Size(150, 28);
            this.txt_category.TabIndex = 217;
            this.txt_category.Tag = "category";
            //
            // gv_category
            //
            this.gv_category.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_category.AppearanceCell.Options.UseFont = true;
            this.gv_category.Caption = "类别";
            this.gv_category.FieldName = "category";
            this.gv_category.MinWidth = 25;
            this.gv_category.Name = "gv_category";
            this.gv_category.OptionsColumn.AllowEdit = false;
            this.gv_category.Visible = true;
            this.gv_category.VisibleIndex = 2;
            this.gv_category.Width = 94;
            //
            // lb_name
            //
            this.lb_name.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_name.Appearance.Options.UseFont = true;
            this.lb_name.Location = new System.Drawing.Point(20, 64);
            this.lb_name.Name = "lb_name";
            this.lb_name.Size = new System.Drawing.Size(51, 21);
            this.lb_name.TabIndex = 216;
            this.lb_name.Tag = "name";
            this.lb_name.Text = "名称:";
            //
            // txt_name
            //
            this.txt_name.Location = new System.Drawing.Point(80, 60);
            this.txt_name.Name = "txt_name";
            this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_name.Properties.Appearance.Options.UseFont = true;
            this.txt_name.Size = new System.Drawing.Size(150, 28);
            this.txt_name.TabIndex = 216;
            this.txt_name.Tag = "name";
            //
            // gv_name
            //
            this.gv_name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_name.AppearanceCell.Options.UseFont = true;
            this.gv_name.Caption = "名称";
            this.gv_name.FieldName = "name";
            this.gv_name.MinWidth = 25;
            this.gv_name.Name = "gv_name";
            this.gv_name.OptionsColumn.AllowEdit = false;
            this.gv_name.Visible = true;
            this.gv_name.VisibleIndex = 1;
            this.gv_name.Width = 94;
            //
            // lb_itemNo
            //
            this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemNo.Appearance.Options.UseFont = true;
            this.lb_itemNo.Location = new System.Drawing.Point(20, 18);
            this.lb_itemNo.Name = "lb_itemNo";
            this.lb_itemNo.Size = new System.Drawing.Size(51, 21);
            this.lb_itemNo.TabIndex = 213;
            this.lb_itemNo.Tag = "itemNo";
            this.lb_itemNo.Text = "编号:";
            //
            // txt_itemNo
            //
            this.txt_itemNo.Location = new System.Drawing.Point(80, 14);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
            this.txt_itemNo.TabIndex = 213;
            this.txt_itemNo.Tag = "itemNo";
            //
            // gv_itemNo
            //
            this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
            this.gv_itemNo.Caption = "编号";
            this.gv_itemNo.FieldName = "itemNo";
            this.gv_itemNo.MinWidth = 25;
            this.gv_itemNo.Name = "gv_itemNo";
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.VisibleIndex = 0;
            this.gv_itemNo.Width = 94;
            //
            // toolBarMenu1
            // 
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.Size = new System.Drawing.Size(818, 80);
            this.toolBarMenu1.TabIndex = 0;
            // 
            // gcMain
@@ -398,7 +362,7 @@
            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.Size = new System.Drawing.Size(816, 422);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -408,9 +372,18 @@
            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_guid,this.gv_itemNo,this.gv_name,this.gv_category,this.gv_isStatus,this.gv_createBy,this.gv_createTime,this.gv_remark,this.gv_lastUpdateBy,this.gv_lastUpdateTime});
            this.gv_itemNo,
            this.gv_name,
            this.gv_category,
            this.gv_isStatus,
            this.gv_createBy,
            this.gv_createTime,
            this.gv_remark,
            this.gv_lastUpdateBy,
            this.gv_lastUpdateTime});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.Name = "gridView1";
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
@@ -421,7 +394,7 @@
            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.Size = new System.Drawing.Size(818, 493);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
@@ -432,19 +405,19 @@
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage1.Size = new System.Drawing.Size(816, 461);
            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, 422);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.RowsCount = 50;
            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
            this.pageBar1.Size = new System.Drawing.Size(816, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            // 
@@ -453,7 +426,7 @@
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.PageEnabled = false;
            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage2.Size = new System.Drawing.Size(816, 461);
            this.xtraTabPage2.Text = "数据编辑";
            // 
            // panel1
@@ -461,15 +434,29 @@
            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_createTime);
            this.panel1.Controls.Add(this.txt_createTime);
            this.panel1.Controls.Add(this.lb_createBy);
            this.panel1.Controls.Add(this.txt_createBy);
            this.panel1.Controls.Add(this.lb_isStatus);
            this.panel1.Controls.Add(this.txt_isStatus);
            this.panel1.Controls.Add(this.lb_category);
            this.panel1.Controls.Add(this.txt_category);
            this.panel1.Controls.Add(this.lb_name);
            this.panel1.Controls.Add(this.txt_name);
            this.panel1.Controls.Add(this.lb_itemNo);
            this.panel1.Controls.Add(this.txt_itemNo);
            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(585, 426);
            this.panel1.Size = new System.Drawing.Size(615, 384);
            this.panel1.TabIndex = 1;
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(61, 388);
            this.labelControl11.Location = new System.Drawing.Point(61, 334);
            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);
@@ -479,51 +466,26 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(112, 388);
            this.lbGuid.Location = new System.Drawing.Point(112, 334);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            // 
            // category1
            // FrmItemType
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1128, 682);
            this.ClientSize = new System.Drawing.Size(818, 573);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            //BQAddControltoMContainer
            this.panel1.Controls.Add(this.lb_lastUpdateTime);
            this.panel1.Controls.Add(this.txt_lastUpdateTime);
            this.panel1.Controls.Add(this.lb_lastUpdateBy);
            this.panel1.Controls.Add(this.txt_lastUpdateBy);
            this.panel1.Controls.Add(this.lb_remark);
            this.panel1.Controls.Add(this.txt_remark);
            this.panel1.Controls.Add(this.lb_createTime);
            this.panel1.Controls.Add(this.txt_createTime);
            this.panel1.Controls.Add(this.lb_createBy);
            this.panel1.Controls.Add(this.txt_createBy);
            this.panel1.Controls.Add(this.lb_isStatus);
            this.panel1.Controls.Add(this.txt_isStatus);
            this.panel1.Controls.Add(this.lb_category);
            this.panel1.Controls.Add(this.txt_category);
            this.panel1.Controls.Add(this.lb_name);
            this.panel1.Controls.Add(this.txt_name);
            this.panel1.Controls.Add(this.lb_itemNo);
            this.panel1.Controls.Add(this.txt_itemNo);
            this.panel1.Controls.Add(this.lb_guid);
            this.panel1.Controls.Add(this.txt_guid);
            this.Name = "category1";
            this.Text = "";
            this.Name = "FrmItemType";
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createTime.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_category.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -533,6 +495,7 @@
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            this.ResumeLayout(false);
        }
        #endregion
        private UserControl.ToolBarMenu toolBarMenu1;
@@ -545,13 +508,7 @@
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.LabelControl labelControl11;
        //BQCreateConrolObejct
        private DevExpress.XtraEditors.LabelControl lb_lastUpdateTime;
        private DevExpress.XtraEditors.TextEdit txt_lastUpdateTime;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime;
        private DevExpress.XtraEditors.LabelControl lb_lastUpdateBy;
        private DevExpress.XtraEditors.TextEdit txt_lastUpdateBy;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateBy;
        private DevExpress.XtraEditors.LabelControl lb_remark;
@@ -581,10 +538,6 @@
        private DevExpress.XtraEditors.LabelControl lb_itemNo;
        private DevExpress.XtraEditors.TextEdit txt_itemNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
        private DevExpress.XtraEditors.LabelControl lb_guid;
        private DevExpress.XtraEditors.TextEdit txt_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/FrmDictionary.cs
@@ -17,17 +17,20 @@
        public FrmDictionary()
        {
            InitializeComponent();
            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            gridView1.CustomDrawRowIndicator += GridView1_CustomDrawRowIndicator;
            getPageList(1, UtilityHelper.GetPageSize());
        }
        private void GridView1_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e)
        {
            if (e.Info.IsRowIndicator && e.RowHandle >= 0)
            {
                e.Info.DisplayText = (e.RowHandle + 1).ToString();
            }
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -94,51 +97,6 @@
        }
        /// <summary>
        /// å–消事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
        }
        /// <summary>
        /// åˆ é™¤äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + dr["userName"].ToString() + "】,确定删除吗?"))
                return;
            var _obj = new
            {
                guidList = dr["guid"].ToString(),//主建
            };
            string strJson = "";
            try
            {
                strJson = UtilityHelper.HttpPost("", "User/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.ChangeTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// åˆ·æ–°äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
@@ -149,68 +107,13 @@
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
        /// ä¿®æ”¹äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            getModel(dr["guid"].ToString(), true, 1);
        }
        /// <summary>
        /// æ–°å¢žäº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 1);
            lbGuid.Text = "";
            UtilityHelper.CleanValue(this.panel1.Controls, true);
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            var _obj = new
            {
                guid = lbGuid.Text.Trim(),//主建
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", "User/EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnable(this.panel1.Controls, false);
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// 
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        {
            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "createTime", "asc", "", "");
            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "createTime", "asc", "", " and a.[category]='单位信息'");
            string json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -264,4 +167,3 @@
        }
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/FrmItemType.Designer.cs
@@ -380,6 +380,7 @@
            this.gv_lastUpdateTime});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.Name = "gridView1";
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmItemType.cs
@@ -19,8 +19,16 @@
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            gridView1.CustomDrawRowIndicator += GridView1_CustomDrawRowIndicator;
            getPageList(1, UtilityHelper.GetPageSize());
        }
        private void GridView1_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e)
        {
            if (e.Info.IsRowIndicator && e.RowHandle >= 0)
            {
                e.Info.DisplayText = (e.RowHandle + 1).ToString();
            }
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            //// èŽ·å–GridView组件
DevApp/Gs.DevApp/DevFrm/BasicData/FrmPosition.Designer.cs
@@ -232,6 +232,7 @@
            this.gv_lastUpdateBy,
            this.gv_lastUpdateTime});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmPosition.cs
@@ -21,8 +21,16 @@
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            gridView1.CustomDrawRowIndicator += GridView1_CustomDrawRowIndicator;
            getPageList(1, UtilityHelper.GetPageSize());
        }
        private void GridView1_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e)
        {
            if (e.Info.IsRowIndicator && e.RowHandle >= 0)
            {
                e.Info.DisplayText = (e.RowHandle + 1).ToString();
            }
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            //// èŽ·å–GridView组件
DevApp/Gs.DevApp/DevFrm/BasicData/FrmStaff.Designer.cs
@@ -541,6 +541,7 @@
          this.gv_guid,this.gv_itemNo,this.gv_staffName,this.gv_departmentGuid,this.gv_positionCode,this.gv_phoneNumber,this.gv_createBy,this.gv_createTime,this.gv_lastUpdateTtime,this.gv_lastUpdateBy,this.gv_startTime,this.gv_remark,this.gv_isStatus,this.gv_lineNumber});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.Name = "gridView1";
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmStaff.cs
@@ -26,9 +26,17 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            gridView1.CustomDrawRowIndicator += GridView1_CustomDrawRowIndicator;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            getPageList(1, UtilityHelper.GetPageSize());
        }
        private void GridView1_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e)
        {
            if (e.Info.IsRowIndicator && e.RowHandle >= 0)
            {
                e.Info.DisplayText = (e.RowHandle + 1).ToString();
            }
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            //// èŽ·å–GridView组件
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -215,6 +215,7 @@
            this.Controls.Add(this.panel1);
            this.DoubleBuffered = true;
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
            this.Name = "FrmLogin";
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -74,6 +74,7 @@
            this.barButtonItem5 = new DevExpress.XtraBars.BarButtonItem();
            this.fluentFormDefaultManager1 = new DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager(this.components);
            this.acrd = new DevExpress.XtraBars.Navigation.AccordionControl();
            this.accordionControlElement1 = new DevExpress.XtraBars.Navigation.AccordionControlElement();
            this.fluentDesignFormContainer1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit();
            this.statusStrip1.SuspendLayout();
@@ -459,12 +460,19 @@
            // acrd
            // 
            this.acrd.Dock = System.Windows.Forms.DockStyle.Left;
            this.acrd.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] {
            this.accordionControlElement1});
            this.acrd.Location = new System.Drawing.Point(0, 39);
            this.acrd.Name = "acrd";
            this.acrd.ScrollBarMode = DevExpress.XtraBars.Navigation.ScrollBarMode.Touch;
            this.acrd.Size = new System.Drawing.Size(208, 727);
            this.acrd.TabIndex = 1;
            this.acrd.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu;
            //
            // accordionControlElement1
            //
            this.accordionControlElement1.Name = "accordionControlElement1";
            this.accordionControlElement1.Text = "Element1";
            // 
            // FrmMain
            // 
@@ -476,6 +484,7 @@
            this.Controls.Add(this.acrd);
            this.Controls.Add(this.fluentDesignFormControl1);
            this.FluentDesignFormControl = this.fluentDesignFormControl1;
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png;
            this.Name = "FrmMain";
            this.NavigationControl = this.acrd;
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
@@ -536,5 +545,6 @@
        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel4;
        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel5;
        private DevExpress.XtraBars.Navigation.AccordionControlElement accordionControlElement1;
    }
}
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -31,6 +31,9 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <PropertyGroup>
    <ApplicationIcon>logo_ico.ico</ApplicationIcon>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="DevExpress.BonusSkins.v19.2" />
    <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.8.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -208,7 +211,11 @@
    <Compile Include="Entity\ReturnModel.cs" />
    <Compile Include="Program.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Properties\Resources1.Designer.cs" />
    <Compile Include="Properties\Resources.Designer.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="Query\MesItemQuery.cs" />
    <Compile Include="Service\MesItemServices.cs" />
    <Compile Include="TestForm\XtraForm1.cs">
@@ -302,7 +309,10 @@
    <EmbeddedResource Include="DevFrm\User\UserSetPwd.resx">
      <DependentUpon>UserSetPwd.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\Resources.resx" />
    <EmbeddedResource Include="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
    <EmbeddedResource Include="TestForm\XtraForm1.resx">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </EmbeddedResource>
@@ -331,6 +341,7 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Content Include="logo_ico.ico" />
    <None Include="Resources\user_16x161.png" />
    <None Include="Resources\trackingchanges_allmarkup_32x32.png" />
    <None Include="Resources\trackingchanges_allmarkup_16x16.png" />
@@ -400,6 +411,7 @@
    <None Include="Resources\bodepartment_16x161.png" />
    <None Include="Resources\engineering_16x16.png" />
    <None Include="Resources\cleartablestyle_16x16.png" />
    <None Include="Resources\logo_png.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup>
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -142,8 +142,8 @@
  <data name="boposition2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -157,17 +157,14 @@
  <data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\find_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -178,8 +175,8 @@
  <data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -208,9 +205,6 @@
  <data name="formatnumbertime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\formatnumbertime_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -223,8 +217,8 @@
  <data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="login_bg6" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -238,8 +232,8 @@
  <data name="trackingchanges_trackchanges_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_trackchanges_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -250,14 +244,17 @@
  <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -268,14 +265,17 @@
  <data name="dropandhighlowlines_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dropandhighlowlines_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="3dcylinder_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcylinder_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -283,14 +283,17 @@
  <data name="convert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\first_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="edit_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -304,9 +307,6 @@
  <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editrangepermission_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editrangepermission_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -316,14 +316,17 @@
  <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="cleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\cleartablestyle_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -331,8 +334,8 @@
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="editrangepermission_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editrangepermission_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -349,8 +352,8 @@
  <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="legendnone2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\legendnone2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -361,8 +364,8 @@
  <data name="bouser_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\download_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -370,7 +373,7 @@
  <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="cleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\cleartablestyle_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/Properties/Resources1.Designer.cs
ÎļþÒÑɾ³ý