Merge branch 'DuGuYang' into feature-dgy-后台优化

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -55,7 +55,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客订单列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(Orders data, string OrderNo, string TradeNo, string RealName, string Mobile, string StoreContact, string ErpCode, string SnNos, string CreateDateData, string SendDateData, string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(Orders data, string OrderNo, string TradeNo, string RealName, string Mobile, string StoreContact, string ErpCode, string SnNos, string PayDateData, string CreateDateData, string SendDateData, string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -143,6 +143,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SnNos=" + SnNos;
             }
+            //支付时间
+            if (!string.IsNullOrEmpty(PayDateData))
+            {
+                string[] datelist = PayDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and PayDate>='" + start + " 00:00:00' and PayDate<='" + end + " 23:59:59'";
+            }
             //下单时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {

Areas/Admin/Views/MainServer/Orders/Index.cshtml

@@ -120,7 +120,13 @@
                         </div>
                     </div>
 
-                    
+                    <div class="layui-inline">
+                        <label class="layui-form-label">支付时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="PayDateData" id="PayDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">下单时间</label>
                         <div class="layui-input-inline">

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -30,6 +30,33 @@ layui.config({
 
     //- 筛选条件-日期
     var laydate = layui.laydate;
+    var layPayeDate = laydate.render({
+        elem: '#PayDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layPayeDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layPayeDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#PayDate').val(value);
+            }
+        }
+    });
     var layCreateDate = laydate.render({
         elem: '#CreateDate',
         type: 'date',