lg
2024-09-22 c115ac388af5a6928716f0146a75a2a42fb27d8e
仓库管理
已修改25个文件
已删除6个文件
2617 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/BasicData/FrmCustomer.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmDepartment.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmDictionary.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmHolidy.Designer.cs 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmHolidy.cs 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmItemType.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmPosition.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmStaff.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmSupplier.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmMain.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/EasyRpt.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs 384 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/Organization.cs 268 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/Organization.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/Role.cs 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs 583 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs 340 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/User.cs 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs 150 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Service/MesItemServices.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 171 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/FrmCustomer.cs
@@ -103,7 +103,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -118,7 +118,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "Customer/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -142,7 +142,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -150,7 +150,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Customer/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmDepartment.cs
@@ -102,7 +102,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -117,7 +117,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "DepartMent/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -141,7 +141,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -149,7 +149,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "DepartMent/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmDictionary.cs
@@ -103,7 +103,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -118,7 +118,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "Dictionary/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -142,7 +142,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -150,7 +150,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Dictionary/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmHolidy.Designer.cs
@@ -44,6 +44,7 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.ToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.weekdayName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.PageBar();
@@ -53,7 +54,6 @@
            this.txt_time1 = new System.Windows.Forms.DateTimePicker();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.weekdayName = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -137,7 +137,7 @@
            this.gv_time2.Name = "gv_time2";
            this.gv_time2.OptionsColumn.AllowEdit = false;
            this.gv_time2.Visible = true;
            this.gv_time2.VisibleIndex = 3;
            this.gv_time2.VisibleIndex = 2;
            this.gv_time2.Width = 94;
            // 
            // lb_time1
@@ -161,7 +161,7 @@
            this.gv_time1.Name = "gv_time1";
            this.gv_time1.OptionsColumn.AllowEdit = false;
            this.gv_time1.Visible = true;
            this.gv_time1.VisibleIndex = 2;
            this.gv_time1.VisibleIndex = 1;
            this.gv_time1.Width = 94;
            // 
            // lb_name
@@ -195,7 +195,7 @@
            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.VisibleIndex = 0;
            this.gv_name.Width = 94;
            // 
            // toolBarMenu1
@@ -238,6 +238,16 @@
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // weekdayName
            //
            this.weekdayName.Caption = "星期";
            this.weekdayName.FieldName = "weekdayName";
            this.weekdayName.MinWidth = 25;
            this.weekdayName.Name = "weekdayName";
            this.weekdayName.Visible = true;
            this.weekdayName.VisibleIndex = 3;
            this.weekdayName.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -299,7 +309,7 @@
            // 
            // txt_time2
            // 
            this.txt_time2.CustomFormat = "yyyy-MM-dd HH:mm:ss";
            this.txt_time2.CustomFormat = "yyyy-MM-dd";
            this.txt_time2.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
            this.txt_time2.Location = new System.Drawing.Point(136, 131);
            this.txt_time2.MinDate = new System.DateTime(2024, 10, 1, 0, 0, 0, 0);
@@ -310,7 +320,7 @@
            // 
            // txt_time1
            // 
            this.txt_time1.CustomFormat = "yyyy-MM-dd HH:mm:ss";
            this.txt_time1.CustomFormat = "yyyy-MM-dd";
            this.txt_time1.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
            this.txt_time1.Location = new System.Drawing.Point(136, 74);
            this.txt_time1.MinDate = new System.DateTime(2024, 10, 1, 0, 0, 0, 0);
@@ -335,16 +345,6 @@
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            //
            // weekdayName
            //
            this.weekdayName.Caption = "星期";
            this.weekdayName.FieldName = "weekdayName";
            this.weekdayName.MinWidth = 25;
            this.weekdayName.Name = "weekdayName";
            this.weekdayName.Visible = true;
            this.weekdayName.VisibleIndex = 3;
            this.weekdayName.Width = 94;
            // 
            // FrmHolidy
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/FrmHolidy.cs
@@ -1,13 +1,10 @@
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Base;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;
using System.Drawing;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.BasicData
@@ -108,7 +105,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
        }
        /// <summary>
        /// åˆ é™¤äº‹ä»¶
@@ -117,26 +114,27 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + dr["name"].ToString() + "】,确定删除吗?"))
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
                return;
            var _obj = new
            {
                guidList = dr["guid"].ToString(),//主建
                guidList = rowGuid,//主建
            };
            string strJson = "";
            try
            {
                strJson = UtilityHelper.HttpPost("", "Holiday/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.ChangeTab(xtraTabControl1, 0);
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -153,7 +151,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -163,13 +161,14 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            getModel(dr["guid"].ToString(), true, 1);
            getModel(rowGuid, true, 1);
        }
        /// <summary>
        /// æ–°å¢žäº‹ä»¶
@@ -178,9 +177,9 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 1);
            UtilityHelper.JumpToTab(xtraTabControl1, 1);
            lbGuid.Text = "";
            UtilityHelper.CleanValue(this.panel1.Controls, true);
            UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
@@ -196,7 +195,7 @@
                txt_name.Focus();
                return;
            }
            if (txt_time1.Value>=txt_time2.Value)
            if (txt_time1.Value.Date > txt_time2.Value.Date)
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("开始时间不能大于结束时间!");
                txt_time1.Focus();
@@ -206,19 +205,19 @@
            {
                guid = lbGuid.Text.Trim(),//主建
                name = txt_name.Text.Trim(),
                time1=txt_time1.Value,
                time2 = txt_time2.Value,
                time1 = txt_time1.Value.Date,
                time2 = txt_time2.Value.Date,
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Holiday/EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnable(this.panel1.Controls, false);
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                }
            }
            catch (Exception ex)
