@@ -294,8 +294,8 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers | |||||
public ActionResult GetFirstTaskByProcessId(string processId) | public ActionResult GetFirstTaskByProcessId(string processId) | ||||
{ | { | ||||
var taskId= nWFProcessIBLL.GetFirstTaskByProcessId(processId); | |||||
return Success(new {taskId}); | |||||
var taskId = nWFProcessIBLL.GetFirstTaskByProcessId(processId); | |||||
return Success(new { taskId }); | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// 获取我的流程信息列表 | /// 获取我的流程信息列表 | ||||
@@ -860,5 +860,37 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers | |||||
return Success("添加成功"); | return Success("添加成功"); | ||||
} | } | ||||
#endregion | #endregion | ||||
[HttpGet] | |||||
public ActionResult GetNextUser(string F_TaskId) | |||||
{ | |||||
List<string> usernamelist = new List<string>(); | |||||
List<string> nextlist = nWFTaskIBLL.GetTaskUserList(F_TaskId).Select(m => m.F_UserId).ToList(); | |||||
foreach (var uid in nextlist) | |||||
{ | |||||
usernamelist.Add(userIbll.GetEntityByUserId(uid)?.F_RealName); | |||||
} | |||||
return SuccessString(string.Join(",", usernamelist)); | |||||
} | |||||
[HttpGet] | |||||
public ActionResult GetNextUserMonitor(string F_ProcessId) | |||||
{ | |||||
var tasklist=nWFTaskIBLL.GetUnFinishTaskList(F_ProcessId).FirstOrDefault(); | |||||
if (tasklist!=null&&!string.IsNullOrEmpty(tasklist.F_Id)) | |||||
{ | |||||
List<string> usernamelist = new List<string>(); | |||||
List<string> nextlist = nWFTaskIBLL.GetTaskUserList(tasklist.F_Id).Select(m => m.F_UserId).ToList(); | |||||
foreach (var uid in nextlist) | |||||
{ | |||||
usernamelist.Add(userIbll.GetEntityByUserId(uid)?.F_RealName); | |||||
} | |||||
return SuccessString(string.Join(",", usernamelist)); | |||||
} | |||||
else | |||||
{ | |||||
return SuccessString(""); | |||||
} | |||||
} | |||||
} | } | ||||
} | } |
@@ -116,7 +116,7 @@ var bootstrap = function ($, learun) { | |||||
}); | }); | ||||
}, | }, | ||||
initGrid: function () { | initGrid: function () { | ||||
$('#gridtable').lrAuthorizeJfGrid({ | |||||
$('#gridtable').jfGrid({ | |||||
url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetTaskPageList', | url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetTaskPageList', | ||||
headData: [ | headData: [ | ||||
{ | { | ||||
@@ -290,6 +290,18 @@ var bootstrap = function ($, learun) { | |||||
} | } | ||||
} | } | ||||
}, | }, | ||||
{ | |||||
label: "当前节点办理人", name: "F_Id", width: 300, align: "left", formatterAsync: function (callback, value, row, op, $cell) { | |||||
if (row.F_TaskId) { | |||||
learun.httpAsyncGet(top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetNextUser?F_TaskId=' + row.F_TaskId, function (res) { | |||||
if (res.code == learun.httpCode.success) { | |||||
callback(res.data); | |||||
} | |||||
}); | |||||
} else | |||||
callback(""); | |||||
} | |||||
}, | |||||
//{ | //{ | ||||
// label: "等级", name: "F_Level", width: 60, align: "center", | // label: "等级", name: "F_Level", width: 60, align: "center", | ||||
// formatter: function (cellvalue) { | // formatter: function (cellvalue) { | ||||
@@ -121,7 +121,7 @@ var bootstrap = function ($, learun) { | |||||
}); | }); | ||||
}, | }, | ||||
initGrid: function () { | initGrid: function () { | ||||
$('#gridtable').lrAuthorizeJfGrid({ | |||||
$('#gridtable').jfGrid({ | |||||
url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPorcessList', | url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPorcessList', | ||||
headData: [ | headData: [ | ||||
{ | { | ||||
@@ -174,6 +174,18 @@ var bootstrap = function ($, learun) { | |||||
} | } | ||||
}, | }, | ||||
{ | |||||
label: "当前节点办理人", name: "F_Id", width: 300, align: "left", formatterAsync: function (callback, value, row, op, $cell) { | |||||
if (row.F_Id) { | |||||
learun.httpAsyncGet(top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetNextUserMonitor?F_ProcessId=' + row.F_Id, function (res) { | |||||
if (res.code == learun.httpCode.success) { | |||||
callback(res.data); | |||||
} | |||||
}); | |||||
} else | |||||
callback(""); | |||||
} | |||||
}, | |||||
{ label: "发起者", name: "F_CreateUserName", width: 80, align: "center" }, | { label: "发起者", name: "F_CreateUserName", width: 80, align: "center" }, | ||||
{ | { | ||||
label: "时间", name: "F_CreateDate", width: 150, align: "left", | label: "时间", name: "F_CreateDate", width: 150, align: "left", | ||||