diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml
index 4f4bb8414..874255043 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml
@@ -20,6 +20,24 @@
@*
*@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js
index 6e082bee0..0fc92a8fa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.js
@@ -43,6 +43,9 @@ var bootstrap = function ($, learun) {
page.search();
}
});
+ $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+ page.search(queryJson);
+ }, 220, 400);
// 查询
$('#btn_Search').on('click', function () {
var keyword = $('#txt_Keyword').val();
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 f2896c352..7a3d5be18 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
@@ -805,7 +805,25 @@ namespace Learun.Application.WorkFlow
strSql.Append(" and t.F_IsFinished = 1 ");
}
}
- //用印名称、用印事项、用印时间
+ //用印名称
+ if (!queryParam["LC_yzmc"].IsEmpty())
+ {
+ dp.Add("LC_yzmc", "%" + queryParam["LC_yzmc"].ToString() + "%", DbType.String);
+ strSql.Append(" AND y.LC_yzmc like @LC_yzmc ");
+ }
+ //用印事项
+ if (!queryParam["LC_yysx"].IsEmpty())
+ {
+ dp.Add("LC_yysx", "%" + queryParam["LC_yysx"].ToString() + "%", DbType.String);
+ strSql.Append(" AND y.LC_yysx like @LC_yysx ");
+ }
+ //用印时间
+ if (!queryParam["LC_yysj"].IsEmpty())
+ {
+ dp.Add("LC_yysj", "%" + queryParam["LC_yysj"].ToString() + "%", DbType.String);
+ strSql.Append(" AND y.LC_yysj like @LC_yysj ");
+ }
+ //关键字:用印名称、用印事项、用印时间
if (!queryParam["keyword"].IsEmpty())
{
dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);