SVN r1204
SVN-Revision: r1204
This commit is contained in:
@@ -397,8 +397,17 @@ namespace Lskj.PubSpecialImport
|
||||
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 = new DataTable();
|
||||
if (this.Model.isBase=="1")
|
||||
{
|
||||
gridColumnsTab = BaseModuleImpl.GetBaseGridColumns(this.Model.ModuleCode);
|
||||
}
|
||||
else
|
||||
{
|
||||
gridColumnsTab = BillImpl.GetDetailColumns(this.Model.ModuleCode);
|
||||
}
|
||||
|
||||
searchEdit.View.OptionsView.ShowIndicator = false;
|
||||
searchEdit.View.OptionsView.ColumnAutoWidth = false;
|
||||
//searchEdit.PopupSizeable = true;
|
||||
@@ -669,7 +678,17 @@ namespace Lskj.PubSpecialImport
|
||||
{
|
||||
if (row.GetCell(j) != null) //同理,没有数据的单元格都默认是null
|
||||
{
|
||||
dataRow[j - firstRow.FirstCellNum] = GetCellValue(row.GetCell(j));
|
||||
if (SystemInfo.Instance.ImportRemoveSpaces && (row.GetCell(j).CellType == CellType.String))
|
||||
{
|
||||
// 清除字符串前后空格
|
||||
string cellValue = GetCellValue(row.GetCell(j)).Trim();
|
||||
dataRow[j - firstRow.FirstCellNum] = cellValue;
|
||||
}
|
||||
else
|
||||
{
|
||||
dataRow[j - firstRow.FirstCellNum] = GetCellValue(row.GetCell(j));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
data.Rows.Add(dataRow);
|
||||
@@ -1024,6 +1043,14 @@ namespace Lskj.PubSpecialImport
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (SystemInfo.Instance.ImportRemoveSpaces && cell.CellType == CellType.String)
|
||||
{
|
||||
// 清除字符串前后空格
|
||||
string cellValue = cell.StringCellValue.Trim();
|
||||
cell.SetCellValue(cellValue);
|
||||
}
|
||||
|
||||
if (cell.CellType == CellType.Numeric && (cell + "").StartsWith("-"))
|
||||
{
|
||||
dataRow[col.FieldName] = cell.NumericCellValue;
|
||||
@@ -1084,13 +1111,14 @@ namespace Lskj.PubSpecialImport
|
||||
model.FieldType == ControlType.LabAutoCompleteValue ||
|
||||
model.FieldType == ControlType.LabAutoCompleteValueParam ||
|
||||
model.FieldType == ControlType.LabMultiSelectValue ||
|
||||
model.FieldType == ControlType.LabMultiSelectValueNew ||
|
||||
model.FieldType == ControlType.LabMultiSelectValueParam
|
||||
|| model.FieldType == ControlType.LabTreeLookValue
|
||||
))
|
||||
{
|
||||
bool isEmpty = model.CanNull;
|
||||
string fieldValue = GetValueByImportText(dataRow, col.FieldName, cell + "", isBillImport);
|
||||
if ((model.FieldType == ControlType.LabMultiSelectValue ||
|
||||
if ((model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
|
||||
model.FieldType == ControlType.LabMultiSelectValueParam) && GetCellValue(cell).Contains(","))
|
||||
{
|
||||
string[] cellText = GetCellValue(cell).Split(',');
|
||||
@@ -1256,6 +1284,7 @@ namespace Lskj.PubSpecialImport
|
||||
model.FieldType == ControlType.LabAutoCompleteValue ||
|
||||
model.FieldType == ControlType.LabAutoCompleteValueParam ||
|
||||
model.FieldType == ControlType.LabMultiSelectValue ||
|
||||
model.FieldType == ControlType.LabMultiSelectValueNew ||
|
||||
model.FieldType == ControlType.LabMultiSelectValueParam
|
||||
|| model.FieldType == ControlType.LabTreeLookValue
|
||||
)
|
||||
@@ -1598,31 +1627,4 @@ namespace Lskj.PubSpecialImport
|
||||
{
|
||||
case CellType.String:
|
||||
cellValue = cell.StringCellValue;
|
||||
break;
|
||||
case CellType.Numeric:
|
||||
cellValue = cell.NumericCellValue.ToString();
|
||||
break;
|
||||
case CellType.Boolean:
|
||||
cellValue = cell.BooleanCellValue.ToString();
|
||||
break;
|
||||
case CellType.Blank:
|
||||
break;
|
||||
default:
|
||||
cellValue.ToString();
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
cellValue = cell.ToString();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
return cellValue;
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user