@@ -24,7 +24,10 @@ | |||||
<input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" /> | <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" /> | ||||
</div> | </div> | ||||
<div class="lr-layout-tool-item"> | <div class="lr-layout-tool-item"> | ||||
<div id="F_EnabledMark" style="width: 100px;"></div> | |||||
<div id="F_EnabledMark" style="width: 115px;"></div> | |||||
</div> | |||||
<div class="lr-layout-tool-item"> | |||||
<div id="F_Category" style="width: 115px;"></div> | |||||
</div> | </div> | ||||
<div class="lr-layout-tool-item"> | <div class="lr-layout-tool-item"> | ||||
<a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i> <span class="lrlg">查询</span></a> | <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i> <span class="lrlg">查询</span></a> | ||||
@@ -49,11 +49,17 @@ var bootstrap = function ($, learun) { | |||||
value: "id", | value: "id", | ||||
text: "text" | 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 () { | $('#btn_Search').on('click', function () { | ||||
var keyword = $('#txt_Keyword').val(); | 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 () { | $('#lr_refresh').on('click', function () { | ||||
@@ -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 Categofy = queryParam["F_Category"].ToString(); | ||||
var codeList = this.BaseRepository().FindList<NWFSchemeInfoEntity>(a => a.F_Category == Categofy).Select(a => a.F_Code); | var codeList = this.BaseRepository().FindList<NWFSchemeInfoEntity>(a => a.F_Category == Categofy).Select(a => a.F_Code); | ||||