From b6b3f4a0fd6b38566168bd29db31dc97fc4c1a04 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 25 十二月 2024 14:53:44 +0800
Subject: [PATCH] 超领和补料
---
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 242 ++++++------------------------------------------
1 files changed, 32 insertions(+), 210 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index f1e0d40..5f97101 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -12,221 +12,47 @@
{
public partial class Organization : XtraForm
{
+ List<FilterEntity> _filterList = new List<FilterEntity>();
public Organization()
{
+
InitializeComponent();
- 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;
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
tlMenu.DoubleClick += TlMenu_DoubleClick;
getTree();
}
-
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
+ }
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getTree();
+ }
private void TlMenu_DoubleClick(object sender, EventArgs e)
{
var clickedNode = tlMenu.SelectedNode;
+ if (clickedNode == null) return;
if (clickedNode.FirstNode == null)
{
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)
- {
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (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)
- {
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (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_btnEscClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- }
-
- /// <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);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鍒犻櫎鐨勮锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) return;
- var lst = new List<string>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- "Organization/DeleteModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getTree();
- }
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
- /// 鍒锋柊浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getTree();
- }
-
- /// <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);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- getModel(rowGuid, true, 1);
- }
-
- /// <summary>
- /// 鏂板浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
- lbGuid.Text = "";
- UtilityHelper.CleanValueByControl(panel1.Controls, true);
- }
-
- /// <summary>
- /// 淇濆瓨浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(txt_factory.Text.Trim()))
- {
- MsgHelper.Warning("缂栧彿涓嶈兘涓虹┖锛�");
- txt_factory.Focus();
- return;
- }
-
- if (string.IsNullOrEmpty(txt_name.Text.Trim()))
- {
- MsgHelper.Warning("鍚嶇О涓嶈兘涓虹┖锛�");
- txt_name.Focus();
- return;
- }
-
- if (string.IsNullOrEmpty(txt_conPeople.Text.Trim()))
- {
- MsgHelper.Warning("鑱旂郴浜轰笉鑳戒负绌猴紒");
- txt_conPeople.Focus();
- return;
- }
-
- if (string.IsNullOrEmpty(txt_conTel.Text.Trim()))
- {
- MsgHelper.Warning("鑱旂郴鐢佃瘽涓嶈兘涓虹┖锛�");
- txt_conTel.Focus();
- return;
- }
-
- var _upGuid = txt_upGuid.Text.Trim().Length > 0
- ? txt_upGuid.SelectedValue.ToString()
- : "";
- var _obj = new
- {
- guid = UtilityHelper.ToGuid(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
- {
- 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(panel1.Controls, false);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
private void getTree()
{
tlMenu.Nodes.Clear();
@@ -234,7 +60,7 @@
imageList.Images.Add("icon1", Resources.publicfix_32x32);
imageList.Images.Add("icon2", Resources.user_16x16);
tlMenu.ImageList = imageList;
- var pgq = new PageQueryModel(1, 999999, "factory");
+ var pgq = new PageQueryModel(1, 999999, "FID");
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -242,7 +68,7 @@
"Organization/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
var dt = dd.rtnData.list;
- var drGrp = dt.Select("upGuid='' or upguid is null");
+ var drGrp = dt.Select("FID=1");
var dtComList = new DataTable();
dtComList.Columns.Add("guid", typeof(string));
dtComList.Columns.Add("name", typeof(string));
@@ -252,34 +78,32 @@
_dy["name"].ToString());
var node = new TreeNode(); //瀹氫箟缁撶偣
node.Text =
- "(" + _dy["factory"] + ")" + _dy["name"]; //涓虹粨鐐硅祴鍊�
+ "(" + _dy["FNumber"] + ")" + _dy["name"]; //涓虹粨鐐硅祴鍊�
node.Name = _dy["guid"].ToString();
node.ImageIndex = 0;
- var drItem = dt.Select("upGuid='" + _dy["guid"] + "'");
+ var drItem = dt.Select("FParentlD='" + _dy["FID"] + "'");
foreach (var _dy2 in drItem)
{
var node22 = new TreeNode(); //瀹氫箟缁撶偣
node22.Text =
- "(" + _dy2["factory"] + ")" + _dy2["name"]; //涓虹粨鐐硅祴鍊�
+ "(" + _dy2["FNumber"] + ")" + _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";
+ getModel(dtComList.Rows[0]["guid"].ToString(),false,0);
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
@@ -287,8 +111,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid //涓诲缓
--
Gitblit v1.9.3