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

SVN r320

Browse Source 
SVN-Revision: r320
This commit is contained in:
cyf
2025-03-14 01:30:17 +00:00
parent 27a79815c9
commit e059f99cd0
2 changed files with 59 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+53 -35
View File
@@ -1608,10 +1608,11 @@ namespace Lskj.PubBill
if (attachModels.Count > 0)
this.tb_buttom.TabControlObj.TabPages[0].Text = model.UserName + DetailedSuffix;
}
TreeGridDragGrid treeGridDragGrid = new TreeGridDragGrid((gridDetail as TreeGridControlEx).TreeListObj, this.gcMain.GridView);
treeGridDragGrid.OnDragComplete += new TreeGridDragGridCompleteEventHandler(OnTreeGridDetailGridCompleted);
if (model.MainDetailsAddType!="2")
{
TreeGridDragGrid treeGridDragGrid = new TreeGridDragGrid((gridDetail as TreeGridControlEx).TreeListObj, this.gcMain.GridView);
treeGridDragGrid.OnDragComplete += new TreeGridDragGridCompleteEventHandler(OnTreeGridDetailGridCompleted);
}
}
else
{
@@ -1637,7 +1638,7 @@ namespace Lskj.PubBill
gridDetail.SetGridRightMenus(dtBaseGridRightMenus, this.SysModel, OnGridDetailRightMenuCallback);
if (BillModel.IsBillDetailCheck == 0)
{
gridDetail.GridView.DoubleClick += new EventHandler(OnGridDetailDoubleClick);
if (model.MainDetailsAddType != "2") gridDetail.GridView.DoubleClick += new EventHandler(OnGridDetailDoubleClick);
}
//明细的明细(明细分成左右2个)
if (!string.IsNullOrEmpty(model.SourceDetailsDetailsSql))
@@ -1679,24 +1680,27 @@ namespace Lskj.PubBill
int width = this.tb_buttom.Width;//获取控件宽度
splitContainerControl.SplitterPosition = width / 2;//然后将分割位置设置在宽度一半位置
}
//明细的明细拖拽到上方
if (this.BillModel.DetailTreeTable)
if (model.MainDetailsAddType != "1")
{
GridDragTreeGrid dragDetaigDetailGrid = new GridDragTreeGrid(gridDetail_Details.GridView, (this.gcMain as TreeGridControlEx).TreeListObj);
dragDetaigDetailGrid.CanDragParentNode = true;
dragDetaigDetailGrid.NeglectingNodes = true;
dragDetaigDetailGrid.OnDragComplete += DragDetailGrid_OnDragComplete;
}
else
{
GridDragGrid dragDetaigDetailGrid = new GridDragGrid(gridDetail_Details.GridView, this.gcMain.GridView);
dragDetaigDetailGrid.OnDragComplete += new GridFragGridCompleteEventHandler(OnDragDetailGridCompleted);
}
//明细的明细拖拽到上方
if (this.BillModel.DetailTreeTable)
{
GridDragTreeGrid dragDetaigDetailGrid = new GridDragTreeGrid(gridDetail_Details.GridView, (this.gcMain as TreeGridControlEx).TreeListObj);
dragDetaigDetailGrid.CanDragParentNode = true;
dragDetaigDetailGrid.NeglectingNodes = true;
dragDetaigDetailGrid.OnDragComplete += DragDetailGrid_OnDragComplete;
}
else
{
GridDragGrid dragDetaigDetailGrid = new GridDragGrid(gridDetail_Details.GridView, this.gcMain.GridView);
dragDetaigDetailGrid.OnDragComplete += new GridFragGridCompleteEventHandler(OnDragDetailGridCompleted);
}
if (BillModel.IsBillDetailCheck == 0)
{
//明细的明细双击加载到上方
gridDetail_Details.GridView.DoubleClick += new EventHandler(OnGridDetailDetailDoubleClick);
if (BillModel.IsBillDetailCheck == 0)
{
//明细的明细双击加载到上方
gridDetail_Details.GridView.DoubleClick += new EventHandler(OnGridDetailDetailDoubleClick);
}
}
splitContainerControl.Parent = tabDetail;
@@ -1717,23 +1721,27 @@ namespace Lskj.PubBill
this.tb_buttom.TabControlObj.TabPages[0].Text = model.UserName + DetailedSuffix;
}
if (this.BillModel.DetailTreeTable)
if (model.MainDetailsAddType != "2")
{
GridDragTreeGrid dragDetailGrid = new GridDragTreeGrid(gridDetail.GridView, (this.gcMain as TreeGridControlEx).TreeListObj);
dragDetailGrid.CanDragParentNode = true;
dragDetailGrid.NeglectingNodes = true;
dragDetailGrid.OnDragComplete += DragDetailGrid_OnDragComplete;
if (this.BillModel.DetailTreeTable)
{
GridDragTreeGrid dragDetailGrid = new GridDragTreeGrid(gridDetail.GridView, (this.gcMain as TreeGridControlEx).TreeListObj);
dragDetailGrid.CanDragParentNode = true;
dragDetailGrid.NeglectingNodes = true;
dragDetailGrid.OnDragComplete += DragDetailGrid_OnDragComplete;
unionModel.AddDataSql = model.AddDataSql;
unionModel.AddDataCondition = model.AddDataCondition;
}
else
{
GridDragGrid dragDetailGrid = new GridDragGrid(gridDetail.GridView, this.gcMain.GridView);
dragDetailGrid.OnDragComplete += new GridFragGridCompleteEventHandler(OnDragDetailGridCompleted);
unionModel.AddDataSql = model.AddDataSql;
unionModel.AddDataCondition = model.AddDataCondition;
}
else
{
GridDragGrid dragDetailGrid = new GridDragGrid(gridDetail.GridView, this.gcMain.GridView);
dragDetailGrid.OnDragComplete += new GridFragGridCompleteEventHandler(OnDragDetailGridCompleted);
}
}
if (BillModel.IsBillDetailCheck == 1)//加载复选框
{
GridDragGrid.GridAddCheckBox(gridDetail.GridView);
@@ -3678,8 +3686,18 @@ namespace Lskj.PubBill
this.AddRowToGridViewByBom(rowItem, unionModel, ref onlyPopup);
if (BillModel.drgFinishHide == "1" && unionModel.GridDetailControlObj != null)
{
unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.Remove(rowItem);
//RemoveRowitem.Add(rowItem);
if (unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.IndexOf(rowItem) >= 0)
{
unionModel.GridDetailControlObj.GridControl.DataSourceTable().Rows.Remove(rowItem);
//RemoveRowitem.Add(rowItem);
}
if (unionModel.GridDetailDetailControlObj!=null&&unionModel.GridDetailDetailControlObj.GridControl.DataSourceTable().Rows.IndexOf(rowItem) >= 0)
{
unionModel.GridDetailDetailControlObj.GridControl.DataSourceTable().Rows.Remove(rowItem);
//RemoveRowitem.Add(rowItem);
}
}
if (BillModel.DrgDetailAndSource && unionModel.GridControlObj != null)//移动明细主表数据到主表
{
插件库/Lskj.PubBill/Model/BillSourceModel.cs
+5 -1
View File
@@ -50,6 +50,8 @@ namespace Lskj.PubBill.Model
public bool DetailsDoubleClick;// 单据来源刷新来源明细模式，默认单击，1为双击
public string MainDetailsAddType;// 主表明细新增模式 （默认来源明细和来源明细的明细都可以添加到主表， 1为来源明细添加 2为来源明细的明细添加）
public BillSourceModel(DataRow item)
{
if (item == null) return;
@@ -80,4 +82,6 @@ namespace Lskj.PubBill.Model
this.SaveRefreshFlag = item.Table.Columns.Contains("SaveRefreshFlag") && "1".Equals(item["SaveRefreshFlag"] + "") ? true : false;
this.SourceDetailsDetailsSql = item.Table.Columns.Contains("detailSQL1") ? item["detailSQL1"] + "" : "";
this.sourceDetailType = item.Table.Columns.Contains("sourceDetailType") ? item["sourceDetailType"] + "" : "";
this.DisableShowSourceCount = item.Table.Columns.Contains(
this.DisableShowSourceCount = item.Table.Columns.Contains("DisableShowSourceCount") && "1".Equals(item["DisableShowSourceCount"] + "") ? true : false;
this.AddDataSql =