cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r924

Browse Source 
SVN-Revision: r924
This commit is contained in:
cyf
2025-08-07 09:29:22 +00:00
parent f7a53010be
commit e6ec3e4886
27 changed files with 4288 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/AuditPanel2.cs
+84 -41
View File
@@ -556,30 +556,31 @@ namespace Lskj.Control
item.GridControlObj.SetReadOnlyColumns(dtColumns, modelkeyName + key);
// 追加复选框用于批量审批
if (item.GridControlObj.GridView.Columns.FirstOrDefault(x => "_check".Equals(x.Name)) == null && (BaseAccraditModelObj.MuitlAuditFlag || BaseAccraditModelObj.MuitlAuditBackFlag))
if ( BaseAccraditModelObj.MuitlAuditFlag || BaseAccraditModelObj.MuitlAuditBackFlag)
{
GridColumn checkColumn = new GridColumn();
checkColumn.Name = checkColumn.FieldName = "_check";
checkColumn.Caption = "选";
checkColumn.Width = 30;
checkColumn.Visible = true;
checkColumn.VisibleIndex = 0;
checkColumn.OptionsColumn.AllowEdit = false;
item.GridControlObj.GridView.Columns.Insert(0, checkColumn);
item.GridControlObj.GridView.RowCellClick += new RowCellClickEventHandler(OnGridViewRowCellClick);
GridDragGrid.GridAddCheckBox(item.GridControlObj.GridView);
//GridColumn checkColumn = new GridColumn();
//checkColumn.Name = checkColumn.FieldName = "_check";
//checkColumn.Caption = "选";
//checkColumn.Width = 30;
//checkColumn.Visible = true;
//checkColumn.VisibleIndex = 0;
//checkColumn.OptionsColumn.AllowEdit = false;
//item.GridControlObj.GridView.Columns.Insert(0, checkColumn);
//item.GridControlObj.GridView.RowCellClick += new RowCellClickEventHandler(OnGridViewRowCellClick);
}
item.GridControlObj.SetGridViewDataSource(BaseImpl.GetDataTableResult(item.AuditModel.StepSql));
item.GridControlObj.GridView.RowClick += new DevExpress.XtraGrid.Views.Grid.RowClickEventHandler(OnPcgridRowCellClick);
// 为表格增加一列复选框列
DataTable table = item.GridControlObj.gridControl.DataSource as DataTable;
if (table != null && !table.Columns.Contains("_check") && (BaseAccraditModelObj.MuitlAuditFlag || BaseAccraditModelObj.MuitlAuditBackFlag))
{
table.Columns.Add("_check", typeof(bool));
foreach (DataRow row in table.Rows)
{
row["_check"] = 0;
}
}
//if (table != null && !table.Columns.Contains("_check") && (BaseAccraditModelObj.MuitlAuditFlag || BaseAccraditModelObj.MuitlAuditBackFlag))
//{
// table.Columns.Add("_check", typeof(bool));
// foreach (DataRow row in table.Rows)
// {
// row["_check"] = 0;
// }
//}
//item.GridControlObj.GridView.DataSourceChanged += new EventHandler(OnPcgridRowFocusedRowChanged);
cnt += item.GridControlObj.GridView.RowCount;
Application.DoEvents();
@@ -1421,16 +1422,41 @@ namespace Lskj.Control
this.ControlObj.SetRequiredControl(fieldName, RequiredFields.Split(',').Contains(fieldName), false);
}
}
//判断操作字段和字段的权限（没测试，先不开放）
//DataTable AuthorityTable = PowerImpl.GetModuleAuthorityEnable(this.SysModel.ModuleCode);
//foreach (DataRow dr in this._dtBillInfoFiled.Rows)
//{
// string fieldName = dr["fieldName"] + "";
// BaseUserControl control = this.ControlObj.FindControl(fieldName);
// if (string.IsNullOrWhiteSpace(control.Model.PrivilegeOper))
// {
// //没有人员权限，转成可编辑
// this.ControlObj.SetReadOnlyControl(fieldName, !billFields.Split(',').Contains(fieldName), false);
// }
// else
// {
// List<int> targetPrivTypeIds = new List<int>();
// foreach (string permission in control.Model.PrivilegeOper.Split(','))
// {
// targetPrivTypeIds.Add(int.Parse(permission));
// }
// //获取权限对应的人员名称
// string userString = string.Join(",", AuthorityTable.AsEnumerable()
// .Where(row => targetPrivTypeIds.Contains(row.Field<int>("privTypeId")))
// .Select(row => row.Field<string>("userList"))
// .Where(value => value != null)
// .ToList()) + ",";
// //有权限的字段，转成可编辑
// if (userString.Contains(ERPInfo.Instance.UserName + ",") || ERPInfo.Instance.UserName.Equals("管理员")) this.ControlObj.SetReadOnlyControl(fieldName, !billFields.Split(',').Contains(fieldName), false); ;
// }
//}
//操作字段
foreach (DataRow dr in this._dtBillInfoFiled.Rows)
{
string fieldName = dr["fieldName"] + "";
this.ControlObj.SetReadOnlyControl(fieldName, !billFields.Split(',').Contains(fieldName), false);
}
}
}
#endregion
@@ -1656,14 +1682,20 @@ namespace Lskj.Control
{
foreach (TabPageItemObj item in tab.TabPageItemObjs)
{
DataTable table = item.GridControlObj.gridControl.DataSource as DataTable;
foreach (DataRow row in table.Rows)
int[] mSelectRows = item.GridControlObj.GridView.GetSelectedRows();
foreach (int itemIndex in mSelectRows)
{
if ("1".Equals(row["_check"] + "") || "true".Equals(row["_check"] + "", StringComparison.OrdinalIgnoreCase))
{
rowItems.Add(row);
}
DataRow selectRow = item.GridControlObj.GridView.GetDataRow(itemIndex);
rowItems.Add(selectRow);
}
//DataTable table = item.GridControlObj.gridControl.DataSource as DataTable;
//foreach (DataRow row in table.Rows)
//{
// if ("1".Equals(row["_check"] + "") || "true".Equals(row["_check"] + "", StringComparison.OrdinalIgnoreCase))
// {
// rowItems.Add(row);
// }
//}
}
}
}
@@ -2170,14 +2202,20 @@ namespace Lskj.Control
{
foreach (TabPageItemObj item in tab.TabPageItemObjs)
{
DataTable table = item.GridControlObj.gridControl.DataSource as DataTable;
foreach (DataRow row in table.Rows)
int[] mSelectRows = item.GridControlObj.GridView.GetSelectedRows();
foreach (int itemIndex in mSelectRows)
{
if ("1".Equals(row["_check"] + "") || "true".Equals(row["_check"] + "", StringComparison.OrdinalIgnoreCase))
{
rowItems.Add(row);
}
DataRow selectRow = item.GridControlObj.GridView.GetDataRow(itemIndex);
rowItems.Add(selectRow);
}
//DataTable table = item.GridControlObj.gridControl.DataSource as DataTable;
//foreach (DataRow row in table.Rows)
//{
// if ("1".Equals(row["_check"] + "") || "true".Equals(row["_check"] + "", StringComparison.OrdinalIgnoreCase))
// {
// rowItems.Add(row);
// }
//}
}
}
}
@@ -2737,17 +2775,22 @@ namespace Lskj.Control
int cnt = 0;
foreach (TabPageItemObj item in tab.TabPageItemObjs)
{
int oldRowHandle = item.GridControlObj.GridView.FocusedRowHandle;
item.GridControlObj.SetGridViewDataSource(BaseImpl.GetDataTableResult(item.AuditModel.StepSql));
cnt += item.GridControlObj.GridView.RowCount;
// 为表格增加一列复选框列
DataTable table = item.GridControlObj.gridControl.DataSource as DataTable;
if (table != null && !table.Columns.Contains("_check"))
//DataTable table = item.GridControlObj.gridControl.DataSource as DataTable;
//if (table != null && !table.Columns.Contains("_check"))
//{
// table.Columns.Add("_check", typeof(bool));
// foreach (DataRow row in table.Rows)
// {
// row["_check"] = 0;
// }
//}
if (!(BaseAccraditModelObj.MuitlAuditFlag || BaseAccraditModelObj.MuitlAuditBackFlag))
{
table.Columns.Add("_check", typeof(bool));
foreach (DataRow row in table.Rows)
{
row["_check"] = 0;
}
item.GridControlObj.GridView.SelectRowHandler(oldRowHandle);
}
Application.DoEvents();
}
@@ -3104,7 +3147,7 @@ namespace Lskj.Control
if (!string.IsNullOrEmpty(mRecordPrimaryField) && table.Columns.Contains(this.mRecordPrimaryField))
{
// 检查数据是否为分配后的行
if (!string.IsNullOrEmpty(rowItem[this.mRecordPrimaryField] + ""))
if (!string.IsNullOrEmpty(rowItem[this.mRecordPrimaryField] + "") && !this.BillModelObj.IgnoreAllocated)
{
MessageUtil.Show("该行数据为已分配后的数据,无需分配！");
return;