SVN r433
SVN-Revision: r433
This commit is contained in:
@@ -522,6 +522,15 @@ namespace Lskj.PubAccraditation
|
||||
{
|
||||
if (menuCondRow["DllFileName"].Equals("Lskj.PubAccraditationBrp.dll")) this.isBrpAccrad = true;// 是否是Brp模式加载
|
||||
}
|
||||
|
||||
if (this.BillModelObj.AutoMultiHeader == 1)
|
||||
{
|
||||
this.pl_detail.Controls.Clear();
|
||||
this.gridBillInfo = new BandedGridControlEx();
|
||||
this.gridBillInfo.Model = this.SysModel;
|
||||
this.gridBillInfo.Dock = DockStyle.Fill;
|
||||
this.pl_detail.Controls.Add(this.gridBillInfo);
|
||||
}
|
||||
//树表格
|
||||
if (this.BillModelObj.DetailTreeTable)
|
||||
{
|
||||
@@ -961,7 +970,16 @@ namespace Lskj.PubAccraditation
|
||||
}
|
||||
else
|
||||
{
|
||||
this.gridBillInfo.SetGridRightMenus(dtGridRightMenu, this.SysModel, OnGridViewRightCallBack);
|
||||
if (this.gridBillInfo is BandedGridControlEx)// 判断是不是多表头表格
|
||||
{
|
||||
//设置表格右键菜单
|
||||
(this.gridBillInfo as BandedGridControlEx).SetGridRightMenus(dtGridRightMenu, this.SysModel, OnGridViewRightCallBack);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.gridBillInfo.SetGridRightMenus(dtGridRightMenu, this.SysModel, OnGridViewRightCallBack);
|
||||
}
|
||||
|
||||
}
|
||||
if (!dataCaches.GetValue(gridBillInfo, "BaseGridRowColors", out DataTable dtBaseGridRowColors))
|
||||
{
|
||||
@@ -2273,7 +2291,7 @@ namespace Lskj.PubAccraditation
|
||||
{
|
||||
defaultValue = BaseImpl.GetDefaultValue(defaultValue);
|
||||
}
|
||||
string billNo = this.BillModelObj.NewVer == 1 ? BillImpl.GetBillNo(this.BillModelObj.BillSeq) : defaultValue;
|
||||
string billNo = this.BillModelObj.NewVer == 1|| SystemInfo.Instance.SplitOrderNewVer ? BillImpl.GetBillNo(this.BillModelObj.BillSeq) : defaultValue;
|
||||
//构造表头
|
||||
string masterSql = this.GetBillHearder(billNo);
|
||||
//构造明细"@billdocument_id@"
|
||||
|
||||
Reference in New Issue
Block a user