SVN r1037

SVN-Revision: r1037
This commit is contained in:
tdx
2025-11-12 06:30:39 +00:00
parent 08e9aff3fb
commit a408532995
+11 -2
View File
@@ -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;
@@ -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";