SVN r392
SVN-Revision: r392
This commit is contained in:
@@ -309,7 +309,7 @@ namespace Lskj.ProductiSched
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -652,7 +652,7 @@ namespace Lskj.ProductiSched
|
|||||||
DateTime dateTime = labelDateEdit.TextEdit.DateTime;
|
DateTime dateTime = labelDateEdit.TextEdit.DateTime;
|
||||||
DataRow focusedRow = bandGcTop.BandedView.GetFocusedDataRow();
|
DataRow focusedRow = bandGcTop.BandedView.GetFocusedDataRow();
|
||||||
DataTable dataDayPlan = gcRight.GridControl.DataSourceTable().Copy();
|
DataTable dataDayPlan = gcRight.GridControl.DataSourceTable().Copy();
|
||||||
if (DataModel.TopModuleModel.HasReport)UpdateRowWithDayPlan(focusedRow, dataDayPlan, dateTime);
|
if (DataModel.TopModuleModel.HasReport) UpdateRowWithDayPlan(focusedRow, dataDayPlan, dateTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -670,7 +670,6 @@ namespace Lskj.ProductiSched
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
GridDetailModel model = DataModel.RightDetailModel;
|
GridDetailModel model = DataModel.RightDetailModel;
|
||||||
|
|
||||||
if (e.Node != null)
|
if (e.Node != null)
|
||||||
{
|
{
|
||||||
DataRow rowItem = (treebandGcTop.TreeListObj.GetDataRecordByNode(e.Node) as DataRowView)?.Row;
|
DataRow rowItem = (treebandGcTop.TreeListObj.GetDataRecordByNode(e.Node) as DataRowView)?.Row;
|
||||||
@@ -783,7 +782,7 @@ namespace Lskj.ProductiSched
|
|||||||
{
|
{
|
||||||
foreach (TreeListColumn treeListColumn in band.Columns)
|
foreach (TreeListColumn treeListColumn in band.Columns)
|
||||||
{
|
{
|
||||||
if(treeListColumn.Visible) allWidth += treeListColumn.Width;
|
if (treeListColumn.Visible) allWidth += treeListColumn.Width;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -969,12 +968,12 @@ namespace Lskj.ProductiSched
|
|||||||
MergeMainDataWithDayPlan(dataMain, dataDayPlan, dateTime, typeDate);
|
MergeMainDataWithDayPlan(dataMain, dataDayPlan, dateTime, typeDate);
|
||||||
if (!TreeMultiHeader)
|
if (!TreeMultiHeader)
|
||||||
{
|
{
|
||||||
bandGcTop.SetGridViewDataSource(dataMain);
|
bandGcTop.BandedView.GridControl.DataSource = dataMain;
|
||||||
OnBandedViewRowCellClick(bandGcTop.BandedView, null);
|
OnBandedViewRowCellClick(bandGcTop.BandedView, null);
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
treebandGcTop.SetGridViewDataSource(dataMain);
|
treebandGcTop.SetGridViewDataSource(dataMain);
|
||||||
//treebandGcTop.TreeListObj.DataSource = dataMain;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
string query = @"
|
string query = @"
|
||||||
@@ -1159,10 +1158,10 @@ namespace Lskj.ProductiSched
|
|||||||
Caption = "",
|
Caption = "",
|
||||||
OptionsBand = { AllowMove = false, AllowSize = false },
|
OptionsBand = { AllowMove = false, AllowSize = false },
|
||||||
AppearanceHeader = {
|
AppearanceHeader = {
|
||||||
Options = { UseFont = true, UseTextOptions = true },
|
Options = { UseFont = true, UseTextOptions = true },
|
||||||
Font = new Font("宋体", 9, FontStyle.Bold),
|
Font = new Font("宋体", 9, FontStyle.Bold),
|
||||||
TextOptions = { HAlignment = HorzAlignment.Center }
|
TextOptions = { HAlignment = HorzAlignment.Center }
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
bandedGridControlEx.TreeListObj.Bands.Add(dayBand);
|
bandedGridControlEx.TreeListObj.Bands.Add(dayBand);
|
||||||
|
|
||||||
@@ -1172,11 +1171,11 @@ namespace Lskj.ProductiSched
|
|||||||
Width = 70,
|
Width = 70,
|
||||||
Visible = false,
|
Visible = false,
|
||||||
OptionsColumn = {
|
OptionsColumn = {
|
||||||
AllowMove = false,
|
AllowMove = false,
|
||||||
AllowSize = false,
|
AllowSize = false,
|
||||||
AllowSort = false,
|
AllowSort = false,
|
||||||
AllowEdit = false
|
AllowEdit = false
|
||||||
},
|
},
|
||||||
AppearanceCell = { TextOptions = { HAlignment = HorzAlignment.Center }, Options = { UseTextOptions = true } },
|
AppearanceCell = { TextOptions = { HAlignment = HorzAlignment.Center }, Options = { UseTextOptions = true } },
|
||||||
AppearanceHeader = { TextOptions = { HAlignment = HorzAlignment.Center }, Options = { UseTextOptions = true } },
|
AppearanceHeader = { TextOptions = { HAlignment = HorzAlignment.Center }, Options = { UseTextOptions = true } },
|
||||||
Format = { FormatType = FormatType.Numeric, FormatString = "{0:#,##0.####}" }
|
Format = { FormatType = FormatType.Numeric, FormatString = "{0:#,##0.####}" }
|
||||||
@@ -1184,6 +1183,7 @@ namespace Lskj.ProductiSched
|
|||||||
|
|
||||||
if (bandedGridControlEx == treebandGcTop)
|
if (bandedGridControlEx == treebandGcTop)
|
||||||
{
|
{
|
||||||
|
dayColumn.AllNodesSummary = true;
|
||||||
dayColumn.SummaryFooter = DevExpress.XtraTreeList.SummaryItemType.Sum;
|
dayColumn.SummaryFooter = DevExpress.XtraTreeList.SummaryItemType.Sum;
|
||||||
dayColumn.SummaryFooterStrFormat = "{0:#,##0.####}";
|
dayColumn.SummaryFooterStrFormat = "{0:#,##0.####}";
|
||||||
}
|
}
|
||||||
@@ -1226,6 +1226,7 @@ namespace Lskj.ProductiSched
|
|||||||
|
|
||||||
if (bandedGridControlEx == treebandGcTop)
|
if (bandedGridControlEx == treebandGcTop)
|
||||||
{
|
{
|
||||||
|
weekColumn.AllNodesSummary = true;
|
||||||
weekColumn.SummaryFooter = DevExpress.XtraTreeList.SummaryItemType.Sum;
|
weekColumn.SummaryFooter = DevExpress.XtraTreeList.SummaryItemType.Sum;
|
||||||
weekColumn.SummaryFooterStrFormat = "{0:#,##0.####}";
|
weekColumn.SummaryFooterStrFormat = "{0:#,##0.####}";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user