SVN r1037
SVN-Revision: r1037
This commit is contained in:
@@ -298,6 +298,10 @@ namespace Lskj.Control
|
|||||||
{
|
{
|
||||||
return BaseModuleImpl.GetBaseGridRowColors(key);
|
return BaseModuleImpl.GetBaseGridRowColors(key);
|
||||||
}));
|
}));
|
||||||
|
Task<DataTable> flowstepGridRightMenusTask = cachesDic.AddTask(gridControlEx, "FlowstepGridRightMenus", new Task<DataTable>(() =>
|
||||||
|
{
|
||||||
|
return BaseModuleImpl.GetBaseGridRightMenus($"FLOWSTEP_{accraditationModelTask.Result.Formkey}");
|
||||||
|
}));
|
||||||
//Task<DataTable> dataSourceTableTask = cachesDic.AddTask(gridControlEx, "DataSourceTable", new Task<DataTable>(() =>
|
//Task<DataTable> dataSourceTableTask = cachesDic.AddTask(gridControlEx, "DataSourceTable", new Task<DataTable>(() =>
|
||||||
//{
|
//{
|
||||||
// return BaseImpl.GetDataTableResult(accraditationModelTask.Result.StepSql);
|
// return BaseImpl.GetDataTableResult(accraditationModelTask.Result.StepSql);
|
||||||
@@ -596,8 +600,13 @@ namespace Lskj.Control
|
|||||||
{
|
{
|
||||||
dtGridRowColors = BaseModuleImpl.GetBaseGridRowColors(key);
|
dtGridRowColors = BaseModuleImpl.GetBaseGridRowColors(key);
|
||||||
}
|
}
|
||||||
|
if (!dataCaches.GetValue(grid, "FlowstepGridRightMenus", out DataTable dtGridRightMenus))
|
||||||
|
{
|
||||||
|
dtGridRightMenus = BaseModuleImpl.GetBaseGridRightMenus($"FLOWSTEP_{accrModel.Formkey}");
|
||||||
|
}
|
||||||
grid.SetGridRowColors(dtGridRowColors);
|
grid.SetGridRowColors(dtGridRowColors);
|
||||||
grid.SetReadOnlyColumns(dtColumns, modelkeyName + key);
|
grid.SetReadOnlyColumns(dtColumns, modelkeyName + key);
|
||||||
|
grid.SetGridRightMenus(dtGridRightMenus, SysModel);
|
||||||
grid.GridView.Tag = accrModel;
|
grid.GridView.Tag = accrModel;
|
||||||
grid.GridView.DoubleClick += new EventHandler(OnGridViewDoubleClick);
|
grid.GridView.DoubleClick += new EventHandler(OnGridViewDoubleClick);
|
||||||
grid.Model = this.SysModel;
|
grid.Model = this.SysModel;
|
||||||
@@ -719,11 +728,11 @@ namespace Lskj.Control
|
|||||||
DataTable dataSourceTable = BaseImpl.GetDataTableResult(item.AuditModel.StepSql);
|
DataTable dataSourceTable = BaseImpl.GetDataTableResult(item.AuditModel.StepSql);
|
||||||
item.GridControlObj.SetGridViewDataSource(dataSourceTable);
|
item.GridControlObj.SetGridViewDataSource(dataSourceTable);
|
||||||
item.LabelObj.Text = item.AuditModel.CurstepName + " (" + string.Format(ResourceKeys.RowCountRecond, item.GridControlObj.GridView.RowCount) + " )";
|
item.LabelObj.Text = item.AuditModel.CurstepName + " (" + string.Format(ResourceKeys.RowCountRecond, item.GridControlObj.GridView.RowCount) + " )";
|
||||||
if (!(BaseAccraditModelObj.MuitlAuditFlag || BaseAccraditModelObj.MuitlAuditBackFlag))
|
if (!(BaseAccraditModelObj.MuitlAuditFlag || BaseAccraditModelObj.MuitlAuditBackFlag))
|
||||||
{
|
{
|
||||||
item.GridControlObj.GridView.SelectRowHandler(oldRowHandle);
|
item.GridControlObj.GridView.SelectRowHandler(oldRowHandle);
|
||||||
}
|
}
|
||||||
|
|
||||||
cnt += item.GridControlObj.GridView.RowCount;
|
cnt += item.GridControlObj.GridView.RowCount;
|
||||||
}
|
}
|
||||||
tab.TabPage.Text = tab.FlowStepModel.StepGroup + "(" + cnt + ")";
|
tab.TabPage.Text = tab.FlowStepModel.StepGroup + "(" + cnt + ")";
|
||||||
@@ -878,7 +887,7 @@ namespace Lskj.Control
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
if (this.OnGridFinshViewDoubleCallBack != null)
|
if (this.OnGridFinshViewDoubleCallBack != null)
|
||||||
OnGridFinshViewDoubleCallBack(sender, e);
|
OnGridFinshViewDoubleCallBack(sender, e);
|
||||||
}
|
}
|
||||||
@@ -1271,7 +1280,7 @@ namespace Lskj.Control
|
|||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Documents.Add(BillDocumentId);
|
Documents.Add(BillDocumentId);
|
||||||
}
|
}
|
||||||
@@ -1441,7 +1450,7 @@ namespace Lskj.Control
|
|||||||
int beforeId = 0;
|
int beforeId = 0;
|
||||||
string stepCode = item[this.BaseAccraditModelObj.TmpStepField] + "";
|
string stepCode = item[this.BaseAccraditModelObj.TmpStepField] + "";
|
||||||
string billDocumentId = item[tmpParmaryField] + "";
|
string billDocumentId = item[tmpParmaryField] + "";
|
||||||
|
|
||||||
if (Documents.Contains(billDocumentId))
|
if (Documents.Contains(billDocumentId))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
@@ -1477,8 +1486,8 @@ namespace Lskj.Control
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper,
|
// string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper,
|
||||||
//this.SysModel, stepCode, billDocumentId, "", this.AuditComModelObj.ProcedureName, "R", "", _auditAdvice, remindOpers, confirmOpers, true, ret);
|
//this.SysModel, stepCode, billDocumentId, "", this.AuditComModelObj.ProcedureName, "R", "", _auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||||
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
string result = BaseAuditImpl.Audit(out nextSelectStepCode, out nextSelectStepOper, out string msgText,
|
||||||
this.SysModel, stepCode, billDocumentId, "", this.AuditComModelObj.ProcedureName, "R", "", _auditAdvice, remindOpers, confirmOpers, true, ret);
|
this.SysModel, stepCode, billDocumentId, "", this.AuditComModelObj.ProcedureName, "R", "", _auditAdvice, remindOpers, confirmOpers, true, ret);
|
||||||
string tag = isBack ? "1" : "0";
|
string tag = isBack ? "1" : "0";
|
||||||
|
|||||||
Reference in New Issue
Block a user