DuGuYang 3 лет назад
Родитель
Сommit
ab879928fe

+ 13 - 4
Areas/Admin/Controllers/MainServer/LeaderReserveRecordController.cs

@@ -173,7 +173,16 @@ namespace MySystem.Areas.Admin.Controllers
         #endregion
 
         #region 快捷导出Excel
-        public JsonResult QuickExportExcel(LeaderReserveRecord data, string UserIdMakerCode, string SourceMakerCode, string RemarkSelect, string CreateDateData, string SeoKeyword)
+        public IActionResult QuickExportExcel(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string QuickExportExcelDo(string UserIdMakerCode, string SourceMakerCode, string RemarkSelect, string CreateDateData, string SeoKeyword)
         {
 
             string SqlString = " and Status>-1";
@@ -205,13 +214,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 SqlString += " and SeoKeyword=" + SeoKeyword;
             }
-            var Sql = "SELECT c.MakerCode '创客编号',c.RealName '创客姓名',c.CreateDate '创建时间',c.Remark '变动类型',c.Type1Num '电签兑换券张数',c.Type2Num '大POS兑换券张数',d.LeaderBalanceAmount '可提现余额',c.BeforeAmt '使用前剩余额度',c.AfterAmt '使用后剩余额度' FROM(SELECT a.*,b.MakerCode,b.RealName FROM(SELECT Id,UserId,CreateDate,BeforeAmt,AfterAmt,Remark,REPLACE (JSON_EXTRACT (SeoTitle, '$[0].Num'),'\"','') AS 'Type1Num', REPLACE (JSON_EXTRACT (SeoTitle, '$[1].Num'),'\"','') AS 'Type2Num' FROM LeaderReserveRecord WHERE 1=1 " + SqlString + ") a LEFT JOIN Users b ON a.UserId=b.Id) c LEFT JOIN UserAccount d ON c.UserId=d.Id";
+            var Sql = "SELECT c.MakerCode '创客编号',c.RealName '创客姓名',c.CreateDate '创建时间',c.Remark '变动类型',c.Type1Num '电签兑换券张数',c.Type2Num '大POS兑换券张数',d.LeaderBalanceAmount '可提现余额',c.BeforeAmt '使用前剩余额度',c.AfterAmt '使用后剩余额度' FROM(SELECT a.*,b.MakerCode,b.RealName FROM(SELECT Id,UserId,CreateDate,BeforeAmt,AfterAmt,Remark,REPLACE (JSON_EXTRACT (SeoTitle, '$[0].Num'),'\\\"','') AS 'Type1Num', REPLACE (JSON_EXTRACT (SeoTitle, '$[1].Num'),'\\\"','') AS 'Type2Num' FROM LeaderReserveRecord WHERE 1=1 " + SqlString + ") a LEFT JOIN Users b ON a.UserId=b.Id) c LEFT JOIN UserAccount d ON c.UserId=d.Id";
             // 创客姓名、创客编号、创建时间、变动类型、电签兑换券张数、大POS兑换券张数、可提现余额、使用前剩余额度、使用后剩余额度
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
-            var FileName = "盟主储蓄金变动记录";
+            var FileName = "盟主储蓄金变动记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
             RedisDbconn.Instance.AddList("ExportQueue", SendData);
-            return Json("result");
+            return "success";
         }
         #endregion
 

+ 2 - 37
Areas/Admin/Views/MainServer/LeaderReserveRecord/Index.cshtml

@@ -93,9 +93,8 @@
                             </button>
                             @if (RightInfo.Contains("," + right + "_export,"))
                             {
-                                @* <button class="layui-btn" data-type="ExportExcel"><i
-                                    class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button> *@
-                                <button type="button" class="layui-btn" onclick="save()">导出</button>
+                                <button class="layui-btn" data-type="ExportExcel"><i
+                                    class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
                             }
                         </div>
                     </div>
@@ -149,40 +148,6 @@
         <script
             src="/layuiadmin/modules_main/LeaderReserveRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
         <script>
-            function save() {
-                var index = layer.confirm('确定导出吗?', function (index) {
-                    var indexs = layer.load(1, {
-                        shade: [0.5, '#000']
-                    });
-                    var userdata = $("#confirmFrm").serialize();
-                    $.ajax({
-                        type: "POST",
-                        url: "/Admin/LeaderReserveRecord/QuickExportExcel?r=" + Math.random(1),
-                        data: userdata,
-                        dataType: "text",
-                        success: function (data) {
-                            layer.close(index); //关闭弹层
-                            if (data == "success") {
-                                layer.close(indexs); //关闭弹层
-                                layer.msg('成功', {
-                                    time: 1000
-                                }, function () {
-                                    window.location.reload();
-                                });
-                            } else if (data.indexOf("Warning") == 0) {
-                                var datalist = data.split('|');
-                                layer.close(indexs); //关闭弹层
-                                layer.alert(datalist[1], { time: 20000 }, function () {
-                                    window.location.reload();
-                                });
-                            } else {
-                                layer.close(indexs); //关闭弹层
-                                layer.msg(data);
-                            }
-                        }
-                    });
-                });
-            }
         </script>
 </body>
 

+ 1 - 1
wwwroot/layuiadmin/modules_main/ExportExcels_Admin.js

@@ -95,7 +95,7 @@ layui.config({
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'FileName', width: 200, title: '文件名', sort: true }
             , { field: 'FileUrl', width: 500, title: '文件路径', sort: true, templet: '#FileUrlTpl' }
-            , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+            // , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
 

+ 28 - 9
wwwroot/layuiadmin/modules_main/LeaderReserveRecord_Admin.js

@@ -339,15 +339,34 @@ layui.config({
             $(".layuiadmin-card-header-auto select").each(function (i) {
                 userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
             });
-            $.ajax({
-                type: "GET",
-                url: "/Admin/LeaderReserveRecord/ExportExcel?r=" + Math.random(1),
-                data: userdata,
-                dataType: "json",
-                success: function (data) {
-                    data.Obj.unshift(data.Fields);
-                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
-                }
+            var index = layer.confirm('确定导出吗?', function (index) {
+                var indexs = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
+                $.ajax({
+                    // type: "GET",
+                    // url: "/Admin/LeaderReserveRecord/ExportExcel?r=" + Math.random(1),
+                    type: "POST",
+                    url: "/Admin/LeaderReserveRecord/QuickExportExcelDo?r=" + Math.random(1),
+                    data: userdata,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(index); //关闭弹层
+                        if (data == "success") {
+                            layer.close(indexs); //关闭弹层
+                            layer.msg('成功', {
+                                time: 1000
+                            }, function () {
+                                window.location.reload();
+                            });
+                        } else {
+                            layer.close(indexs); //关闭弹层
+                            layer.msg(data);
+                        }
+                        // data.Obj.unshift(data.Fields);
+                        // excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                    }
+                });
             });
         }
         , Open: function () {