From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 06 三月 2025 08:13:37 +0800 Subject: [PATCH] 版面 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs index d1ffefd..8d0e65e 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs @@ -54,6 +54,9 @@ txt_fSalesManIDTxt.Text = txt_salesId.GetSalesUserName(); txt_fCustomerIDTxt.Text = txt_salesId.GetSalesCusName(); txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName(); + txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName(); + txt_shf.Text = txt_salesId.GetSalesShf(); + txt_shName.Text = txt_salesId.GetSalesShfName(); System.Text.StringBuilder sbWhere = new System.Text.StringBuilder(); var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid); var json = JsonConvert.SerializeObject(_obj); @@ -212,7 +215,7 @@ { List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); - UtilityHelper.ChangeEnableByControl(lay2.Controls, true, gvList); + UtilityHelper.ChangeEnableByControl(layoutMx1.Controls, true, gvList); } } /// <summary> @@ -226,7 +229,7 @@ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4); List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gridViews.Add(gvMx1); - UtilityHelper.CleanValueByControl(this.lay2.Controls, true, gridViews); + UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } @@ -280,6 +283,11 @@ MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�"); return; } + if (string.IsNullOrEmpty(row["YjfhDate"].ToString())) + { + MsgHelper.ShowError("棰勮鍙戣揣鏃堕棿涓嶈兘涓虹┖锛�"); + return; + } _obj.list.Add(new { Guid = _guid, @@ -302,7 +310,7 @@ toolBarMenu1.isSetBtn = true; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); - UtilityHelper.ChangeEnableByControl(this.lay2.Controls, false, gvList); + UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList); toolBarMenu1.currentAction = ""; } } @@ -341,16 +349,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(); + gcMain1.DataSource = dt; + gcMain1.ForceInitialize(); gridView1.BestFitColumns(); } else - UtilityHelper.SetDefaultTable(gcMain, gridView1); + UtilityHelper.SetDefaultTable(gcMain1, gridView1); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 pageBar1.CurrentPage = curPage;//褰撳墠椤� @@ -391,7 +399,7 @@ lbGuid.Text = strGuid; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); - UtilityHelper.SetValueByObj(this.lay2.Controls, dy, isEdit, gvList); + UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list"]) -- Gitblit v1.9.3