@@ -238,7 +237,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "Holiday/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -262,7 +261,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -270,7 +269,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Holiday/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmItemType.cs
@@ -100,7 +100,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -115,7 +115,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "Dictionary/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -139,7 +139,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -147,7 +147,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Dictionary/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmPosition.cs
@@ -102,7 +102,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -118,7 +118,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "Dictionary/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -142,7 +142,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -150,7 +150,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Dictionary/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmStaff.cs
@@ -108,7 +108,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
        }
        /// <summary>
        /// åˆ é™¤äº‹ä»¶
@@ -133,10 +133,10 @@
            try
            {
                strJson = UtilityHelper.HttpPost("", "User/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.ChangeTab(xtraTabControl1, 0);
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -153,7 +153,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -178,9 +178,9 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 1);
            UtilityHelper.JumpToTab(xtraTabControl1, 1);
            lbGuid.Text = "";
            UtilityHelper.CleanValue(this.panel1.Controls, true);
            UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
@@ -197,13 +197,13 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "User/EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnable(this.panel1.Controls, false);
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                }
            }
            catch (Exception ex)
@@ -223,7 +223,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "Staff/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -247,7 +247,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -255,7 +255,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Staff/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
DevApp/Gs.DevApp/DevFrm/BasicData/FrmSupplier.cs
@@ -99,7 +99,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -114,7 +114,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "Supplier/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -138,7 +138,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -146,7 +146,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Supplier/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -36,7 +36,7 @@
            try
            {
                strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
                ReturnModel<PageListModel> rtn = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> rtn = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = rtn.rtnData.list;
                comOrg.DataSource = dt;
                comOrg.DisplayMember = "name";
@@ -86,7 +86,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "User/UserLogin", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                JObject _login = _rtn.rtnData;
                if (_rtn.rtnCode > 0)
                {
DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -22,10 +22,10 @@
            this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
            tab.CloseButtonClick += Tab_CloseButtonClick;
            tooLoading.Click += TooLoading_Click;
            getTree();
            barPwd.ItemClick += BarPwd_ItemClick;
            barExit.ItemClick += BarExit_ItemClick;
            this.FormClosing += FrmMain_FormClosing;
            getTree();
        }
        private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
@@ -300,7 +300,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "User/UserOut", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                    return _rtn.rtnCode;
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnData.outMsg);
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -122,7 +122,7 @@
            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 = "flagIncludeDocCode";
            this.gv_flagIncludeDocCode.FieldName = "flagIncludeDocCodeTxt";
            this.gv_flagIncludeDocCode.MinWidth = 25;
            this.gv_flagIncludeDocCode.Name = "gv_flagIncludeDocCode";
            this.gv_flagIncludeDocCode.OptionsColumn.AllowEdit = false;
@@ -135,7 +135,7 @@
            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 = "flagSpilitNo";
            this.gv_flagSpilitNo.FieldName = "flagSpilitNoTxt";
            this.gv_flagSpilitNo.MinWidth = 25;
            this.gv_flagSpilitNo.Name = "gv_flagSpilitNo";
            this.gv_flagSpilitNo.OptionsColumn.AllowEdit = false;
@@ -148,7 +148,7 @@
            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.FieldName = "resetZeroTxt";
            this.gv_resetZero.MinWidth = 25;
            this.gv_resetZero.Name = "gv_resetZero";
            this.gv_resetZero.OptionsColumn.AllowEdit = false;
@@ -197,7 +197,6 @@
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -15,6 +15,7 @@
        public DocNoRule()
        {
            InitializeComponent();
            txt_docCode.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -66,6 +67,7 @@
                    {
                        string rowGuid = (row["guid"].ToString());
                        getModel(rowGuid, false, 999);
                        txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = false;
                    }
                }
            }
@@ -108,7 +110,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
        }
        /// <summary>
        /// åˆ é™¤äº‹ä»¶
@@ -117,26 +119,26 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_docCode, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + dr["docCode"].ToString() + "】,确定删除吗?"))
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
                return;
            var _obj = new
            {
                guidList = dr["guid"].ToString(),//主建
                guidList = rowGuid,//主建
            };
            string strJson = "";
            try
            {
                strJson = UtilityHelper.HttpPost("", "DocNoRule/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                string strJson = UtilityHelper.HttpPost("", "DocNoRule/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.ChangeTab(xtraTabControl1, 0);
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -153,7 +155,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -163,15 +165,15 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_docCode, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = false;
            getModel(dr["guid"].ToString(), true, 1);
            txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = true;
            getModel(rowGuid, true, 1);
           txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled= panelControl1.Enabled = true;
        }
        /// <summary>
        /// æ–°å¢žäº‹ä»¶
@@ -180,11 +182,11 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 1);
            UtilityHelper.JumpToTab(xtraTabControl1, 1);
            lbGuid.Text = "";
            UtilityHelper.CleanValue(this.panel1.Controls, true);
            UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
            txxtItem1.SelectedIndex = txxtItem2.SelectedIndex = txxtItem3.SelectedIndex = txxtItem4.SelectedIndex = 0;
            txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled= panelControl1.Enabled = true;
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
@@ -198,6 +200,12 @@
            {
                ToolBox.MsgHelper.Warning("请先选择单据类型!");
                txt_docCode.Focus();
                return;
            }
            if ((txxtItem1.SelectedIndex+ txxtItem2.SelectedIndex+ txxtItem3.SelectedIndex+ txxtItem4.SelectedIndex)<=0)
            {
                ToolBox.MsgHelper.Warning("请至少选择一个参数!");
                txxtItem1.Focus();
                return;
            }
            if (txt_ruleFormat.Text.Length <= 0)
@@ -226,13 +234,13 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "DocNoRule/EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnable(this.panel1.Controls, false);
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                }
            }
            catch (Exception ex)
