lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-05-12 08:38:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

合并流程运行代码

Browse Source
This commit is contained in:
yubaolee 2017-02-06 18:28:36 +08:00
parent 16dae39eae
commit 03622e25e7
12 changed files with 180 additions and 778 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs
View File

@ -3,6 +3,7 @@ using System.Web.Mvc;
using Infrastructure;
using OpenAuth.App;
using OpenAuth.App.SSO;
using OpenAuth.Domain;
using OpenAuth.Mvc.Controllers;
namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
@ -75,6 +76,177 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
}
}
/// <summary>
/// 创建流程实例视图
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult FlowProcessNewForm()
{
return View();
}
#region 提交数据
/// <summary>
/// 创建流程实例
/// </summary>
/// <param name="wfSchemeInfoId">流程模板信息Id</param>
/// <param name="frmData">表单数据</param>
/// <param name="type">0发起，3草稿</param>
/// <returns></returns>
[HttpPost]
public ActionResult CreateProcess(Guid wfSchemeInfoId, string wfProcessInstanceJson, string frmData)
{
WFProcessInstance wfProcessInstanceEntity = wfProcessInstanceJson.ToObject<WFProcessInstance>();
wfProcessInstanceEntity.Id = Guid.Empty;
string text = "创建成功";
if (wfProcessInstanceEntity.EnabledMark == 1)//发起流程
{
_app.CreateInstance(Guid.NewGuid(), wfSchemeInfoId, wfProcessInstanceEntity, frmData);
}
else if (wfProcessInstanceEntity.EnabledMark == 3)//草稿
{
_app.CreateRoughdraft(Guid.NewGuid(), wfSchemeInfoId, wfProcessInstanceEntity, frmData);
text = "草稿保存成功";
}
return Content(text);
}
#endregion
#region 视图功能
/// <summary>
/// 流程监控
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult MonitoringIndex()
{
return View();
}
/// <summary>
/// 流程指派
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult DesignationIndex()
{
return View();
}
/// <summary>
/// 流程进度查看
/// </summary>
/// <returns></returns>\
[HttpGet]
public ActionResult ProcessLookFrom()
{
return View();
}
/// <summary>
/// 流程指派
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult ProcessDesignate()
{
return View();
}
#endregion
#region 获取数据(公用)
/// <summary>
/// 获取进程模板Json
/// </summary>
/// <param name="keyValue"></param>
/// <returns></returns>
[HttpGet]
public ActionResult GetProcessSchemeJson(Guid keyValue)
{
var data = _app.GetProcessSchemeEntity(keyValue);
return Content(data.ToJson());
}
/// <summary>
/// 已办流程进度查看，根据当前访问人的权限查看表单内容
/// </summary>
/// <param name="keyValue"></param>
/// <returns></returns>
[HttpGet]
public ActionResult GetProcessSchemeEntityByUserId(Guid keyValue)
{
var data = _app.GetProcessSchemeByUserId(keyValue);
return Content(data.ToJson());
}
/// <summary>
/// 已办流程进度查看，根据当前节点的权限查看表单内容
/// </summary>
/// <param name="keyValue"></param>
/// <param name="isPermission"></param>
/// <returns></returns>
[HttpGet]
public ActionResult GetProcessSchemeEntityByNodeId(Guid keyValue, string nodeId)
{
var data = _app.GetProcessSchemeEntityByNodeId(keyValue, nodeId);
return Content(data.ToJson());
}
/// <summary>
/// 获取进程信息
/// </summary>
/// <param name="keyValue"></param>
/// <returns></returns>
[HttpGet]
public ActionResult GetProcessInfoJson(Guid keyValue)
{
var processInstance = _app.GetProcessInstanceEntity(keyValue);
var processScheme = _app.GetProcessSchemeEntity(processInstance.ProcessSchemeId);
var JsonData = new
{
processInstance = processInstance,
processScheme = processScheme
};
return Content(JsonData.ToJson());
}
/// <summary>
/// 获取进程实例
/// </summary>
/// <param name="keyValue"></param>
/// <returns></returns>
[HttpGet]
public ActionResult GetProcessInstanceJson(Guid keyValue)
{
var processInstance = _app.GetProcessInstanceEntity(keyValue);
return Content(processInstance.ToJson());
}
#endregion
#region 提交数据
/// <summary>
/// 删除工作流实例进程
/// </summary>
/// <param name="keyValue">主键值</param>
/// <returns></returns>
[HttpPost]
public ActionResult DeleteProcess(Guid keyValue)
{
_app.DeleteProcess(keyValue);
return Content("删除成功。");
}
/// <summary>
/// 审核流程
/// </summary>
/// <param name="processId">工作流实例主键Id</param>
/// <param name="processId">审核数据</param>
/// <returns></returns>
[HttpPost]
public ActionResult VerificationProcess(Guid processId, string verificationData)
{
_app.VerificationProcess(processId, verificationData);
return Content("审核成功。");
}
#endregion
}
}

