cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r442

Browse Source 
SVN-Revision: r442
This commit is contained in:
tdx
2025-04-03 07:39:05 +00:00
parent e0dc4cf4c2
commit 61da6228a6
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+22 -4
View File
@@ -953,7 +953,7 @@ namespace Lskj.PubBill
{ {
SimpleButton btn = sender as SimpleButton; SimpleButton btn = sender as SimpleButton;
DataRow rowItem = btn.Tag as DataRow; DataRow rowItem = btn.Tag as DataRow;
CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj, null); CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj, this.gcMain);
menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore); menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore);
menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter); menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter);
menu.Apply(rowItem); menu.Apply(rowItem);
@@ -2043,7 +2043,6 @@ namespace Lskj.PubBill
DataView dataView = dt.AsDataView(); DataView dataView = dt.AsDataView();
dataView.Sort = this.BillModel.DetailOrderField; dataView.Sort = this.BillModel.DetailOrderField;
dt = dataView.ToTable(); dt = dataView.ToTable();
dt.AcceptChanges();
} }
if (this.BillModel.DetailTreeTable) if (this.BillModel.DetailTreeTable)
@@ -2943,6 +2942,14 @@ namespace Lskj.PubBill
{ {
WaitForm.ShowForm(); WaitForm.ShowForm();
unionModel.GridDetailControlObj.GridControl.DataSource = BillImpl.GetDataTableResult(sqlValue); unionModel.GridDetailControlObj.GridControl.DataSource = BillImpl.GetDataTableResult(sqlValue);
if (BillModel.drgFinishHide == "1")
{
//DataTable finishHideTb = unionModel.GridDetailControlObj.GridControl.DataSourceTable();
//foreach (DataRow drItem in RemoveRowitem)
//{
// if (finishHideTb.Select().Contains(drItem)) finishHideTb.Rows.Remove(drItem);
//}
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -3053,7 +3060,6 @@ namespace Lskj.PubBill
DataTable gridTable = (this.gcMain.GridControl.DataSource as DataTable).TrimDeleteRows(); DataTable gridTable = (this.gcMain.GridControl.DataSource as DataTable).TrimDeleteRows();
gridTable.OrderBy(this.BillModel.DetailOrderField); gridTable.OrderBy(this.BillModel.DetailOrderField);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -3809,10 +3815,12 @@ namespace Lskj.PubBill
if (unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.IndexOf(rowItem) >= 0) if (unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.IndexOf(rowItem) >= 0)
{ {
unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.Remove(rowItem); unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.Remove(rowItem);
//RemoveRowitem.Add(rowItem);
} }
if (unionModel.GridDetailDetailControlObj != null && unionModel.GridDetailDetailControlObj.GridControl.DataSourceTable().Rows.IndexOf(rowItem) >= 0) if (unionModel.GridDetailDetailControlObj != null && unionModel.GridDetailDetailControlObj.GridControl.DataSourceTable().Rows.IndexOf(rowItem) >= 0)
{ {
unionModel.GridDetailDetailControlObj.GridControl.DataSourceTable().Rows.Remove(rowItem); unionModel.GridDetailDetailControlObj.GridControl.DataSourceTable().Rows.Remove(rowItem);
//RemoveRowitem.Add(rowItem);
} }
@@ -4252,7 +4260,7 @@ namespace Lskj.PubBill
/// <para>创建日期：2017-12-07 </para> /// <para>创建日期：2017-12-07 </para>
/// <para>修改人：</para> /// <para>修改人：</para>
/// <para>修改日期：</para> /// <para>修改日期：</para>
/// <para>修改备注：</para>lserp_jt /// <para>修改备注：</para>
/// <para>版本：1.0</para> /// <para>版本：1.0</para>
/// </summary> /// </summary>
/// <returns>System.String.</returns> /// <returns>System.String.</returns>
@@ -4347,6 +4355,8 @@ namespace Lskj.PubBill
} }
if (gridColumns.Count() == 0) continue; if (gridColumns.Count() == 0) continue;
} }
fields.Append(item.ColumnName + ","); fields.Append(item.ColumnName + ",");
string fieldValue = dataRow.Table.Columns.Contains(item.ColumnName) ? dataRow[item.ColumnName] + "" : string.Empty; string fieldValue = dataRow.Table.Columns.Contains(item.ColumnName) ? dataRow[item.ColumnName] + "" : string.Empty;
if (addRowList != null && addRowList.Contains(dataRow) && Autogrowcolumn.Equals(item.ColumnName)) if (addRowList != null && addRowList.Contains(dataRow) && Autogrowcolumn.Equals(item.ColumnName))
@@ -4845,6 +4855,14 @@ namespace Lskj.PubBill
if (unionModel.SearchObj != null) sqlValue = unionModel.SearchObj.ReplaceControlValue(sqlValue); if (unionModel.SearchObj != null) sqlValue = unionModel.SearchObj.ReplaceControlValue(sqlValue);
sqlValue = ReplaceHelper.ReplaceParamToValue(sqlValue, e.Node.Name); sqlValue = ReplaceHelper.ReplaceParamToValue(sqlValue, e.Node.Name);
unionModel.GridDetailControlObj.GridControl.DataSource = BillImpl.GetDataTableResult(sqlValue); unionModel.GridDetailControlObj.GridControl.DataSource = BillImpl.GetDataTableResult(sqlValue);
if (BillModel.drgFinishHide == "1")
{
DataTable finishHideTb = unionModel.GridDetailControlObj.GridControl.DataSourceTable();
//foreach (DataRow drItem in RemoveRowitem)
//{
// if (finishHideTb.Select().Contains(drItem)) finishHideTb.Rows.Remove(drItem);
//}
}
} }
catch (Exception ex) catch (Exception ex)
{ {