@@ -252,7 +260,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "DocNoRule/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -276,7 +284,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -284,14 +292,14 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "DocNoRule/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
                    lbGuid.Text = strGuid;
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
                    txt_docCode.EditValue = dy.docCode.ToString();
                    txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = false;
                    string _rule = dy.ruleFormat.ToString();
                    string[] _ary = _rule.Split(new char[] { '<' }, StringSplitOptions.RemoveEmptyEntries);
                    if (_ary.Length > 0)
DevApp/Gs.DevApp/DevFrm/Sys/EasyRpt.cs
@@ -33,7 +33,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Report/GetTemplate", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
@@ -74,7 +74,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Report/EdtTemplate", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnData.outMsg);
            }
            catch (Exception ex)
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -83,7 +83,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -98,7 +98,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "SysLog/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
DevApp/Gs.DevApp/DevFrm/User/Organization.Designer.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/User/Organization.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/User/Organization.resx
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -10,8 +10,6 @@
namespace Gs.DevApp.DevFrm.User
{
    //https://www.cnblogs.com/mkmkbj/p/16771297.html
    //https://blog.csdn.net/m0_54035969/article/details/140716675
    public partial class Role : DevExpress.XtraEditors.XtraForm
    {
        System.Text.StringBuilder actionLst = new System.Text.StringBuilder();
@@ -113,7 +111,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
        }
        /// <summary>
        /// åˆ é™¤äº‹ä»¶
@@ -122,26 +120,26 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + dr["roleName"].ToString() + "】,确定删除吗?\n该操作将会清空相应的用户权限"))
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?\n该操作将会清空相应的用户权限"))
                return;
            var _obj = new
            {
                guid = dr["guid"].ToString(),//主建
                guid = rowGuid,//主建
            };
            string strJson = "";
            try
            {
                strJson = UtilityHelper.HttpPost("", "Role/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                string strJson = UtilityHelper.HttpPost("", "Role/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.ChangeTab(xtraTabControl1, 0);
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -158,7 +156,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -168,14 +166,14 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            getModel(dr["guid"].ToString(), true, 1);
            getModel(rowGuid, true, 1);
        }
        /// <summary>
        /// æ–°å¢žäº‹ä»¶
@@ -184,9 +182,9 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 1);
            UtilityHelper.JumpToTab(xtraTabControl1, 1);
            lbGuid.Text = "";
            UtilityHelper.CleanValue(this.panel1.Controls, true);
            UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
@@ -224,13 +222,13 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Role/EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnable(this.panel1.Controls, false);
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                }
            }
            catch (Exception ex)
@@ -246,25 +244,26 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnRoleClick(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + dr["roleName"].ToString() + "】,确定设置权限吗?"))
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定设置权限吗?"))
                return;
            actionLst = new System.Text.StringBuilder();
            TraverseTreeViewNodes(trv.Nodes);
            var _obj = new
            {
                roleGuid = dr["guid"].ToString(),
                roleGuid = rowGuid,
                actionLst = actionLst.ToString(),
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", "MenuAction/SetMenuActionByRole", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                string strJson = UtilityHelper.HttpPost("", "Role/SetRoleMenuAction", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnData.outMsg);
            }
            catch (Exception ex)
@@ -285,7 +284,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "Role/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -309,7 +308,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -318,7 +317,7 @@
            try
            {
                strJson = UtilityHelper.HttpPost("", "Role/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
@@ -346,11 +345,10 @@
            {
                roleGuid = roleGuid,//主建
            };
            string strReturn = "";
            try
            {
                strReturn = UtilityHelper.HttpPost("", "MenuAction/GetListByRole", JsonConvert.SerializeObject(_obj));
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                string strReturn = UtilityHelper.HttpPost("", "Role/GetListByRole", JsonConvert.SerializeObject(_obj));
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                DataRow[] drGrp = dt.Select("upGuid='' or upGuid is null");
                foreach (DataRow _dy in drGrp)
DevApp/Gs.DevApp/DevFrm/User/SysMenu.Designer.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/User/SysMenu.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/User/SysMenu.resx
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -1,13 +1,10 @@
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Base;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;
using System.Drawing;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.User
@@ -117,7 +114,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
        }
        /// <summary>
@@ -127,26 +124,26 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_userName, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + dr["userName"].ToString() + "】,确定删除吗?"))
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
                return;
            var _obj = new
            {
                guidList = dr["guid"].ToString(),//主建
                guidList = rowGuid,//主建
            };
            string strJson = "";
            try
            {
                strJson = UtilityHelper.HttpPost("", "User/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                string strJson = UtilityHelper.HttpPost("", "User/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.ChangeTab(xtraTabControl1, 0);
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -164,7 +161,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -174,13 +171,14 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            DataRow dr = gridView1.GetFocusedDataRow();
            if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_userName, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            getModel(dr["guid"].ToString(), true, 1);
            getModel(rowGuid, true, 1);
        }
        /// <summary>
        /// æ–°å¢žäº‹ä»¶
@@ -189,9 +187,9 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 1);
            UtilityHelper.JumpToTab(xtraTabControl1, 1);
            lbGuid.Text = "";
            UtilityHelper.CleanValue(this.panel1.Controls, true);
            UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
            txt_password.Visible = lbPwd.Visible = true;
        }
        /// <summary>
@@ -247,13 +245,13 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "User/EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnable(this.panel1.Controls, false);
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                }
            }
            catch (Exception ex)
