经费开支申报多条件查询

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.cshtml

@@ -7,6 +7,20 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">申请人</div>
+                                    <div id="ApplyUser"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js

@@ -7,6 +7,8 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var startTime;
+    var endTime;
     var processId = '';
     var page = {
         init: function () {
@@ -14,6 +16,37 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '3',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#ApplyUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -148,7 +181,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "填报时间", name: "ApplyTime", width: 100, align: "left" },
+                    { label: "填报时间", name: "ApplyTime", width: 150, align: "left" },
                     {
                         label: "填报人", name: "ApplyUser", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -162,7 +195,7 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "备注", name: "Remark", width: 100, align: "left" },
                     { label: "总金额", name: "SumAmount", width: 100, align: "left" },
-                    { label: "人民币（大写）", name: "UpperAmount", width: 100, align: "left" },
+                    { label: "人民币（大写）", name: "UpperAmount", width: 200, align: "left" },
                     {
                         label: "审批状态", name: "Status", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
@@ -180,10 +213,12 @@ var bootstrap = function ($, learun) {
                 mainId: 'Id',
                 isPage: true
             });
-            page.search();
+            //page.search();
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyService.cs

@@ -39,6 +39,17 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.ApplyTime >= @startTime AND t.ApplyTime <= @endTime ) ");
+                }
+                if (!queryParam["ApplyUser"].IsEmpty())
+                {
+                    dp.Add("ApplyUser", queryParam["ApplyUser"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ApplyUser = @ApplyUser ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<FundsApplyEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)