SVN-Revision: r268
This commit is contained in:
cyf
2025-02-14 09:33:11 +00:00
parent ac704870be
commit 9fb42a6e97
+8 -3
View File
@@ -312,7 +312,11 @@ namespace Lskj.PubBill
} }
Task<DataRow> menuConfigTabTask = cachesDic.AddTask(this, "MenuConfigTab", new Task<DataRow>(() => Task<DataRow> menuConfigTabTask = cachesDic.AddTask(this, "MenuConfigTab", new Task<DataRow>(() =>
{ {
return BaseImpl.GetMenuConfigTab(dynamicModel.ModuleId);//获取菜单其他配置 DataRow dataRow = BaseImpl.GetMenuConfigTab(dynamicModel.ModuleId);
billModel.BillSourceIds = dataRow.Table.Columns.Contains("BillSourceIds") ? (dataRow["BillSourceIds"] + "").Trim(',') : string.Empty;
billModel.BillFlag = dataRow.Table.Columns.Contains("BillFlag") && !string.IsNullOrEmpty(dataRow["BillFlag"] + "") ? Convert.ToInt32(dataRow["BillFlag"] + "") : -1;
//billModel
return dataRow;//获取菜单其他配置
})); }));
#region GetPrintOtherParam获取打印其他参数 #region GetPrintOtherParam获取打印其他参数
if (string.IsNullOrEmpty(billModel.PrintSql) && billModel.PrintSql.Contains("<<")) if (string.IsNullOrEmpty(billModel.PrintSql) && billModel.PrintSql.Contains("<<"))
@@ -2746,12 +2750,13 @@ namespace Lskj.PubBill
if (unionModel.GridControlObj != null) if (unionModel.GridControlObj != null)
{ {
unionModel.GridControlObj.gridControl.DataSource = BaseImpl.GetDataTableResult(sql); unionModel.GridControlObj.gridControl.DataSource = BaseImpl.GetDataTableResult(sql);
RefreshSourceDetail(unionModel);
if (unionModel.GridControlObj != null) if (unionModel.GridControlObj != null)
{ {
unionModel.GridControlObj.GridView.SelectRowHandler(Handle); unionModel.GridControlObj.GridView.SelectRowHandler(Handle);
this.RefreshSourceDetail(tabPage.Tag as BillSourceUnionModel); //this.RefreshSourceDetail(tabPage.Tag as BillSourceUnionModel);
} }
RefreshSourceDetail(unionModel);
} }
if (unionModel.TreeViewObj != null && unionModel.ModelObj.DetailSql.IndexOf(RefreshName, StringComparison.OrdinalIgnoreCase) >= 0) if (unionModel.TreeViewObj != null && unionModel.ModelObj.DetailSql.IndexOf(RefreshName, StringComparison.OrdinalIgnoreCase) >= 0)
{ {