SVN r737
SVN-Revision: r737
This commit is contained in:
@@ -61,6 +61,7 @@ namespace Lskj.PubBomImportNew
|
||||
{
|
||||
try
|
||||
{
|
||||
this.Opacity = 1;
|
||||
InitEvents();
|
||||
InitGridColumns();
|
||||
InitDataSource();
|
||||
@@ -218,8 +219,8 @@ namespace Lskj.PubBomImportNew
|
||||
GridColumn clientFieldNameColumn = this.gcMain.GridView.Columns.AddVisible("clientFieldName", "绑定程序列");
|
||||
clientFieldNameColumn.Width = 200;
|
||||
|
||||
//DataTable gridColumnsTab = BaseModuleImpl.GetBaseGridColumns(this.Model.ModuleCode);
|
||||
DataTable gridColumnsTab = BillImpl.GetDetailColumns(this.Model.ModuleCode);
|
||||
DataTable gridColumnsTab = BaseModuleImpl.GetBaseGridColumns(this.Model.ModuleCode);
|
||||
//DataTable gridColumnsTab = BillImpl.GetDetailColumns(this.Model.ModuleCode);
|
||||
searchEdit.View.OptionsView.ShowIndicator = false;
|
||||
searchEdit.View.OptionsView.ColumnAutoWidth = false;
|
||||
//searchEdit.PopupSizeable = true;
|
||||
@@ -407,7 +408,7 @@ namespace Lskj.PubBomImportNew
|
||||
startRow = mergrRange.LastRow + 1;
|
||||
if (mergrRange != null)
|
||||
{
|
||||
if (mergrRange.FirstColumn < mergrRange.LastColumn)//&& !Model.CustomerServiceApp
|
||||
if (mergrRange.FirstColumn < mergrRange.LastColumn && false)//&& !Model.CustomerServiceApp
|
||||
{
|
||||
isBandTitle = true;
|
||||
bandRow = sheet.GetRow(mergrRange.LastRow + 1);
|
||||
@@ -689,7 +690,7 @@ namespace Lskj.PubBomImportNew
|
||||
startRow = mergrRange.LastRow + 1;
|
||||
if (mergrRange != null)
|
||||
{
|
||||
if (mergrRange.FirstColumn < mergrRange.LastColumn)//&& !Model.CustomerServiceApp
|
||||
if (mergrRange.FirstColumn < mergrRange.LastColumn && false)//&& !Model.CustomerServiceApp
|
||||
{
|
||||
isBandTitle = true;
|
||||
bandRow = sheet.GetRow(mergrRange.LastRow + 1);
|
||||
@@ -775,7 +776,7 @@ namespace Lskj.PubBomImportNew
|
||||
startRow = mergrRange.LastRow + 1;
|
||||
if (mergrRange != null)
|
||||
{
|
||||
if (mergrRange.FirstColumn < mergrRange.LastColumn)//&& !Model.CustomerServiceApp
|
||||
if (mergrRange.FirstColumn < mergrRange.LastColumn && false)//&& !Model.CustomerServiceApp
|
||||
{
|
||||
isBandTitle = true;
|
||||
bandRow = sheet.GetRow(mergrRange.LastRow + 1);
|
||||
|
||||
Reference in New Issue
Block a user