@@ -274,7 +272,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "User/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
@@ -298,7 +296,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -306,7 +304,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "User/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
@@ -50,8 +50,8 @@
            string strJson = "";
            try
            {
                strJson = UtilityHelper.HttpPost("", "MenuAction/SetRoleByUser", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                strJson = UtilityHelper.HttpPost("", "Role/SetUserRole", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnData.outMsg);
                this.Close();
            }
@@ -70,8 +70,8 @@
            string strReturn = "";
            try
            {
                strReturn = UtilityHelper.HttpPost("", "MenuAction/GetRoleByUser", JsonConvert.SerializeObject(_obj));
                ReturnModel<DataTable> dd = UtilityHelper.GetNoPageTableByJson(strReturn);
                strReturn = UtilityHelper.HttpPost("", "Role/GetUserRole", JsonConvert.SerializeObject(_obj));
                ReturnModel<DataTable> dd = UtilityHelper.ReturnToList(strReturn);
                DataTable dt = dd.rtnData;
                this.ckList.DataSource = dt;
                this.ckList.ValueMember = "guid";
@@ -110,8 +110,8 @@
            string strReturn = "";
            try
            {
                strReturn = UtilityHelper.HttpPost("", "MenuAction/GetListByUser", JsonConvert.SerializeObject(_obj));
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                strReturn = UtilityHelper.HttpPost("", "Role/GetUserMenuAction", JsonConvert.SerializeObject(_obj));
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                DataRow[] drGrp = dt.Select("upGuid='' or upGuid is null");
                foreach (DataRow _dy in drGrp)
DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
@@ -55,7 +55,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "User/SetUserPass", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnData.outMsg);
                if (_rtn.rtnCode > 0)
                {
DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.Designer.cs
@@ -45,12 +45,13 @@
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.gridControl1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.colSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.colSectionName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.colRemark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.colIsStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.colGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
@@ -138,7 +139,7 @@
            // 
            // tlcMenuName
            // 
            this.tlcMenuName.Caption = "仓库名称";
            this.tlcMenuName.Caption = "仓库(库位)名称";
            this.tlcMenuName.FieldName = "name";
            this.tlcMenuName.MinWidth = 38;
            this.tlcMenuName.Name = "tlcMenuName";
@@ -148,7 +149,7 @@
            // 
            // tlcMenuCaption
            // 
            this.tlcMenuCaption.Caption = "仓库编号";
            this.tlcMenuCaption.Caption = "仓库(库位)编号";
            this.tlcMenuCaption.FieldName = "itemNo";
            this.tlcMenuCaption.MinWidth = 23;
            this.tlcMenuCaption.Name = "tlcMenuCaption";
@@ -221,9 +222,9 @@
            // 
            this.groupBox1.Controls.Add(this.gridControl1);
            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.groupBox1.Location = new System.Drawing.Point(0, 166);
            this.groupBox1.Location = new System.Drawing.Point(0, 160);
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.Size = new System.Drawing.Size(1126, 429);
            this.groupBox1.Size = new System.Drawing.Size(1126, 435);
            this.groupBox1.TabIndex = 235;
            this.groupBox1.TabStop = false;
            this.groupBox1.Text = "仓位信息";
@@ -234,7 +235,7 @@
            this.gridControl1.Location = new System.Drawing.Point(3, 22);
            this.gridControl1.MainView = this.gvMx1;
            this.gridControl1.Name = "gridControl1";
            this.gridControl1.Size = new System.Drawing.Size(1120, 404);
            this.gridControl1.Size = new System.Drawing.Size(1120, 410);
            this.gridControl1.TabIndex = 2;
            this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -242,12 +243,13 @@
            // gvMx1
            // 
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn1,
            this.gridColumn2,
            this.gridColumn3,
            this.colSectionCode,
            this.colSectionName,
            this.colRemark,
            this.gridColumn4,
            this.gridColumn5,
            this.gridColumn6});
            this.colIsStatus,
            this.colGuid});
            this.gvMx1.GridControl = this.gridControl1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -255,35 +257,35 @@
            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn1
            // colSectionCode
            // 
            this.gridColumn1.Caption = "仓位编号";
            this.gridColumn1.FieldName = "sectionCode";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 0;
            this.gridColumn1.Width = 94;
            this.colSectionCode.Caption = "仓位编号";
            this.colSectionCode.FieldName = "sectionCode";
            this.colSectionCode.MinWidth = 25;
            this.colSectionCode.Name = "colSectionCode";
            this.colSectionCode.Visible = true;
            this.colSectionCode.VisibleIndex = 0;
            this.colSectionCode.Width = 94;
            // 
            // gridColumn2
            // colSectionName
            // 
            this.gridColumn2.Caption = "仓位名称";
            this.gridColumn2.FieldName = "sectionName";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 94;
            this.colSectionName.Caption = "仓位名称";
            this.colSectionName.FieldName = "sectionName";
            this.colSectionName.MinWidth = 25;
            this.colSectionName.Name = "colSectionName";
            this.colSectionName.Visible = true;
            this.colSectionName.VisibleIndex = 1;
            this.colSectionName.Width = 94;
            // 
            // gridColumn3
            // colRemark
            // 
            this.gridColumn3.Caption = "备注";
            this.gridColumn3.FieldName = "remark";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 94;
            this.colRemark.Caption = "备注";
            this.colRemark.FieldName = "remark";
            this.colRemark.MinWidth = 25;
            this.colRemark.Name = "colRemark";
            this.colRemark.Visible = true;
            this.colRemark.VisibleIndex = 2;
            this.colRemark.Width = 94;
            // 
            // gridColumn4
            // 
@@ -291,8 +293,9 @@
            this.gridColumn4.FieldName = "createBy";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.ReadOnly = true;
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.VisibleIndex = 4;
            this.gridColumn4.Width = 94;
            // 
            // gridColumn5
@@ -301,19 +304,29 @@
            this.gridColumn5.FieldName = "createTime";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.VisibleIndex = 5;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn6
            // colIsStatus
            // 
            this.gridColumn6.Caption = "状态";
            this.gridColumn6.FieldName = "isStatusTxt";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 94;
            this.colIsStatus.Caption = "状态";
            this.colIsStatus.FieldName = "isStatusTxt";
            this.colIsStatus.MinWidth = 25;
            this.colIsStatus.Name = "colIsStatus";
            this.colIsStatus.Visible = true;
            this.colIsStatus.VisibleIndex = 3;
            this.colIsStatus.Width = 94;
            //
            // colGuid
            //
            this.colGuid.Caption = "gridColumn1";
            this.colGuid.FieldName = "guid";
            this.colGuid.MinWidth = 25;
            this.colGuid.Name = "colGuid";
            this.colGuid.OptionsColumn.ReadOnly = true;
            this.colGuid.Width = 94;
            // 
            // panel1
            // 
