From dbafcedefd3840d48b978de50141a15cffcc1e09 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 25 十月 2024 09:59:33 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 206 +++++++++++++++++++++++++++++---------------------
1 files changed, 119 insertions(+), 87 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index 55ceaab..405e68c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -1,65 +1,73 @@
-锘縰sing Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
+锘縰sing System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
+using DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.Properties;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
namespace Gs.DevApp.DevFrm.User
{
- public partial class Organization : DevExpress.XtraEditors.XtraForm
+ public partial class Organization : XtraForm
{
public Organization()
{
InitializeComponent();
- this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
- this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
- this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
- this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- this.toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+ toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
tlMenu.DoubleClick += TlMenu_DoubleClick;
getTree();
}
+
private void TlMenu_DoubleClick(object sender, EventArgs e)
{
- TreeNode clickedNode = tlMenu.SelectedNode;
+ var clickedNode = tlMenu.SelectedNode;
if (clickedNode.FirstNode == null)
{
- string rowGuid = clickedNode.Name.ToString();
+ var rowGuid = clickedNode.Name;
getModel(rowGuid, false, 999);
}
}
+
/// <summary>
- /// 鍙嶅鏍�
+ /// 鍙嶅鏍�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- this.toolBarMenu1.guidKey = "";
+ toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
- this.toolBarMenu1.guidKey = rowGuid;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_name, tlMenu);
+ toolBarMenu1.guidKey = rowGuid;
}
+
/// <summary>
- /// 瀹℃牳浜嬩欢
+ /// 瀹℃牳浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- this.toolBarMenu1.guidKey = "";
+ toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
- this.toolBarMenu1.guidKey = rowGuid;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_name, tlMenu);
+ toolBarMenu1.guidKey = rowGuid;
}
+
/// <summary>
- /// 鍙栨秷浜嬩欢
+ /// 鍙栨秷浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -69,45 +77,47 @@
}
/// <summary>
- /// 鍒犻櫎浜嬩欢
+ /// 鍒犻櫎浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_name, tlMenu);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鍒犻櫎鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鍒犻櫎鐨勮锛�");
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- {
- return;
- }
- List<string> lst = new List<string>();
+
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) return;
+ var lst = new List<string>();
lst.Add(rowGuid);
var _obj = lst;
try
{
- string strJson = UtilityHelper.HttpPost("", "Organization/DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ var strJson = UtilityHelper.HttpPost("",
+ "Organization/DeleteModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
getTree();
}
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
- /// 鍒锋柊浜嬩欢
+ /// 鍒锋柊浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -118,23 +128,26 @@
}
/// <summary>
- /// 淇敼浜嬩欢
+ /// 淇敼浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_name, tlMenu);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
+
getModel(rowGuid, true, 1);
}
+
/// <summary>
- /// 鏂板浜嬩欢
+ /// 鏂板浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -142,10 +155,11 @@
{
UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
+ UtilityHelper.CleanValueByControl(panel1.Controls, true);
}
+
/// <summary>
- /// 淇濆瓨浜嬩欢
+ /// 淇濆瓨浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -154,132 +168,150 @@
toolBarMenu1.isSetBtn = false;
if (string.IsNullOrEmpty(txt_factory.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("缂栧彿涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("缂栧彿涓嶈兘涓虹┖锛�");
txt_factory.Focus();
return;
}
+
if (string.IsNullOrEmpty(txt_name.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鍚嶇О涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("鍚嶇О涓嶈兘涓虹┖锛�");
txt_name.Focus();
return;
}
+
if (string.IsNullOrEmpty(txt_conPeople.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鑱旂郴浜轰笉鑳戒负绌猴紒");
+ MsgHelper.Warning("鑱旂郴浜轰笉鑳戒负绌猴紒");
txt_conPeople.Focus();
return;
}
+
if (string.IsNullOrEmpty(txt_conTel.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鑱旂郴鐢佃瘽涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("鑱旂郴鐢佃瘽涓嶈兘涓虹┖锛�");
txt_conTel.Focus();
return;
}
- string _upGuid = txt_upGuid.Text.Trim().Length > 0 ? txt_upGuid.SelectedValue.ToString() : "";
+ var _upGuid = txt_upGuid.Text.Trim().Length > 0
+ ? txt_upGuid.SelectedValue.ToString()
+ : "";
var _obj = new
{
- guid = lbGuid.Text.Trim(),//涓诲缓
- upGuid = _upGuid,//涓婄骇鐨勪富寤�
- name = txt_name.Text.Trim(),//鍚嶇О
- conPeople = txt_conPeople.Text,//鑱旂郴浜�
- conTel = txt_conPeople.Text,//鑱旂郴鐢佃瘽
- isStatus = txt_isStatus.Checked,//鐘舵��
- factory = txt_factory.Text,//缁勭粐缂栧彿
+ guid = lbGuid.Text.Trim(), //涓诲缓
+ upGuid = _upGuid, //涓婄骇鐨勪富寤�
+ name = txt_name.Text.Trim(), //鍚嶇О
+ conPeople = txt_conPeople.Text, //鑱旂郴浜�
+ conTel = txt_conPeople.Text, //鑱旂郴鐢佃瘽
+ isStatus = txt_isStatus.Checked, //鐘舵��
+ factory = txt_factory.Text //缁勭粐缂栧彿
};
try
{
- string strJson = UtilityHelper.HttpPost("", "Organization/EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ var strJson = UtilityHelper.HttpPost("",
+ "Organization/EditModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
}
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
private void getTree()
{
tlMenu.Nodes.Clear();
- ImageList imageList = new ImageList();
- imageList.Images.Add("icon1", Properties.Resources.publicfix_32x32);
- imageList.Images.Add("icon2", Properties.Resources.user_16x16);
+ var imageList = new ImageList();
+ imageList.Images.Add("icon1", Resources.publicfix_32x32);
+ imageList.Images.Add("icon2", Resources.user_16x16);
tlMenu.ImageList = imageList;
- PageQueryModel pgq = new PageQueryModel(1, 999999, "factory", "asc", "", "");
- string json = JsonConvert.SerializeObject(pgq);
+ var pgq = new PageQueryModel(1, 999999, "factory");
+ var json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
- ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
- DataTable dt = dd.rtnData.list;
- DataRow[] drGrp = dt.Select("upGuid='' or upguid is null");
- DataTable dtComList = new DataTable();
+ var strReturn = UtilityHelper.HttpPost("",
+ "Organization/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ var drGrp = dt.Select("upGuid='' or upguid is null");
+ var dtComList = new DataTable();
dtComList.Columns.Add("guid", typeof(string));
dtComList.Columns.Add("name", typeof(string));
- foreach (DataRow _dy in drGrp)
+ foreach (var _dy in drGrp)
{
- dtComList.Rows.Add(_dy["guid"].ToString(), _dy["name"].ToString());
- TreeNode node = new TreeNode();//瀹氫箟缁撶偣
- node.Text = "(" + _dy["factory"].ToString() + ")" + _dy["name"].ToString();//涓虹粨鐐硅祴鍊�
+ dtComList.Rows.Add(_dy["guid"].ToString(),
+ _dy["name"].ToString());
+ var node = new TreeNode(); //瀹氫箟缁撶偣
+ node.Text =
+ "(" + _dy["factory"] + ")" + _dy["name"]; //涓虹粨鐐硅祴鍊�
node.Name = _dy["guid"].ToString();
node.ImageIndex = 0;
- DataRow[] drItem = dt.Select("upGuid='" + _dy["guid"].ToString() + "'");
- foreach (DataRow _dy2 in drItem)
+ var drItem = dt.Select("upGuid='" + _dy["guid"] + "'");
+ foreach (var _dy2 in drItem)
{
- TreeNode node22 = new TreeNode();//瀹氫箟缁撶偣
- node22.Text = "(" + _dy2["factory"].ToString() + ")" + _dy2["name"].ToString();//涓虹粨鐐硅祴鍊�
+ var node22 = new TreeNode(); //瀹氫箟缁撶偣
+ node22.Text =
+ "(" + _dy2["factory"] + ")" + _dy2["name"]; //涓虹粨鐐硅祴鍊�
node22.Name = _dy2["guid"].ToString();
node22.ImageIndex = 1;
node.Nodes.Add(node22);
}
+
node.ExpandAll();
tlMenu.Nodes.Add(node);
}
+
txt_upGuid.DataSource = dtComList;
txt_upGuid.DisplayMember = "name";
txt_upGuid.ValueMember = "guid";
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
+
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
- guid = strGuid,//涓诲缓
+ guid = strGuid //涓诲缓
};
try
{
- string strJson = UtilityHelper.HttpPost("", "Organization/GetModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ var strJson = UtilityHelper.HttpPost("",
+ "Organization/GetModel", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- dynamic dy = _rtn.rtnData;
+ var dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
+ UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.3