75
OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowLaunchController.cs
View File

@ -1,75 +0,0 @@
using System;
using System.Web.Mvc;
using Infrastructure;
using OpenAuth.App;
using OpenAuth.Domain;
namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
{
/// <summary>
/// 流程执行
/// <para>李玉宝新增于2017-01-23 9:21:39</para>
/// </summary>
public class FlowLaunchController : Controller
{
private WFProcessInstanceService wfProcessBll;
public FlowLaunchController()
{
wfProcessBll = AutofacExt.GetFromFac<WFProcessInstanceService>();
}
#region 视图功能
//
// GET: /FlowManage/FlowLaunch/
/// <summary>
/// 管理
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult Index()
{
return View();
}
/// <summary>
/// 创建流程实例视图
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult FlowProcessNewForm()
{
return View();
}
#endregion
#region 提交数据
/// <summary>
/// 创建流程实例
/// </summary>
/// <param name="wfSchemeInfoId">流程模板信息Id</param>
/// <param name="frmData">表单数据</param>
/// <param name="type">0发起，3草稿</param>
/// <returns></returns>
[HttpPost]
[ValidateAntiForgeryToken]
public ActionResult CreateProcess(Guid wfSchemeInfoId, string wfProcessInstanceJson, string frmData)
{
WFProcessInstance wfProcessInstanceEntity = wfProcessInstanceJson.ToObject<WFProcessInstance>();
wfProcessInstanceEntity.Id = Guid.Empty;
string text = "创建成功";
if (wfProcessInstanceEntity.EnabledMark == 1)//发起流程
{
wfProcessBll.CreateInstance(Guid.NewGuid(), wfSchemeInfoId, wfProcessInstanceEntity, frmData);
}
else if (wfProcessInstanceEntity.EnabledMark == 3)//草稿
{
wfProcessBll.CreateRoughdraft(Guid.NewGuid(), wfSchemeInfoId, wfProcessInstanceEntity, frmData);
text = "草稿保存成功";
}
return Content(text);
}
#endregion
}
}

152
OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowProcessController.cs
View File

@ -1,152 +0,0 @@
using System;
using System.Web.Mvc;
using Infrastructure;
using OpenAuth.App;
namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
{
public class FlowProcessController :Controller
{
private WFProcessInstanceService wfProcessBll ;
public FlowProcessController(WFProcessInstanceService service)
{
wfProcessBll = service;
}
#region 视图功能
/// <summary>
/// 流程监控
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult MonitoringIndex()
{
return View();
}
/// <summary>
/// 流程指派
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult DesignationIndex()
{
return View();
}
/// <summary>
/// 流程进度查看
/// </summary>
/// <returns></returns>\
[HttpGet]
public ActionResult ProcessLookFrom()
{
return View();
}
/// <summary>
/// 流程指派
/// </summary>
/// <returns></returns>
[HttpGet]
public ActionResult ProcessDesignate()
{
return View();
}
#endregion
#region 获取数据(公用)
/// <summary>
/// 获取进程模板Json
/// </summary>
/// <param name="keyValue"></param>
/// <returns></returns>
[HttpGet]
public ActionResult GetProcessSchemeJson(Guid keyValue)
{
var data = wfProcessBll.GetProcessSchemeEntity(keyValue);
return Content(data.ToJson());
}
/// <summary>
/// 已办流程进度查看，根据当前访问人的权限查看表单内容
/// </summary>
/// <param name="keyValue"></param>
/// <returns></returns>
[HttpGet]
public ActionResult GetProcessSchemeEntityByUserId(Guid keyValue)
{
var data = wfProcessBll.GetProcessSchemeByUserId(keyValue);
return Content(data.ToJson());
}
/// <summary>
/// 已办流程进度查看，根据当前节点的权限查看表单内容
/// </summary>
/// <param name="keyValue"></param>
/// <param name="isPermission"></param>
/// <returns></returns>
[HttpGet]
public ActionResult GetProcessSchemeEntityByNodeId(Guid keyValue, string nodeId)
{
var data = wfProcessBll.GetProcessSchemeEntityByNodeId(keyValue, nodeId);
return Content(data.ToJson());
}
/// <summary>
/// 获取进程信息
/// </summary>
/// <param name="keyValue"></param>
/// <returns></returns>
[HttpGet]
public ActionResult GetProcessInfoJson(Guid keyValue)
{
var processInstance = wfProcessBll.GetProcessInstanceEntity(keyValue);
var processScheme = wfProcessBll.GetProcessSchemeEntity(processInstance.ProcessSchemeId);
var JsonData = new
{
processInstance = processInstance,
processScheme = processScheme
};
return Content(JsonData.ToJson());
}
/// <summary>
/// 获取进程实例
/// </summary>
/// <param name="keyValue"></param>
/// <returns></returns>
[HttpGet]
public ActionResult GetProcessInstanceJson(Guid keyValue)
{
var processInstance = wfProcessBll.GetProcessInstanceEntity(keyValue);
return Content(processInstance.ToJson());
}
#endregion
#region 提交数据
/// <summary>
/// 删除工作流实例进程
/// </summary>
/// <param name="keyValue">主键值</param>
/// <returns></returns>
[HttpPost]
[ValidateAntiForgeryToken]
public ActionResult DeleteProcess(Guid keyValue)
{
wfProcessBll.DeleteProcess(keyValue);
return Content("删除成功。");
}
/// <summary>
/// 审核流程
/// </summary>
/// <param name="processId">工作流实例主键Id</param>
/// <param name="processId">审核数据</param>
/// <returns></returns>
[HttpPost]
[ValidateAntiForgeryToken]
public ActionResult VerificationProcess(Guid processId, string verificationData)
{
wfProcessBll.VerificationProcess(processId, verificationData);
return Content("审核成功。");
}
#endregion
}
}