@@ -336,12 +349,12 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1126, 166);
            this.panel1.Size = new System.Drawing.Size(1126, 160);
            this.panel1.TabIndex = 1;
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(105, 35);
            this.txt_itemNo.Location = new System.Drawing.Point(105, 30);
            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;
@@ -353,7 +366,7 @@
            // 
            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(14, 39);
            this.lb_itemNo.Location = new System.Drawing.Point(14, 34);
            this.lb_itemNo.Name = "lb_itemNo";
            this.lb_itemNo.Size = new System.Drawing.Size(85, 21);
            this.lb_itemNo.TabIndex = 211;
@@ -363,7 +376,7 @@
            // txt_category
            // 
            this.txt_category.EditValue = "-请选择-";
            this.txt_category.Location = new System.Drawing.Point(105, 115);
            this.txt_category.Location = new System.Drawing.Point(105, 110);
            this.txt_category.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_category.Name = "txt_category";
            this.txt_category.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -381,7 +394,7 @@
            // txt_isStatus
            // 
            this.txt_isStatus.EditValue = "-请选择-";
            this.txt_isStatus.Location = new System.Drawing.Point(389, 77);
            this.txt_isStatus.Location = new System.Drawing.Point(389, 72);
            this.txt_isStatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_isStatus.Name = "txt_isStatus";
            this.txt_isStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -393,12 +406,12 @@
            "正常",
            "锁定"});
            this.txt_isStatus.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_isStatus.Size = new System.Drawing.Size(127, 28);
            this.txt_isStatus.Size = new System.Drawing.Size(150, 28);
            this.txt_isStatus.TabIndex = 232;
            // 
            // txt_name
            // 
            this.txt_name.Location = new System.Drawing.Point(105, 77);
            this.txt_name.Location = new System.Drawing.Point(105, 72);
            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;
@@ -410,7 +423,7 @@
            // 
            this.lb_isWy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_isWy.Appearance.Options.UseFont = true;
            this.lb_isWy.Location = new System.Drawing.Point(298, 39);
            this.lb_isWy.Location = new System.Drawing.Point(298, 34);
            this.lb_isWy.Name = "lb_isWy";
            this.lb_isWy.Size = new System.Drawing.Size(85, 21);
            this.lb_isWy.TabIndex = 220;
@@ -420,7 +433,7 @@
            // txt_isWy
            // 
            this.txt_isWy.EditValue = "-请选择-";
            this.txt_isWy.Location = new System.Drawing.Point(389, 35);
            this.txt_isWy.Location = new System.Drawing.Point(389, 30);
            this.txt_isWy.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_isWy.Name = "txt_isWy";
            this.txt_isWy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -432,14 +445,14 @@
            "是委外仓",
            "不是委外仓"});
            this.txt_isWy.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_isWy.Size = new System.Drawing.Size(127, 28);
            this.txt_isWy.Size = new System.Drawing.Size(150, 28);
            this.txt_isWy.TabIndex = 233;
            // 
            // 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(332, 81);
            this.lb_isStatus.Location = new System.Drawing.Point(332, 76);
            this.lb_isStatus.Name = "lb_isStatus";
            this.lb_isStatus.Size = new System.Drawing.Size(51, 21);
            this.lb_isStatus.TabIndex = 231;
@@ -450,7 +463,7 @@
            // 
            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(14, 81);
            this.lb_name.Location = new System.Drawing.Point(14, 76);
            this.lb_name.Name = "lb_name";
            this.lb_name.Size = new System.Drawing.Size(85, 21);
            this.lb_name.TabIndex = 216;
@@ -461,7 +474,7 @@
            // 
            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(48, 118);
            this.lb_category.Location = new System.Drawing.Point(48, 113);
            this.lb_category.Name = "lb_category";
            this.lb_category.Size = new System.Drawing.Size(51, 21);
            this.lb_category.TabIndex = 226;
@@ -471,14 +484,14 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(708, 35);
            this.lbGuid.Location = new System.Drawing.Point(708, 30);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(389, 115);
            this.txt_remark.Location = new System.Drawing.Point(389, 110);
            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;
@@ -490,7 +503,7 @@
            // 
            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(332, 119);
            this.lb_remark.Location = new System.Drawing.Point(332, 114);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(51, 21);
            this.lb_remark.TabIndex = 217;
@@ -499,7 +512,7 @@
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(657, 38);
            this.labelControl11.Location = new System.Drawing.Point(657, 33);
            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);
@@ -564,11 +577,12 @@
        private DevExpress.XtraEditors.LabelControl lb_isWy;
        private DevExpress.XtraGrid.GridControl gridControl1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn colSectionCode;
        private DevExpress.XtraGrid.Columns.GridColumn colSectionName;
        private DevExpress.XtraGrid.Columns.GridColumn colRemark;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn colIsStatus;
        private DevExpress.XtraGrid.Columns.GridColumn colGuid;
    }
}
DevApp/Gs.DevApp/DevFrm/Warehouse/FrmDepot.cs
@@ -1,4 +1,5 @@
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using DevExpress.XtraTreeList;
using DevExpress.XtraTreeList.Nodes;
using Gs.DevApp.Entity;
@@ -8,6 +9,7 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Controls;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Warehouse
@@ -107,7 +109,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
        }
        /// <summary>
        /// åˆ é™¤äº‹ä»¶
@@ -116,13 +118,14 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            String rowGuid = Convert.ToString(tlMenu.FocusedNode.GetValue("guid"));
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要删除的行!");
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + tlMenu.FocusedNode.GetValue("name") + "】,确定删除吗?"))
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
            {
                return;
            }
