diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexStatistics.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexStatistics.cshtml index 77e928a96..adf96aed0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexStatistics.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexStatistics.cshtml @@ -24,7 +24,10 @@
-
+
+
+
+
 查询 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexStatistics.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexStatistics.js index 9a852c9d6..533d619fb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexStatistics.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexStatistics.js @@ -49,11 +49,17 @@ var bootstrap = function ($, learun) { value: "id", text: "text" }); - + $('#F_Category').lrselect({ + placeholder: '请选择分类', + url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailTree', + param: { itemCode: 'FlowSort' }, + value: 'value', + text: 'text' + }); // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword, F_EnabledMark: $('#F_EnabledMark').lrselectGet() }); + page.search({ keyword: keyword, F_EnabledMark: $('#F_EnabledMark').lrselectGet(), F_Category: $('#F_Category').lrselectGet() }); }); // 刷新 $('#lr_refresh').on('click', function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs index 4033a4bee..e93561a18 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs @@ -121,7 +121,7 @@ namespace Learun.Application.WorkFlow } } //流程类别 - if (!queryParam["F_Category"].IsEmpty()) // 1:未完成 2:已完成 + if (!queryParam["F_Category"].IsEmpty()) { var Categofy = queryParam["F_Category"].ToString(); var codeList = this.BaseRepository().FindList(a => a.F_Category == Categofy).Select(a => a.F_Code);