From 435a9b4afbf9c62c308e8163b7438f2c72e72913 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 15 四月 2025 08:10:40 +0800 Subject: [PATCH] fqc --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs index c9b8502..963e2ef 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs @@ -18,7 +18,6 @@ List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_SalesDeliver() { - InitializeComponent(); this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; @@ -35,14 +34,14 @@ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (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; //璁剧疆閿�鍞崟 @@ -77,7 +76,7 @@ } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { - Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); Task.Delay(100); getPageList(1); } @@ -100,7 +99,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(); } @@ -210,7 +209,7 @@ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); if (xtraTabControl1.SelectedTabPageIndex == 1) { - getModel(lbGuid.Text.Trim()); + getModel(rowGuid); } else { @@ -266,6 +265,7 @@ list = new List<dynamic>(), }; gvMx1.CloseEditor(); + gvMx1.PostEditor(); gvMx1.UpdateCurrentRow(); if (gvMx1.DataRowCount <= 0) { @@ -282,6 +282,11 @@ if (string.IsNullOrEmpty(_msl)) { MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�"); + return; + } + if (string.IsNullOrEmpty(row["YjfhDate"].ToString())) + { + MsgHelper.ShowError("棰勮鍙戣揣鏃堕棿涓嶈兘涓虹┖锛�"); return; } _obj.list.Add(new @@ -308,6 +313,7 @@ gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); toolBarMenu1.currentAction = ""; + Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } } catch (Exception ex) @@ -351,7 +357,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); @@ -409,6 +415,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -525,6 +532,7 @@ gvMx1.SetFocusedRowCellValue("gyOrg", SelectedDataRow["gyOrg"].ToString()); gvMx1.SetFocusedRowCellValue("kcOrg", SelectedDataRow["kcOrg"].ToString()); gvMx1.CloseEditor(); + gvMx1.PostEditor(); gvMx1.UpdateCurrentRow(); } @@ -568,7 +576,5 @@ } } } - - } } \ No newline at end of file -- Gitblit v1.9.3