@@ -130,14 +133,13 @@
            {
                guidList = rowGuid,//主建
            };
            string strJson = "";
            try
            {
                strJson = UtilityHelper.HttpPost("", "Depot/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                string strJson = UtilityHelper.HttpPost("", "Depot/DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.ChangeTab(xtraTabControl1, 0);
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -154,7 +156,7 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 0);
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
@@ -164,8 +166,11 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            String rowGuid = Convert.ToString(tlMenu.FocusedNode.GetValue("guid"));
            string depotGuid = Convert.ToString(tlMenu.FocusedNode.GetValue("upGuid"));
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
            string depotGuid = "";
            if (tlMenu.FocusedNode != null)
                depotGuid = Convert.ToString(tlMenu.FocusedNode.GetValue("upGuid"));
            if (!string.IsNullOrEmpty(depotGuid))
                rowGuid = depotGuid;
            if (string.IsNullOrEmpty(rowGuid))
@@ -182,19 +187,12 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
            UtilityHelper.ChangeTab(xtraTabControl1, 1);
            UtilityHelper.JumpToTab(xtraTabControl1, 1);
            lbGuid.Text = "";
            List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValue(this.panel1.Controls, true, gridViews);
            DataTable dt = new DataTable();
            foreach (GridColumn col in gvMx1.Columns)
            {
                dt.Columns.Add(col.FieldName, typeof(string));
            }
            gridControl1.BindingContext = new BindingContext();
            gridControl1.DataSource = dt;
            gridControl1.ForceInitialize();
            UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
            _setTable();
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
@@ -206,7 +204,7 @@
            toolBarMenu1.isSetBtn = false;
            if (string.IsNullOrEmpty(txt_itemNo.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("编号号不能为空!");
                Gs.DevApp.ToolBox.MsgHelper.Warning("编号不能为空!");
                txt_itemNo.Focus();
                return;
            }
@@ -234,6 +232,23 @@
                txt_isStatus.Focus();
                return;
            }
            gvMx1.UpdateCurrentRow();
            List<dynamic> lst = new List<dynamic>();
            for (int i = 0; i < gvMx1.DataRowCount; i++)
            {
                DataRow row = gvMx1.GetDataRow(i);
                if (row != null)
                {
                    lst.Add(new
                    {
                        guid = row["guid"].ToString(),
                        sectionCode = row["sectionCode"].ToString(),
                        sectionName = row["sectionName"].ToString(),
                        remark = row["remark"].ToString(),
                        isStatus = row["isStatusTxt"].ToString(),
                    });
                }
            }
            var _obj = new
            {
                guid = lbGuid.Text.Trim(),//主建
@@ -243,11 +258,12 @@
                category = txt_category.SelectedIndex,
                isWy = txt_isWy.SelectedIndex,
                isStatus = txt_isStatus.SelectedIndex,
                list = lst
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Depot/EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
@@ -255,7 +271,7 @@
                    toolBarMenu1.isSetBtn = true;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gridViews.Add(gvMx1);
                    UtilityHelper.ChangeEnable(this.panel1.Controls, false, gridViews);
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
                }
            }
            catch (Exception ex)
@@ -275,7 +291,7 @@
            try
            {
                string strReturn = UtilityHelper.HttpPost("", "Depot/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                this.tlMenu.DataSource = dt;
                this.tlMenu.KeyFieldName = "guid";
@@ -303,7 +319,7 @@
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            var _obj = new
            {
                guid = strGuid,//主建
@@ -311,7 +327,7 @@
            try
            {
                string strJson = UtilityHelper.HttpPost("", "Depot/GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
@@ -327,9 +343,16 @@
                        array.Add(a);
                    }
                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                    gridControl1.BindingContext = new BindingContext();
                    gridControl1.DataSource = dt;
                    gridControl1.ForceInitialize();
                    if (dt.Rows.Count > 0)
                    {
                        gridControl1.BindingContext = new BindingContext();
                        gridControl1.DataSource = dt;
                        gridControl1.ForceInitialize();
                    }
                    else
                    {
                        _setTable();
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -340,6 +363,17 @@
            }
        }
        private void _setTable()
        {
            DataTable dt = new DataTable();
            foreach (GridColumn col in gvMx1.Columns)
            {
                dt.Columns.Add(col.FieldName, typeof(string));
            }
            gridControl1.BindingContext = new BindingContext();
            gridControl1.DataSource = dt;
            gridControl1.ForceInitialize();
        }
    }
}
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -217,10 +217,10 @@
    <Compile Include="DevFrm\Sys\SysLog.Designer.cs">
      <DependentUpon>SysLog.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\User\Organization.cs">
    <Compile Include="DevFrm\Sys\Organization.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\User\Organization.Designer.cs">
    <Compile Include="DevFrm\Sys\Organization.Designer.cs">
      <DependentUpon>Organization.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\User\Role.cs">
@@ -229,10 +229,10 @@
    <Compile Include="DevFrm\User\Role.Designer.cs">
      <DependentUpon>Role.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\User\SysMenu.cs">
    <Compile Include="DevFrm\Sys\SysMenu.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\User\SysMenu.Designer.cs">
    <Compile Include="DevFrm\Sys\SysMenu.Designer.cs">
      <DependentUpon>SysMenu.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\User\User.cs">
@@ -348,13 +348,13 @@
    <EmbeddedResource Include="DevFrm\Sys\SysLog.resx">
      <DependentUpon>SysLog.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\User\Organization.resx">
    <EmbeddedResource Include="DevFrm\Sys\Organization.resx">
      <DependentUpon>Organization.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\User\Role.resx">
      <DependentUpon>Role.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\User\SysMenu.resx">
    <EmbeddedResource Include="DevFrm\Sys\SysMenu.resx">
      <DependentUpon>SysMenu.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\User\User.resx">
@@ -440,9 +440,6 @@
    <None Include="Resources\doubleprev_16x16.png" />
    <None Include="Resources\doublenext_16x16.png" />
    <None Include="Resources\last_16x16.png" />
    <None Include="Resources\login_bg2.png" />
    <None Include="Resources\login_bg1.png" />
    <None Include="Resources\login_bg222.png" />
    <None Include="Resources\login_bg6.png" />
    <None Include="Resources\publicfix_32x32.png" />
    <None Include="Resources\groupbyresource_32x32.png" />
@@ -466,7 +463,6 @@
    <None Include="Resources\formatnumbertime_16x16.png" />
    <None Include="Resources\find_32x32.png" />
    <None Include="Resources\find_16x16.png" />
    <None Include="Resources\enablesearch.svg" />
    <None Include="Resources\employee_32x32.png" />
    <None Include="Resources\boposition2_16x16.png" />
    <None Include="Resources\newitem_16x16.png" />
DevApp/Gs.DevApp/Service/MesItemServices.cs
@@ -22,7 +22,7 @@
            try
            {
                strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                return dd;
            }
            catch (Exception ex)
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -15,7 +15,6 @@
using DevExpress.XtraEditors;
using DevExpress.XtraTab;
using System.Text.RegularExpressions;
using System.Xml;
using System.Collections.Generic;
namespace Gs.DevApp.ToolBox
@@ -75,6 +74,17 @@
            }
            return responseStr;
        }
        /// <summary>
        /// è¯»å–默认页大小
        /// </summary>
        /// <returns></returns>
        public static int GetPageSize()
        {
            return 50;
            // return int.Parse(System.Configuration.ConfigurationSettings.AppSettings.Get("PageSize").ToString());
        }
        /// <summary>
        /// æ ¹æ®å›¾ç‰‡åè¯»å–资源文件,不带后缀名
        /// </summary>
