调整时间筛选

Areas/Admin/Controllers/MainServer/MerchantDepositSetController.cs

@@ -51,12 +51,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 商户押金设置记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MerchantDepositSet data, string UserIdMakerCode, string UserIdRealName, int page = 1, int limit = 30)
+        public JsonResult IndexData(MerchantDepositSet data, string UserIdMakerCode, string UserIdRealName, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
+            // Fields.Add("CreateDate", "3"); //时间
             Fields.Add("MerNo", "1"); //商户编号
             Fields.Add("SnNo", "1"); //机具SN
 
@@ -72,7 +72,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
             }
-
+            //创建时间
+            if(!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MerchantDepositSet", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

wwwroot/layuiadmin/modules_main/MerchantDepositSet_Admin.js

@@ -32,7 +32,7 @@ layui.config({
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
         elem: '#CreateDate',
-        type: 'datetime',
+        type: 'date',
         range: true,
         trigger: 'click',
         change: function (value, date, endDate) {