From 0249c31d8a31f1dfb94915915b177ec4a3074d60 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 01 七月 2025 16:44:44 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs | 338 ++++++++++++++++++++++++-------------------------------- 1 files changed, 146 insertions(+), 192 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs index 16fe505..df6f25d 100644 --- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs +++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs @@ -1,17 +1,12 @@ -锘縰sing DevExpress.XtraEditors; -using DevExpress.XtraEditors.Controls; -using Gs.DevApp.DevFrm.User; +锘縰sing DevExpress.XtraEditors.Controls; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; -using System.ComponentModel; using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -24,22 +19,22 @@ { InitializeComponent(); toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; - toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; - List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); - gvList.Add(gridView1); - Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList); + this.toolBarMenu1.getXmlConfig(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); - }); + }, tips); Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => { getModel(value); }, (value) => { getPageList(this.pageBar1.CurrentPage); - }); + }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; } @@ -70,7 +65,7 @@ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; gridView1.ActiveFilter.Clear(); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; - var frm = new ShowFilter(gridView1.Columns, _filterList); + var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } @@ -86,58 +81,6 @@ getPageList(1); } - /// <summary> - /// 鍙栨秷浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) - { - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1); - } - - /// <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_userName, gridView1, "userName"); - 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("", "User/DeleteModel", - JsonConvert.SerializeObject(_obj)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - if (xtraTabControl1.SelectedTabPageIndex == 0) - { } - else - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); - getPageList(this.pageBar1.CurrentPage); - } - - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } /// <summary> /// 鍒锋柊浜嬩欢 @@ -161,100 +104,6 @@ } } - /// <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_userName, gridView1); - if (string.IsNullOrEmpty(rowGuid)) - { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); - UtilityHelper.ChangeEnableByControl(panel1.Controls, true); - } - - /// <summary> - /// 鏂板浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) - { - lbGuid.Text = ""; - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4); - UtilityHelper.CleanValueByControl(panel1.Controls, true); - txt_password.Visible = lbPwd.Visible = true; - txt_account.Enabled = txt_password.Enabled = 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_account.Text.Trim())) - { - MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�"); - txt_account.Focus(); - return; - } - - if (string.IsNullOrEmpty(txt_password.Text.Trim())) - { - MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�"); - txt_password.Focus(); - return; - } - - if (string.IsNullOrEmpty(txt_userName.Text.Trim())) - { - MsgHelper.Warning("濮撳悕涓嶈兘涓虹┖锛�"); - txt_userName.Focus(); - return; - } - - var _obj = new - { - Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 - account = txt_account.Text.Trim(), - password = txt_password.Text.Trim(), - userName = txt_userName.Text.Trim(), - address = txt_address.Text.Trim(), - tel = txt_tel.Text.Trim(), - email = txt_email.Text.Trim(), - isStatus = txt_isStatus.Checked, - remark = txt_remark.Text.Trim(), - isSys = 0, - staffId = txt_staffId.GetId() - }; - try - { - var strJson = UtilityHelper.HttpPost("", "User/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); - } - } /// <summary> /// </summary> @@ -262,7 +111,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.ACCOUNT asc ,a.CREATE_TIME", "desc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); @@ -274,16 +123,16 @@ if (dd.rtnCode > 0) { DataTable dt = dd.rtnData.list; - gcMain.BindingContext = new BindingContext(); + gcMain1.BindingContext = new BindingContext(); gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; if (dt.Rows.Count > 0) { - gcMain.DataSource = dt; - gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gcMain1.DataSource = dt; + gcMain1.ForceInitialize(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else - UtilityHelper.SetDefaultTable(gcMain, gridView1); + UtilityHelper.SetDefaultTable(gcMain1, gridView1); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 pageBar1.CurrentPage = curPage;//褰撳墠椤� @@ -317,17 +166,73 @@ }; try { - var strJson = UtilityHelper.HttpPost("", "User/GetModel", + var strJson = UtilityHelper.HttpPost("", "User/GetModel2", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { - var dy = _rtn.rtnData; + dynamic dy = _rtn.rtnData; lbGuid.Text = strGuid; - UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit); - txt_account.Enabled = txt_password.Enabled = - txt_password.Visible = - lbPwd.Visible = tipPwd.Visible = false; + List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gvList.Add(gvMx1); + gvList.Add(gvMx2); + gvList.Add(gvMx3); + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); + JObject _job = JObject.Parse(strJson); + JArray array = new JArray(); + foreach (var a in _job["rtnData"]["list"]) + { + array.Add(a); + } + DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); + if (dt.Rows.Count > 0) + { + gcMx1.BindingContext = new BindingContext(); + gcMx1.DataSource = dt; + gcMx1.ForceInitialize(); + gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } + JArray array2 = new JArray(); + foreach (var a in _job["rtnData"]["list2"]) + { + array2.Add(a); + } + DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString()); + if (dt2.Rows.Count > 0) + { + gcMx2.BindingContext = new BindingContext(); + gcMx2.DataSource = dt2; + gcMx2.ForceInitialize(); + gvMx2.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); + } + JArray array3 = new JArray(); + foreach (var a in _job["rtnData"]["list3"]) + { + array3.Add(a); + } + DataTable dt3 = JsonConvert.DeserializeObject<DataTable>(array3.ToString()); + if (dt2.Rows.Count > 0) + { + gcMx3.BindingContext = new BindingContext(); + gcMx3.DataSource = dt3; + gcMx3.ForceInitialize(); + gvMx3.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx3); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3); + } } else { @@ -339,23 +244,7 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } - /// <summary> - /// 瑙掕壊 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void repositoryItemButtonEdit1_ButtonClick(object sender, - ButtonPressedEventArgs e) - { - if (e.Button.Index == 0) - { - var rowhandle = gridView1.FocusedRowHandle; - var dr = gridView1.GetDataRow(rowhandle); - var userGuid = dr["guid"].ToString(); - var frm = new UserSelectRole(userGuid); - frm.ShowDialog(); - } - } + /// <summary> /// pda椤甸潰 /// </summary> @@ -369,7 +258,7 @@ var rowhandle = gridView1.FocusedRowHandle; var dr = gridView1.GetDataRow(rowhandle); var userGuid = dr["guid"].ToString(); - var frm = new UserSetPwd(userGuid); + var frm = new SelectPage(userGuid); frm.ShowDialog(); } } @@ -385,7 +274,7 @@ var rowhandle = gridView1.FocusedRowHandle; var dr = gridView1.GetDataRow(rowhandle); var userGuid = dr["guid"].ToString(); - var frm = new RoleSelectAction(userGuid); + var frm = new SelectCk(userGuid); frm.ShowDialog(); } } @@ -402,9 +291,74 @@ var rowhandle = gridView1.FocusedRowHandle; var dr = gridView1.GetDataRow(rowhandle); var userGuid = dr["guid"].ToString(); - var frm = new ViewRole(userGuid); + var frm = new SelectPrint(userGuid); frm.ShowDialog(); } } + + /// <summary> + /// 鍒犻櫎pda + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void rptDel1_ButtonClick(object sender, ButtonPressedEventArgs e) + { + delBind(e, gvMx1); + } + /// <summary> + /// 鍒犻櫎浠撳簱 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void rptDel2_ButtonClick(object sender, ButtonPressedEventArgs e) + { + delBind(e, gvMx2); + } + /// <summary> + /// 鍒犻櫎鎵撳嵃 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void rptDel3_ButtonClick(object sender, ButtonPressedEventArgs e) + { + delBind(e, gvMx3); + } + + private void delBind(ButtonPressedEventArgs e, DevExpress.XtraGrid.Views.Grid.GridView gv) + { + var rowhandle = gv.FocusedRowHandle; + if (rowhandle < 0) + return; + if (e.Button.Index == 0) + { + var dr = gv.GetDataRow(rowhandle); + var mxGuid = dr["guid"].ToString(); + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) + return; + var _obj = new + { + guidList = mxGuid, + }; + try + { + var strJson = UtilityHelper.HttpPost("", + "MesSysPageviewManager/" + "DeleteUserBind", + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + if (_rtn.rtnCode > 0) + { + getModel(lbGuid.Text.Trim()); + } + } + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } } } \ No newline at end of file -- Gitblit v1.9.3