Sfoglia il codice sorgente

修改券显示问题
冻结账户临时记录操作人

DuGuYang 4 anni fa
parent
commit
b0dfc8a7ab

+ 1 - 8
Areas/Admin/Controllers/MainServer/PosCouponsController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具券列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosCoupons data, string CreateDateData, string UseDateData, string UserIdMakerCode, string LeaderIdMakerCode, string ExchangeCode, string IsUseSelect, string IsLockSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosCoupons data, string UseDateData, string UserIdMakerCode, string LeaderIdMakerCode, string ExchangeCode, string IsUseSelect, string IsLockSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -85,13 +85,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and IsLock=" + IsLockSelect;
             }
-            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'";
-            }
 
             if (!string.IsNullOrEmpty(UseDateData))
             {

+ 0 - 7
Areas/Admin/Views/MainServer/PosCoupons/Index.cshtml

@@ -44,13 +44,6 @@
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">交易日期</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
-                            autocomplete="off">
-                        </div>
-                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">使用时间</label>
                         <div class="layui-input-inline">

+ 0 - 1
wwwroot/layuiadmin/modules_main/PosCoupons_Admin.js

@@ -123,7 +123,6 @@ layui.config({
             , { field: 'UserIdRealName', width: 200, title: '创客真实姓名', sort: true }
             , { field: 'LeaderUserIdMakerCode', width: 200, title: '盟主编号', sort: true }
             , { field: 'LeaderUserIdRealName', width: 200, title: '盟主真实姓名', sort: true }
-            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'ExchangeCode', width: 200, title: '兑换码', sort: true }
             , { field: 'IsUseName', width: 200, title: '是否使用', sort: true }
             , { field: 'IsLockName', width: 200, title: '是否锁定', sort: true }

+ 1 - 0
wwwroot/layuiadmin/modules_main/UserAccount_Admin.js

@@ -110,6 +110,7 @@ layui.config({
                 { field: 'SeoDescription', width: 100, title: '备注' ,sort: true},
                 // { field: 'CreateDate', width: 200, title: '创建时间' ,sort: true},
                 { field: 'UpdateDate', width: 160, title: '冻结/解冻时间' ,sort: true},
+                { field: 'UpdateMan', width: 160, title: '操作信息' ,sort: true},
                 {
                     title: '操作',
                     width: 400,