Browse Source

流程设计:列表增加“类型”列,表单增加“模板类型“为自定义流程、系统流程的单选配置;

大厂分支
dyy 4 years ago
parent
commit
151311b79d
4 changed files with 35 additions and 6 deletions
  1. +18
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.cshtml
  2. +10
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Index.js
  3. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeInfoEntity.cs
  4. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeService.cs

+ 18
- 4
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Form.cshtml View File

@@ -43,6 +43,19 @@
<div id="imgUrl"></div> <div id="imgUrl"></div>
</div> </div>
<div class="col-xs-12 lr-form-item" style="top:167px;"> <div class="col-xs-12 lr-form-item" style="top:167px;">
<div class="lr-form-item-title">模板类型<font face="宋体">*</font></div>
<div class="radio">
<label>
<input name="F_Kind" id="F_Kind1" type="radio" value="1" checked="checked" />
自定义流程
</label>
<label>
<input name="F_Kind" id="F_Kind2" type="radio" value="0" />
系统流程
</label>
</div>
</div>
<div class="col-xs-12 lr-form-item" style="top:205px;">
<div class="lr-form-item-title">我的任务<font face="宋体">*</font></div> <div class="lr-form-item-title">我的任务<font face="宋体">*</font></div>
<div class="radio lr-radio" type="lr-radio" id="F_Mark"> <div class="radio lr-radio" type="lr-radio" id="F_Mark">
<label> <label>
@@ -55,7 +68,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-xs-12 lr-form-item" style="top:205px;">
<div class="col-xs-12 lr-form-item" style="top:243px;">
<div class="lr-form-item-title">移动端<font face="宋体">*</font></div> <div class="lr-form-item-title">移动端<font face="宋体">*</font></div>
<div class="radio lr-radio" type="lr-radio" id="F_IsInApp"> <div class="radio lr-radio" type="lr-radio" id="F_IsInApp">
<label> <label>
@@ -68,7 +81,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-xs-12 lr-form-item" style="top:243px;">
<div class="col-xs-12 lr-form-item" style="top:281px;">
<div class="lr-form-item-title">撤销作废执行<font face="宋体">*</font></div> <div class="lr-form-item-title">撤销作废执行<font face="宋体">*</font></div>
<div class="radio lr-radio" type="lr-radio" id="F_CloseDoType"> <div class="radio lr-radio" type="lr-radio" id="F_CloseDoType">
<label> <label>
@@ -85,7 +98,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-xs-12 lr-form-item" style="top:281px;height:140px;">
<div class="col-xs-12 lr-form-item" style="top:319px;height:140px;">
<div id="sql" class="operationDiv" style="position:relative;width:100%;height:100%;padding-top:52px;"> <div id="sql" class="operationDiv" style="position:relative;width:100%;height:100%;padding-top:52px;">
<div style="position:absolute;height:49px;width:100%;padding:0px;top:0;left:0;"> <div style="position:absolute;height:49px;width:100%;padding:0px;top:0;left:0;">
<div class="alert alert-danger" style="position:relative;text-align: left;margin:0;"> <div class="alert alert-danger" style="position:relative;text-align: left;margin:0;">
@@ -122,7 +135,8 @@
</div> </div>
</div> </div>


<div class="col-xs-12 lr-form-item" style="position:relative;width:100%; height: 90%;top:34px;">

<div class="col-xs-12 lr-form-item" style="position:relative;width:100%; height: 70%;top:72px;">
<div class="lr-form-item-title">备注</div> <div class="lr-form-item-title">备注</div>
<textarea id="F_Description" class="form-control" style="height: 100%;"></textarea> <textarea id="F_Description" class="form-control" style="height: 100%;"></textarea>
</div> </div>


+ 10
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFScheme/Index.js View File

@@ -226,6 +226,16 @@ var bootstrap = function ($, learun) {
}); });
} }
}, },
{
label: "类型", name: "F_Kind", width: 100, align: "center",
formatter: function (cellvalue, row) {
if (cellvalue == 1) {
return '<span class=\"label label-primary\" style=\"cursor: pointer;\">自定义流程</span>';
} else {
return '<span class=\"label label-warning\" style=\"cursor: pointer;\">系统流程</span>';
}
}
},
{ {
label: "状态", name: "F_EnabledMark", width: 50, align: "center", label: "状态", name: "F_EnabledMark", width: 50, align: "center",
formatter: function (cellvalue, row) { formatter: function (cellvalue, row) {


+ 5
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeInfoEntity.cs View File

@@ -73,6 +73,11 @@ namespace Learun.Application.WorkFlow
/// <returns></returns> /// <returns></returns>
[Column("IMGURL")] [Column("IMGURL")]
public string imgUrl { get; set; } public string imgUrl { get; set; }
/// <summary>
/// 流程类型1自定义流程0系统流程
/// </summary>
[Column("F_KIND")]
public int? F_Kind { get; set; }
#endregion #endregion


#region 扩展操作 #region 扩展操作


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Scheme/NWFSchemeService.cs View File

@@ -87,7 +87,7 @@ namespace Learun.Application.WorkFlow


var strSql = new StringBuilder(); var strSql = new StringBuilder();
strSql.Append("SELECT * "); strSql.Append("SELECT * ");
strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE t.F_EnabledMark = 1 AND t.F_Mark = 1 AND t.F_Id in " + schemeinfoIds);
strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE t.F_EnabledMark = 1 AND t.F_Mark = 1 AND t.F_Kind = 1 AND t.F_Id in " + schemeinfoIds);


return this.BaseRepository().FindList<NWFSchemeInfoEntity>(strSql.ToString()); return this.BaseRepository().FindList<NWFSchemeInfoEntity>(strSql.ToString());
} }
@@ -157,7 +157,7 @@ namespace Learun.Application.WorkFlow


var strSql = new StringBuilder(); var strSql = new StringBuilder();
strSql.Append("SELECT * "); strSql.Append("SELECT * ");
strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE t.F_EnabledMark = 1 AND t.F_Mark = 1 AND F_IsInApp = 1 AND t.F_Id in " + schemeinfoIds);
strSql.Append(" FROM LR_NWF_SchemeInfo t WHERE t.F_EnabledMark = 1 AND t.F_Mark = 1 AND F_IsInApp = 1 AND t.F_Kind = 1 AND t.F_Id in " + schemeinfoIds);


var queryParam = queryJson.ToJObject(); var queryParam = queryJson.ToJObject();
string keyword = ""; string keyword = "";


Loading…
Cancel
Save