SVN r1047

SVN-Revision: r1047
This commit is contained in:
cyf
2025-11-20 09:01:11 +00:00
parent 6c0f72cb62
commit 2616d5dbad
23 changed files with 741 additions and 202 deletions
+37 -4
View File
@@ -1189,6 +1189,23 @@ namespace Lskj.Control.Model
opxls.ExportType = DevExpress.Export.ExportType.WYSIWYG;
BandedGridControlEx NewBandedGridControlEx = export.ReplaceBitColumn(bandedGridControlEx);
BandedGridView gridView = NewBandedGridControlEx.GridView as BandedGridView;
if (SystemInfo.Instance.ExportClearItemSource)
{
foreach (GridColumn column in gridView.Columns)//取消表格列下拉控件
{
if (column.ColumnEdit != null && column.ColumnEdit is DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit)
{
column.ColumnEdit = null;
}
//if (column.ColumnEdit != null && column.ColumnEdit is DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit)
//{
// column.ColumnEdit = null;
//}
}
}
gridView.OptionsPrint.PrintHeader = true;
gridView.OptionsPrint.AutoWidth = false;
DataTable dataTable = gridView.GetGridViewFilteredAndSortedDataToDataTable();//获取数据表
@@ -1329,6 +1346,10 @@ namespace Lskj.Control.Model
{
column.ColumnEdit = null;
}
//if (column.ColumnEdit != null && column.ColumnEdit is DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit)
//{
// column.ColumnEdit = null;
//}
}
}
@@ -1557,6 +1578,10 @@ namespace Lskj.Control.Model
{
column.ColumnEdit = null;
}
//if (column.ColumnEdit != null && column.ColumnEdit is DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit)
//{
// column.ColumnEdit = null;
//}
}
}
@@ -3160,10 +3185,18 @@ namespace Lskj.Control.Model
string sqlValue = string.Format("update {0} set {1}='0' ", SysModel.MenuTable, _importFlag);
sqlValue = string.Format("update {0} set {1}='0' where {1}!='0' ", SysModel.MenuTable, _importFlag);
SqlHelper.ExecuteNonQuery(sqlValue);
DataRow dataRow = datatb.Rows[0];
if (!string.IsNullOrWhiteSpace(SysModel.afterimportSql2) && failed == 0)
if (!string.IsNullOrWhiteSpace(SysModel.afterimportSql2) && failed == 0 && datatb.Rows.Count > 0)
{
SqlHelper.ExecuteNonQuery(ReplaceHelper.ReplaceRowParam(dataRow, ReplaceHelper.ReplaceUserInfo(SysModel.afterimportSql2)));
try
{
DataRow dataRow = datatb.Rows[0];
SqlHelper.ExecuteNonQuery(ReplaceHelper.ReplaceRowParam(dataRow, ReplaceHelper.ReplaceUserInfo(SysModel.afterimportSql2)));
}
catch (Exception e)
{
MessageUtil.Show("导入后执行sql执行失败" + e.Message);
}
}
datatb.Clear();
@@ -3635,7 +3668,7 @@ namespace Lskj.Control.Model
// MessageUtil.Show(string.Format("明细列:{0}不能为空!", gridView.Columns[requiredField].Caption));
// return false;
//}
for (int i = 0; i < dt.Rows.Count; i++)
{
if (string.IsNullOrWhiteSpace(gridView.GetRowCellDisplayText(i, requiredField)))