From b2ae2d8e16c6f8daeb5853d3f31d6895f1bf8a3a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 30 十一月 2024 15:45:28 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs |   63 ++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index 804f6aa..e265f2b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -12,8 +12,10 @@
 {
     public partial class Organization : XtraForm
     {
+        List<FilterEntity> _filterList = new List<FilterEntity>();
         public Organization()
         {
+          
             InitializeComponent();
             //toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
             //toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
@@ -21,12 +23,45 @@
             //toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             //toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
             //toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
-            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
-            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            //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)
+        {
+          
+        }
+        /// <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;
@@ -117,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>
         ///     淇敼浜嬩欢
@@ -167,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;
             }
 
@@ -206,7 +232,7 @@
                 conPeople = txt_conPeople.Text, //鑱旂郴浜�
                 conTel = txt_conPeople.Text, //鑱旂郴鐢佃瘽
                 isStatus = txt_isStatus.Checked, //鐘舵��
-                factory = txt_factory.Text //缁勭粐缂栧彿
+                factory = txt_fNumber.Text //缁勭粐缂栧彿
             };
             try
             {
@@ -243,7 +269,7 @@
                     "Organization/GetListPage", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
                 var dt = dd.rtnData.list;
-                var drGrp = dt.Select("FParentlD='0' or isnull(FParentlD,'') =''");
+                var drGrp = dt.Select("FID=1");
                 var dtComList = new DataTable();
                 dtComList.Columns.Add("guid", typeof(string));
                 dtComList.Columns.Add("name", typeof(string));
@@ -266,14 +292,13 @@
                         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)
             {
@@ -315,5 +340,7 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
+       
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3