From a93c957142940b4ba36369ad76a3c3d40b48ecb1 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 09 十二月 2024 14:25:50 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 86 ++++++++++++++++++++++++++++--------------
1 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index 405e68c..65c7192 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -12,24 +12,60 @@
{
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;
+ //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 Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getTree();
+ }
+ /// <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;
@@ -116,16 +152,7 @@
}
}
- /// <summary>
- /// 鍒锋柊浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getTree();
- }
+
/// <summary>
/// 淇敼浜嬩欢
@@ -166,10 +193,10 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(txt_factory.Text.Trim()))
+ if (string.IsNullOrEmpty(txt_fNumber.Text.Trim()))
{
MsgHelper.Warning("缂栧彿涓嶈兘涓虹┖锛�");
- txt_factory.Focus();
+ txt_fNumber.Focus();
return;
}
@@ -199,13 +226,13 @@
: "";
var _obj = new
{
- guid = lbGuid.Text.Trim(), //涓诲缓
+ 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 //缁勭粐缂栧彿
+ factory = txt_fNumber.Text //缁勭粐缂栧彿
};
try
{
@@ -234,7 +261,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 +269,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,27 +279,26 @@
_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)
{
@@ -314,5 +340,7 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3