From c115ac388af5a6928716f0146a75a2a42fb27d8e Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期日, 22 九月 2024 20:52:16 +0800
Subject: [PATCH] 仓库管理

---
 DevApp/Gs.DevApp/DevFrm/User/Role.cs |   62 +++++++++++++++----------------
 1 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index bfc70e4..1d8b7f9 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/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)

--
Gitblit v1.9.3