2
OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/PreviewIndex.cshtml
View File

@ -39,7 +39,7 @@
}
else {
$.SetForm({
url: "../../FlowManage/FlowProcess/GetProcessSchemeJson",
url: "../../FlowManage/FlowInstances/GetProcessSchemeJson",
param: { keyValue: processSchemeId },
success: function (data) {
schemeContent = JSON.parse(JSON.parse(data.SchemeContent).SchemeContent);

4
OpenAuth.Mvc/Areas/FlowManage/Views/FlowLaunch/FlowProcessNewForm.cshtml → OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/FlowProcessNewForm.cshtml
View File

@ -27,7 +27,7 @@
_postData["wfLevel"] = $('input[name="wfLevel"]:checked').val();
var _data = $("#frmpreview").frmGetData();
$.SaveForm({
url: "../../FlowManage/FlowLaunch/CreateProcess",
url: "../../FlowManage/FlowInstances/CreateProcess",
param: { "wfSchemeInfoId": keyValue, "frmData": JSON.stringify(_data), "wfProcessInstanceJson": JSON.stringify(_postData) },
loading: "正在保存数据...",
success: function () { }
@ -43,7 +43,7 @@
_postData["wfLevel"] = $('input[name="wfLevel"]:checked').val();
var _data = $("#frmpreview").frmGetData();
$.SaveForm({
url: "../../FlowManage/FlowLaunch/CreateProcess",
url: "../../FlowManage/FlowInstances/CreateProcess",
param: { "wfSchemeInfoId": keyValue, "frmData": JSON.stringify(_data), "wfProcessInstanceJson": JSON.stringify(_postData) },
loading: "正在保存数据...",
success: function () { }

2
OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/ProcessLookForm.cshtml
View File

@ -8,7 +8,7 @@
$(function () {
var schemeContent;
$.SetForm({
url: "../../FlowManage/FlowProcess/GetProcessSchemeJson",
url: "../../FlowManage/FlowInstances/GetProcessSchemeJson",
param: { keyValue: processSchemeId },
success: function (data) {
schemeContent = JSON.parse(JSON.parse(data.SchemeContent).SchemeContent);

4
OpenAuth.Mvc/Areas/FlowManage/Views/FlowInstances/VerificationForm.cshtml
View File

@ -138,7 +138,7 @@
$('#frmtab').height($.windowHeight() - 40);
$('#VerificationOpinion').height($.windowHeight() - 360);
$.SetForm({
url: "../../FlowManage/FlowProcess/GetProcessSchemeEntityByNodeId",
url: "../../FlowManage/FlowInstances/GetProcessSchemeEntityByNodeId",
param: { keyValue: processSchemeId, nodeId: activityId },
success: function (data) {
schemeContent = JSON.parse(JSON.parse(data.SchemeContent).SchemeContent);
@ -210,7 +210,7 @@
_postdata["VerificationFinally"] = _verificationFinally;
$.ConfirmAjax({
msg: "请确认是否要【提交审核】流程？",
url: "../../FlowManage/FlowProcess/VerificationProcess",
url: "../../FlowManage/FlowInstances/VerificationProcess",
param: { processId: processInstanceId, verificationData: JSON.stringify(_postdata) },
success: function (data) {
$.currentIframe().callBack();

151
OpenAuth.Mvc/Areas/FlowManage/Views/FlowLaunch/Index.cshtml
View File

@ -1,151 +0,0 @@
@{
ViewBag.Title = "发起流程";
Layout = "~/Views/Shared/_Index.cshtml";
}
<script>
$(function () {
InitialPage();
GetSchemeType();
GetGrid();
GetList();
});
//初始化页面
function InitialPage() {
//resize重设(表格、树形)宽高
$(window).resize(function (e) {
window.setTimeout(function () {
$("#taskblock").height($(window).height() - 83);
$("#itemTree").height($(window).height() - 52);
}, 200);
e.stopPropagation();
});
}
//加载树
function GetSchemeType() {
$.SetForm({
url: "../../SystemManage/DataItemDetail/GetDataItemTreeJson",
param: { EnCode: "FlowSort" },
success: function (data) {
$.each(data, function (id,item) {
var row = '<li><a data-value="' + item.id + '">' + item.text + '</a></li>';
$('#SchemeType').find('ul').append(row);
});
$('#SchemeType').find('li>a').click(function () {
var id = $(this).attr('data-value');
var text = $(this).html();
var queryJson = { SchemeType: id };
GetList({ queryJson: JSON.stringify(queryJson) });
$('#SchemeType').find('.dropdown-text').html(text);
});
}
})
}
//加载模板列表
function GetList(param) {
$.SetForm({
url: "../../FlowManage/FlowDesign/GetListJson",
param: param,
success: function (data) {
var $flowlist = $("#flowlist");
$flowlist.html("");
if (data.length > 0) {
$('.no-data').hide();
}
else {
$('.no-data').show();
}
$.each(data, function (i,item) {
var _listhtml = '<li><div style="width: 160px; line-height: 38px;margin-top:11px; float: right;"><a class="btn btn-success createmodel" style="margin-right:4px;">快速新建</a><a class="btn btn-warning previewmodel">模板预览</a></div>';
_listhtml += '<div style="float: left;">';
_listhtml += '<span class="item-text">' + item.schemecode + '/' + item.schemename + '</span>';
_listhtml += '<div><span class=\"label label-success-learun\" data-toggle="tooltip" data-placement="top" title="流程分类" >' + item.schemetypename + '</span>';
_listhtml += '<span style="margin-left:5px;" class=\"label label-inverse-learun\" data-toggle="tooltip" data-placement="top" title="版本" >' + item.schemeversion + '</span>';
_listhtml += '</div><p>By.' + (item.modifyusername == null ? item.createusername : item.modifyusername) + '-' + (item.modifydate == null ? item.createdate : item.modifydate) + (item.description == null ? '' : (' | 备注:' + item.description)) + '</p>';
_listhtml += '</div></li>';
var $_listhtml = $(_listhtml);
$_listhtml.find('.previewmodel')[0].wfschemeInfoId = item.id;
$_listhtml.find('.previewmodel')[0].schemeVersion = item.schemeversion;
$_listhtml.find('.previewmodel')[0].schemename = item.schemecode + '/' + item.schemename;
$_listhtml.find('.createmodel')[0].wfschemeInfoId = item.id;
$_listhtml.find('.createmodel')[0].schemename = item.schemecode + '/' + item.schemename;
$flowlist.append($_listhtml);
});
$('[data-toggle="tooltip"]').tooltip();
//快速新建
$('.createmodel').click(function () {
var $_btn = $(this).context;
var _wfschemeInfoId = $_btn.wfschemeInfoId;
var _schemename = $_btn.schemename;
dialogOpen({
id: "FlowProcessBuider",
title: '快速新建【' + _schemename + '】',
url: '/FlowManage/FlowLaunch/FlowProcessNewForm?keyValue=' + _wfschemeInfoId,
width: "1100px",
height: "700px",
btn: null,
callBack: function (iframeId) {
}
});
});
//模板预览
$('.previewmodel').click(function () {
var $_btn = $(this).context;
var _wfschemeInfoId = $_btn.wfschemeInfoId;
var _schemeVersion = $_btn.schemeVersion;
var _schemename = $_btn.schemename;
top.tablist.newTab({ id: _wfschemeInfoId + _schemeVersion, title: '流程预览【' + _schemename + '】', closed: true, icon: "fa fa fa-eye", url: top.contentPath + '/FlowManage/FlowLaunch/PreviewIndex?keyValue=' + _wfschemeInfoId + "&schemeVersion=" + _schemeVersion });
});
}
});
}
//加载表格
function GetGrid() {
$("#taskblock").height($(window).height() - 83);
//查询事件
$("#btn_Search").click(function () {
var queryJson = { Keyword: $("#txt_Keyword").val() };
GetList({ queryJson: JSON.stringify(queryJson) });
});
}
</script>
<div class="titlePanel">
<div class="title-search">
<table>
<tr>
<td>
<div id="SchemeType" class="btn-group">
<a class="btn btn-default dropdown-text" data-toggle="dropdown">选择流程分类</a>
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
<ul class="dropdown-menu"></ul>
</div>
</td>
<td style="padding-left: 5px;">
<input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" style="width: 200px;" />
</td>
<td style="padding-left: 5px;">
<a id="btn_Search" class="btn btn-primary"><i class="fa fa-search"></i>&nbsp;查询</a>
</td>
</tr>
</table>
</div>
<div class="toolbar">
<div class="btn-group">
<a id="lr-replace" class="btn btn-default" onclick="reload();"><i class="fa fa-refresh"></i>&nbsp;刷新</a>
</div>
</div>
</div>
<div class="taskblockPanel">
<div id="taskblock" class="taskblock">
<ul id="flowlist"></ul>
</div>
<div class="no-data"></div>
</div>

226
OpenAuth.Mvc/Areas/FlowManage/Views/FlowMyProcess/Index.cshtml
View File

@ -1,226 +0,0 @@
@{
ViewBag.Title = "我的流程";
Layout = "~/Views/Shared/_Index.cshtml";
}
<script src="~/Content/scripts/plugins/pagination/jquery.pagination-1.2.7.js"></script>
<link href="~/Content/scripts/plugins/pagination/jquery.pagination.css" rel="stylesheet" />
<script>
var params="";
$(function () {
InitialPage();
GetSchemeType();
GetGrid();
});
//初始化页面
function InitialPage() {
//resize重设(表格、树形)宽高
$(window).resize(function (e) {
window.setTimeout(function () {
$("#taskblock").height($(window).height() - 131);
$("#itemTree").height($(window).height() - 52);
}, 200);
e.stopPropagation();
});
}
//加载树
function GetSchemeType() {
$.SetForm({
url: "../../SystemManage/DataItemDetail/GetDataItemTreeJson",
param: { EnCode: "FlowSort" },
success: function (data) {
$.each(data, function (id, item) {
var row = '<li><a data-value="' + item.id + '">' + item.text + '</a></li>';
$('#SchemeType').find('ul').append(row);
});
$('#SchemeType').find('li>a').click(function () {
var id = $(this).attr('data-value');
var text = $(this).html();
var queryJson = { SchemeType: id };
params = { queryJson: JSON.stringify(queryJson) };
$("#girdPager").page('remote', 0, params);
$('#SchemeType').find('.dropdown-text').html(text);
});
}
})
}
//加载表格
function GetGrid() {
$("#taskblock").height($(window).height() - 131);
$("#girdPager").panginationEx({
url: "../../FlowManage/FlowProcess/GetRuntimePageListJson",
success: function (data) {
var $flowlist = $("#flowlist");
$flowlist.html("");
if (data.length > 0) {
$('.no-data').hide();
}
else {
$('.no-data').show();
}
$.each(data, function (i, item) {
var _listhtml = '<li><div style="width: ' + (item.isfinish == 4 ? '239px' : '160px') + '; line-height: 38px;margin-top:11px; float: right;">' + (item.isfinish == 4 ? '<a class="btn btn-warning applicationmodel" style="margin-right:4px;" >重新申请</a>' : '') + '<a class="btn btn-success previewmodel" style="margin-right:4px;">进度查看</a><a class="btn btn-danger deletemodel" >流程召回</a></div>';
_listhtml += '<div style="float: left;">';
_listhtml += '<span class="item-text">' + item.code + '/' + item.customname + '</span>';
_listhtml += '<div><span class=\"label label-success-learun\" data-toggle="tooltip" data-placement="top" title="流程分类" >' + item.schemetypename + '</span>';
_listhtml += '<span style="margin-left:5px;" class=\"label label-inverse-learun\" data-toggle="tooltip" data-placement="top" title="当前节点">' + item.activityname + '</span>';
if (item.enabledmark == 1) {
if (item.isfinish == 3) {
_listhtml += '<span style="margin-left:5px;" class=\"label label-danger\" data-toggle="tooltip" data-placement="top" title="状态">不通过</span>';
}
else if (item.isfinish == 1) {
_listhtml += '<span style="margin-left:5px;" class=\"label label-success\" data-toggle="tooltip" data-placement="top" title="状态">通过完成</span>';
}
else if (item.isfinish == 0) {
_listhtml += '<span style="margin-left:5px;" class=\"label label-info\" data-toggle="tooltip" data-placement="top" title="状态" >处理中</span>';
}
else if (item.isfinish == 4) {
_listhtml += '<span style="margin-left:5px;" class=\"label label-warning\" data-toggle="tooltip" data-placement="top" title="状态" >被驳回</span>';
}
}
else {
_listhtml += '<span style="margin-left:5px;" class=\"label label-important-learun\" data-toggle="tooltip" data-placement="top" title="状态" >暂停</span>';
}
switch (item.wflevel)
{
case 1:
_listhtml += '<span style="margin-left:5px;" class=\"label label-danger\" data-toggle="tooltip" data-placement="top" title="等级" >重要</span>';
break;
case 2:
_listhtml += '<span style="margin-left:5px;" class=\"label label-success\" data-toggle="tooltip" data-placement="top" title="等级" >普通</span>';
break;
case 3:
_listhtml += '<span style="margin-left:5px;" class=\"label label-warning\" data-toggle="tooltip" data-placement="top" title="等级" >一般</span>';
break;
}
_listhtml += '</div><p>By.' + item.createusername + '-' + item.createdate + ' | 备注：' + item.description + '</p>';
_listhtml += '</div></li>';
var $_listhtml = $(_listhtml);
$_listhtml.find('.previewmodel')[0].processInstanceId = item.id;
$_listhtml.find('.previewmodel')[0].activityId = item.activityid;
$_listhtml.find('.previewmodel')[0].processSchemeId = item.processschemeid;
$_listhtml.find('.previewmodel')[0].processname = item.code + '/' + item.customname;
$_listhtml.find('.deletemodel')[0].processInstanceId = item.id;
$_listhtml.find('.deletemodel')[0].processSchemeId = item.processschemeid;
if ($_listhtml.find('.applicationmodel').length > 0)
{
$_listhtml.find('.applicationmodel')[0].processInstanceId = item.id;
$_listhtml.find('.applicationmodel')[0].activityId = item.activityid;
$_listhtml.find('.applicationmodel')[0].processSchemeId = item.processschemeid;
$_listhtml.find('.applicationmodel')[0].processname = item.code + '/' + item.customname;
}
$flowlist.append($_listhtml);
});
$('[data-toggle="tooltip"]').tooltip();
//进度查看
$('.previewmodel').click(function () {
var $_btn = $(this).context;
var _processInstanceId = $_btn.processInstanceId;
var _processSchemeId = $_btn.processSchemeId;
var _processname = $_btn.processname;
var _activityId = $_btn.activityId;
dialogOpen({
id: "ProcessLookForm",
title: '进度查看【' + _processname + '】',
url: '/FlowManage/FlowMyProcess/ProcessLookForm?processSchemeId=' + _processSchemeId + '&activityId=' + _activityId,
width: "1100px",
height: "700px",
btn:null,
callBack: function (iframeId) {
}
});
});
//流程召回
$('.deletemodel').click(function () {
var $_btn = $(this).context;
var $this = $(this);
var _ProcessInstanceId = $_btn.processInstanceId;
if (_ProcessInstanceId) {
$.ConfirmAjax({
msg: "注：您确定要召回吗？该操作将无法恢复",
url: "../../FlowManage/FlowProcess/DeleteVirtualProcess",
param: { keyValue: _ProcessInstanceId },
success: function (data) {
$("#girdPager").page('remote', '', params);
}
})
} else {
dialogMsg('请选择需要召回的流程！', 0);
}
});
//重新申请
$('.applicationmodel').click(function () {
var $_btn = $(this).context;
var _processInstanceId = $_btn.processInstanceId;
var _processSchemeId = $_btn.processSchemeId;
var _processname = $_btn.processname;
var _activityId = $_btn.activityId;
dialogOpen({
id: "ProcessAgainNewForm",
title: '重新申请【' + _processname + '】',
url: '/FlowManage/FlowMyProcess/ProcessAgainNewForm?keyValue=' + _processInstanceId + '&activityId=' + _activityId,
width: "1100px",
height: "700px",
btn: null,
callBack: function (iframeId) {
}
});
});
},
sortname: "CreateDate desc"
});
//查询事件
$("#btn_Search").click(function () {
var queryJson = { Keyword: $("#txt_Keyword").val() };
params = { queryJson: JSON.stringify(queryJson) };
$("#girdPager").page('remote', 0, params);
});
}
//回调函数
function callBack() {
$("#girdPager").page('remote', '', params);
}
</script>
<div class="titlePanel">
<div class="title-search">
<table>
<tr>
<td>
<div id="SchemeType" class="btn-group">
<a class="btn btn-default dropdown-text" data-toggle="dropdown">选择流程分类</a>
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
<ul class="dropdown-menu"></ul>
</div>
</td>
<td style="padding-left: 5px;">
<input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" style="width: 200px;" />
</td>
<td style="padding-left: 5px;">
<a id="btn_Search" class="btn btn-primary"><i class="fa fa-search"></i>&nbsp;查询</a>
</td>
</tr>
</table>
</div>
<div class="toolbar">
<div class="btn-group">
<a id="lr-replace" class="btn btn-default" onclick="reload();"><i class="fa fa-refresh"></i>&nbsp;刷新</a>
</div>
</div>
</div>
<div class="taskblockPanel">
<div id="taskblock" class="taskblock">
<ul id="flowlist"></ul>
</div>
<div id="girdPager" class="m-pagination"></div>
<div class="no-data"></div>
</div>

161
OpenAuth.Mvc/Areas/FlowManage/Views/FlowMyProcess/ProcessAgainNewForm.cshtml
View File

@ -1,161 +0,0 @@
@{
ViewBag.Title = "再次申请";
Layout = "~/Views/Shared/_FlowForm.cshtml";
}
<script>
var keyValue = request('keyValue');
var ProcessSchemeId = "";
var activityId =request('activityId');
$(function () {
initialPage();
})
//初始化页面
function initialPage() {
$('.FlowPanelall').height($.windowHeight() - 40);
$('#Description').height($.windowHeight() - 390);
//获取表单
$.SetForm({
url: "../../FlowManage/FlowProcess/GetProcessInfoJson",
param: { keyValue: keyValue },
success: function (data) {
var _schemeContent = JSON.parse(JSON.parse(data.processScheme.SchemeContent).SchemeContent);
var _frmdata = JSON.parse(JSON.parse(data.processScheme.SchemeContent).frmData);
$('#frmpreview').frmPreview({
tablecotent: _schemeContent.Frm.FrmContent
});
$('#frmpreview').frmSetData(_frmdata);
$('#ProcessInfo').SetWebControls(data.processInstance);
$('#wfLevel' + data.processInstance.wfLevel).trigger("click");
ProcessSchemeId = data.processInstance.ProcessSchemeId;
var _node = "";
for(var i in _schemeContent.Flow.nodes)
{
if(_schemeContent.Flow.nodes[i].id == activityId)
{
_node = _schemeContent.Flow.nodes[i];
break;
}
}
var _username = top.clientuserData[_node.setInfo.UserId] == undefined ? _node.setInfo.UserId : top.clientuserData[_node.setInfo.UserId].RealName;
_username = _username == "System" ? '超级管理员' : '_username';
$('#ruser').html('驳回人:' + _username + (_node.setInfo.TagedTime != undefined ?'-' +_node.setInfo.TagedTime:''));
$('#rDescription').html('备注:' + _node.setInfo.description);
}
});
}
//提交表单
function btn_Finish() {
if (!$('#ProcessInfo').Validform()) {
return false;
}
var _postData = $("#ProcessInfo").GetWebControls(keyValue);
_postData["EnabledMark"] = 1;
_postData["ProcessSchemeId"] = ProcessSchemeId;
_postData["wfLevel"] = $('input[name="wfLevel"]:checked').val();
var _data = $("#frmpreview").frmGetData();
$.SaveForm({
url: "../../FlowManage/FlowRoughdraft/EditionRoughdraftProcess",
param: { "keyValue": keyValue, "frmData": JSON.stringify(_data), "wfProcessInstanceJson": JSON.stringify(_postData) },
loading: "正在保存数据...",
success: function () {
$.currentIframe().callback();
}
})
}
</script>
<div class="FlowPanelall">
<div id="frmpreview" class="tab-pane app_layout app_preview active">
</div>
</div>
<div class="FlowInfoPanel" id="ProcessInfo">
<div class="alert alert-danger" style="text-align: left; margin-bottom: 10px;height:98px;overflow-y:auto;">
<p><i class="fa fa-warning alert-dismissible" style="position: relative; top: 1px; font-size: 15px; padding-right: 5px;"></i>
此流程被驳回，需要重新申请!
</p>
<p id="ruser">驳回人：</p>
<p id="rDescription">备注：</p>
</div>
<div style="color:#9f9f9f;padding-bottom:15px;padding-left:5px;"><i style="padding-right:5px;" class="fa fa-info-circle"></i><span>填写左侧表单和实例信息,重新申请</span></div>
<table class="form">
<tr>
<td class="formTitle">流程实例编号<font face="宋体">*</font></td>
</tr>
<tr>
<td class="formValue">
<input id="Code" disabled type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</td>
</tr>
<tr>
<td class="formTitle">自定义标题<font face="宋体">*</font></td>
</tr>
<tr>
<td class="formValue">
<input id="CustomName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</td>
</tr>
<tr>
<td class="formTitle">重要等级<font face="宋体">*</font></td>
</tr>
<tr>
<td class="formValue">
<div class="rdio rdio-color_a"><input name="wfLevel" id="wfLevel1" value="1" type="radio" /><label for="wfLevel1">重要</label></div>
<div class="rdio rdio-color_f"><input name="wfLevel" id="wfLevel2" value="2" type="radio" checked /><label for="wfLevel2">普通</label></div>
<div class="rdio rdio-color_c"><input name="wfLevel" id="wfLevel3" value="3" type="radio" /><label for="wfLevel3">一般</label></div>
</td>
</tr>
<tr>
<td class="formTitle">备注</td>
</tr>
<tr>
<td class="formValue">
<textarea id="Description" class="form-control" style="height: 383px;"></textarea>
</td>
</tr>
</table>
</div>
<div class="form-button">
<a id="btn_finish" class="btn btn-success" onclick="btn_Finish();">完成提交</a>
</div>
<style>
body {
overflow: hidden;
}
.app_preview .item_field_value {
width: 664px;
}
.app_preview .item_row {
background-color: #fff;
}
.app_layout .item_field_label {
background-color: #fff;
}
.FlowPanelall {
width: 800px;
float: left;
overflow-y:auto;
}
.FlowInfoPanel {
float: right;
width: 300px;
height: 659px;
z-index: 1000;
background: rgba(0,0,0,0.01);
padding: 10px;
border-left: 1px solid #ccc;
}
.form .formTitle {
text-align: left;
padding-left: 5px;
}
form .formTitle font {
right: auto !important;
margin-left: 5px;
}
.formValue input, .formValue textarea {
border-radius: 5px;
}
input, textarea {
background: #fff !important;
}
</style>

2
OpenAuth.Mvc/BllScripts/flowDesign.js
View File

@ -131,7 +131,7 @@ function addInstance() {
skin: 'layui-layer-rim', //加上边框
area: ['1200px', '700px'], //宽高
maxmin: true, //开启最大化最小化按钮
content: '/FlowManage/FlowLaunch/FlowProcessNewForm?keyValue=' + selected.Id,
content: '/FlowManage/FlowInstances/FlowProcessNewForm?keyValue=' + selected.Id,
});
}

7
OpenAuth.Mvc/OpenAuth.Mvc.csproj
View File

@ -142,8 +142,6 @@
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\FilterConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="Areas\FlowManage\Controllers\FlowLaunchController.cs" />
<Compile Include="Areas\FlowManage\Controllers\FlowProcessController.cs" />
<Compile Include="Areas\FlowManage\Controllers\FormDesignController.cs" />
<Compile Include="Areas\FlowManage\Controllers\FlowDesignController.cs" />
<Compile Include="Areas\FlowManage\FlowManageAreaRegistration.cs" />
@ -1464,11 +1462,8 @@
<Content Include="Content\styles\fonts\fontawesome-webfont.woff" />
<Content Include="Content\styles\fonts\fontawesome-webfont.woff2" />
<Content Include="Content\styles\fonts\FontAwesome.otf" />
<Content Include="Areas\FlowManage\Views\FlowMyProcess\Index.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowMyProcess\ProcessAgainNewForm.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowInstances\ProcessLookForm.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowLaunch\FlowProcessNewForm.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowLaunch\Index.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowInstances\FlowProcessNewForm.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowDesign\PreviewIndex.cshtml" />
<Content Include="Areas\FlowManage\Views\FlowInstances\VerificationForm.cshtml" />
<Content Include="Areas\FlowManage\Views\FormDesign\Index.cshtml" />