@@ -114,11 +124,11 @@
            return token;
        }
        /// <summary>
        /// æ ‡å‡†json串返回ReturnModel-->table,
        /// æ ‡å‡†json返回ReturnModel-->包含TablePage分页,
        /// </summary>
        /// <param name="strReturn"></param>
        /// <returns></returns>
        public static ReturnModel<PageListModel> GetTableByJson(string strReturn)
        public static ReturnModel<PageListModel> ReturnToTablePage(string strReturn)
        {
            ReturnModel<PageListModel> rto = new ReturnModel<PageListModel>();
            JObject json = JObject.Parse(strReturn);
@@ -139,11 +149,11 @@
            return rto;
        }
        /// <summary>
        /// æ ‡å‡†json串返回ReturnModel->字符串,
        /// æ ‡å‡†json返回ReturnModel,
        /// </summary>
        /// <param name="strReturn"></param>
        /// <returns></returns>
        public static ReturnModel<dynamic> GetDataByJson(string strReturn)
        public static ReturnModel<dynamic> ReturnToDynamic(string strReturn)
        {
            ReturnModel<dynamic> rto = new ReturnModel<dynamic>();
            JObject json = JObject.Parse(strReturn);
@@ -154,11 +164,11 @@
        }
        /// <summary>
        /// æ ‡å‡†json串返回ReturnModel-->table,
        /// æ ‡å‡†json串返回ReturnModel-->仅仅有list,不分页,
        /// </summary>
        /// <param name="strReturn"></param>
        /// <returns></returns>
        public static ReturnModel<DataTable> GetNoPageTableByJson(string strReturn)
        public static ReturnModel<DataTable> ReturnToList(string strReturn)
        {
            ReturnModel<DataTable> rto = new ReturnModel<DataTable>();
            JObject json = JObject.Parse(strReturn);
@@ -174,17 +184,6 @@
            DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
            rto.rtnData = dt;
            return rto;
        }
        /// <summary>
        /// è¯»å–默认页大小
        /// </summary>
        /// <returns></returns>
        public static int GetPageSize()
        {
            return 50;
            // return int.Parse(System.Configuration.ConfigurationSettings.AppSettings.Get("PageSize").ToString());
        }
        /// <summary>
