From 09f8d9f072aa048787beb0112267be0bdf0c2423 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 12 七月 2025 16:06:56 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 278 +++++++------------------------------------------------
1 files changed, 37 insertions(+), 241 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index 55ceaab..fc7e1ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -8,278 +9,73 @@
namespace Gs.DevApp.DevFrm.User
{
- public partial class Organization : DevExpress.XtraEditors.XtraForm
+ public partial class Organization : XtraForm
{
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
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;
- tlMenu.DoubleClick += TlMenu_DoubleClick;
- getTree();
- }
- private void TlMenu_DoubleClick(object sender, EventArgs e)
- {
- TreeNode clickedNode = tlMenu.SelectedNode;
- if (clickedNode.FirstNode == null)
- {
- string rowGuid = clickedNode.Name.ToString();
- getModel(rowGuid, false, 999);
- }
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.getXmlConfig();
+ getPageList(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
}
/// <summary>
- /// 鍙嶅鏍�
+ /// 鏌ヨ浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- this.toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
- this.toolBarMenu1.guidKey = rowGuid;
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
}
/// <summary>
- /// 瀹℃牳浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
- {
- this.toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
- this.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))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鍒犻櫎鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- {
- return;
- }
- List<string> 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);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getTree();
- }
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.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();
+ _filterList.Clear();
+ getPageList(1);
}
/// <summary>
- /// 淇敼浜嬩欢
/// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
{
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.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(this.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()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("缂栧彿涓嶈兘涓虹┖锛�");
- txt_factory.Focus();
- return;
- }
- if (string.IsNullOrEmpty(txt_name.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鍚嶇О涓嶈兘涓虹┖锛�");
- txt_name.Focus();
- return;
- }
- if (string.IsNullOrEmpty(txt_conPeople.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鑱旂郴浜轰笉鑳戒负绌猴紒");
- txt_conPeople.Focus();
- return;
- }
- if (string.IsNullOrEmpty(txt_conTel.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鑱旂郴鐢佃瘽涓嶈兘涓虹┖锛�");
- txt_conTel.Focus();
- return;
- }
-
- string _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,//缁勭粐缂栧彿
- };
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, 999999, "fNumber", "asc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
try
{
- string strJson = UtilityHelper.HttpPost("", "Organization/EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
+ var strReturn =
+ UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
{
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
- }
- }
- catch (Exception ex)
- {
- ToolBox.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);
- tlMenu.ImageList = imageList;
- PageQueryModel pgq = new PageQueryModel(1, 999999, "factory", "asc", "", "");
- string 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();
- dtComList.Columns.Add("guid", typeof(string));
- dtComList.Columns.Add("name", typeof(string));
- foreach (DataRow _dy in drGrp)
- {
- dtComList.Rows.Add(_dy["guid"].ToString(), _dy["name"].ToString());
- TreeNode node = new TreeNode();//瀹氫箟缁撶偣
- node.Text = "(" + _dy["factory"].ToString() + ")" + _dy["name"].ToString();//涓虹粨鐐硅祴鍊�
- node.Name = _dy["guid"].ToString();
- node.ImageIndex = 0;
- DataRow[] drItem = dt.Select("upGuid='" + _dy["guid"].ToString() + "'");
- foreach (DataRow _dy2 in drItem)
+ DataTable dt = dd.rtnData.list;
+ gcMain1.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
{
- TreeNode node22 = new TreeNode();//瀹氫箟缁撶偣
- node22.Text = "(" + _dy2["factory"].ToString() + ")" + _dy2["name"].ToString();//涓虹粨鐐硅祴鍊�
- node22.Name = _dy2["guid"].ToString();
- node22.ImageIndex = 1;
- node.Nodes.Add(node22);
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
- 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);
- }
- }
- private void getModel(string strGuid, bool isEdit, int tabIdx)
- {
- if (string.IsNullOrEmpty(strGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
- var _obj = new
- {
- guid = strGuid,//涓诲缓
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", "Organization/GetModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- dynamic dy = _rtn.rtnData;
- lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
+ else
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.3