@@ -297,7 +296,7 @@
        /// </summary>
        /// <param name="controls">controls:为groupBox1.Controls/panel1.Controls</param>
        /// <param name="isEdt">是否可编辑</param>
        public static void CleanValue(ControlCollection controls, Boolean isEdt, List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = null)
        public static void CleanValueByControl(ControlCollection controls, Boolean isEdt, List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = null)
        {
            if (gridViews != null)
            {
@@ -342,7 +341,7 @@
        /// </summary>
        /// <param name="controls">controls:为groupBox1.Controls/panel1.Controls</param>
        /// <param name="isEdt">是否可编辑</param>
        public static void ChangeEnable(ControlCollection controls, Boolean isEdt, List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = null)
        public static void ChangeEnableByControl(ControlCollection controls, Boolean isEdt, List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = null)
        {
            if (gridViews != null)
            {
@@ -351,8 +350,10 @@
                    gv.OptionsBehavior.Editable = isEdt;
                }
            }
            foreach (Control ctrl in controls)
            {
                ctrl.Enabled = isEdt;
                //文本
                if (ctrl is TextEdit)
                {
@@ -379,7 +380,7 @@
        /// </summary>
        /// <param name="tabControl">选项卡容器</param>
        /// <param name="idx">从0开始,如果是999,则全部可用</param>
        public static void ChangeTab(XtraTabControl tabControl, int idx)
        public static void JumpToTab(XtraTabControl tabControl, int idx)
        {
            if (idx == 999)
            {
@@ -397,7 +398,6 @@
            tabControl.TabPages[idx].PageEnabled = true;
            tabControl.SelectedTabPageIndex = idx;
        }
        public static void TreeViewCheck(TreeViewEventArgs e)
        {
@@ -459,45 +459,114 @@
            string dd = Regex.Replace(propertyName, @"_([a-z])", m => m.Groups[1].Value.ToUpper());
            return dd;
        }
        public static void UpdateAppConfig(string key, string newValue)
        {
            string configFile = AppDomain.CurrentDomain.SetupInformation.ConfigurationFile;
            XmlDocument xmlDoc = new XmlDocument();
            xmlDoc.Load(configFile);
            XmlNode node = xmlDoc.SelectSingleNode($"//appSettings//add[@key='{key}']");
            if (node != null)
        /// <summary>
        ///
        /// </summary>
        /// <param name="xtraTabControl1"></param>
        /// <param name="lbGuid">编辑框中的主键名</param>
        /// <param name="txtName">编辑框中的文本框名</param>
        /// <param name="gridView1"></param>
        /// <param name="gridRowName">列表中的文本列名</param>
        /// <param name="SelectedTabPageIndex"></param>
        /// <returns></returns>
        public static (string, string) GetCurrentRow(XtraTabControl xtraTabControl1
            , System.Windows.Forms.Label lbGuid
            , DevExpress.XtraEditors.TextEdit txtName
            , DevExpress.XtraGrid.Views.Grid.GridView gridView1
            , int SelectedTabPageIndex = 1)
        {
            string _strGuid = "";
            string _strName = "";
            if (xtraTabControl1.SelectedTabPageIndex == SelectedTabPageIndex && lbGuid.Text.Length > 10)
            {
                XmlAttribute attribute = node as XmlAttribute;
                attribute.Value = newValue;
                xmlDoc.Save(configFile);
                _strGuid = lbGuid.Text.Trim();
                _strName = txtName.Text.Trim();
            }
            else
            {
                DataRow dr = gridView1.GetFocusedDataRow();
                if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
                {
                }
                else {
                    _strGuid = dr["guid"].ToString();
                    _strName = dr[1].ToString();
                }
            }
            return (_strGuid, _strName);
        }
        public class CboItemEntity
        public static (string, string) GetCurrentRow(XtraTabControl xtraTabControl1
            , System.Windows.Forms.Label lbGuid
            , DevExpress.XtraEditors.TextEdit txtName
            , System.Windows.Forms.TreeView tlMenu
            , int SelectedTabPageIndex = 1)
        {
            private object _text = 0;
            private object _Value = "";
            /// <summary>
            /// æ˜¾ç¤ºå€¼
            /// </summary>
            public object Text
            string _strGuid = "";
            string _strName = "";
            if (xtraTabControl1.SelectedTabPageIndex == SelectedTabPageIndex && lbGuid.Text.Length > 10)
            {
                get { return this._text; }
                set { this._text = value; }
                _strGuid = lbGuid.Text.Trim();
                _strName = txtName.Text.Trim();
            }
            /// <summary>
            /// å¯¹è±¡å€¼
            /// </summary>
            public object Value
            else
            {
                get { return this._Value; }
                set { this._Value = value; }
                TreeNode clickedNode = tlMenu.SelectedNode;
                if (clickedNode != null)
                {
                    _strGuid = clickedNode.Name.ToString();
                    _strName = clickedNode.Text.Trim();
                }
            }
            return (_strGuid, _strName);
        }
        public static (string, string) GetCurrentRow(XtraTabControl xtraTabControl1
            , System.Windows.Forms.Label lbGuid
             , DevExpress.XtraEditors.TextEdit txtName
            , DevExpress.XtraTreeList.TreeList tlMenu
            , int SelectedTabPageIndex = 1)
        {
            string _strGuid = "";
            string _strName = "";
            if (xtraTabControl1.SelectedTabPageIndex == SelectedTabPageIndex && lbGuid.Text.Length > 10)
            {
                _strGuid = lbGuid.Text.Trim();
                _strName = txtName.Text.Trim();
            }
            else
            {
                _strGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
                _strName = tlMenu.FocusedNode.GetValue(0).ToString();
            }
            return (_strGuid, _strName);
        }
    }
            public override string ToString()
            {
                return this.Text.ToString();
            }
    public class CboItemEntity
    {
        private object _text = 0;
        private object _Value = "";
        /// <summary>
        /// æ˜¾ç¤ºå€¼
        /// </summary>
        public object Text
        {
            get { return this._text; }
            set { this._text = value; }
        }
        /// <summary>
        /// å¯¹è±¡å€¼
        /// </summary>
        public object Value
        {
            get { return this._Value; }
            set { this._Value = value; }
        }
        public override string ToString()
        {
            return this.Text.ToString();
        }
    }
}
DevApp/Gs.DevApp/UserControl/ToolBarMenu.cs
@@ -1,5 +1,4 @@
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -119,18 +118,6 @@
                getNamespace();
            }
        }
        //private void initialization()
        //{
        //    List<string> lst = new List<string>();
        //    //lst.Add(btnAdd.Name);
        //    //lst.Add(btnEdit.Name);
        //    //lst.Add(btnLoad.Name);
        //    //lst.Add(btnDel.Name);
        //    //lst.Add(btnRole.Name);
        //    //lst.Add(btnReport.Name);
        //    //lst.Add(btnQuery.Name);
        //    setBtn(lst);
        //}
        private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
        {
@@ -277,8 +264,8 @@
            string strReturn = "";
            try
            {
                strReturn = UtilityHelper.HttpPost("", "MenuAction/GetListByUserOrgSpace", JsonConvert.SerializeObject(_obj));
                ReturnModel<DataTable> dd = UtilityHelper.GetNoPageTableByJson(strReturn);
                strReturn = UtilityHelper.HttpPost("", "Role/GetListByUserOrgSpace", JsonConvert.SerializeObject(_obj));
                ReturnModel<DataTable> dd = UtilityHelper.ReturnToList(strReturn);
                DataTable dt = dd.rtnData;
                List<string> _enabledList = new List<string>();
                foreach (BarItem item in barManager1.Items)