Merge branch 'feature-dgy-导入改为队列操作' into feature-dgy-后台测试

wwwroot/layuiadmin/modules_main/PreAmountRecord_Admin.js

@@ -17,39 +17,6 @@ function ConfirmImport() {
     });
 }
 
-function CheckImport(table, key, loadindex, index) {
-    $.ajax({
-        url: "/Admin/PreAmountRecord/CheckImportV2?r=" + Math.random(1),
-        data: "key=" + key,
-        dataType: "json",
-        success: function (data) {
-            if (data.status == 1) {
-                layer.msg("成功操作" + data.data + "条", {
-                    time: 2000
-                }, function () {
-                    layer.close(index); //关闭弹层
-                    layer.close(loadindex);
-                    table.reload('LAY-list-manage'); //数据刷新
-                });
-            } else if (data.status == 2) {
-                layer.close(index); //关闭弹层
-                layer.close(loadindex);
-                var content = '';
-                for (var i = 0; i < data.errList.length; i++) {
-                    content += data.errList[i] + '<br/>'
-                }
-                layer.alert(content);
-            } else {
-                layer.msg(data.data, {
-                    time: 1000
-                }, function () {
-                    CheckImport(table, key, loadindex, index);
-                });
-            }
-        }
-    });
-}
-
 var excel;
 layui.config({
     base: '/layuiadmin/' //静态资源所在路径
@@ -348,63 +315,17 @@ layui.config({
             layer.full(perContent);
         }
         , ImportData: function () {
-            // ExcelKind = 1;
-            // layer.open({
-            //     type: 1,
-            //     title: '导入',
-            //     maxmin: false,
-            //     area: ['460px', '280px'],
-            //     content: $('#excelForm'),
-            //     cancel: function () {
-            //     }
-            // });
-            // $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
-
-            var perContent = layer.open({
-                type: 2,
-                title: '导入小分仓临额提现结果',
-                content: 'ImportByQueue?ExcelKind=1',
-                maxmin: true,
-                area: ['650px', '350px'],
-                btn: ['确定', '取消'],
-                yes: function (index, layero) {
-                    var iframeWindow = window['layui-layer-iframe' + index],
-                        submitID = 'LAY-list-front-submit',
-                        submit = layero.find('iframe').contents().find('#' + submitID);
-
-
-                    //监听提交
-                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
-                        var field = data.field; //获取提交的字段
-                        var userdata = "";
-                        for (var prop in field) {
-                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
-                        }
-                        //提交 Ajax 成功后，静态更新表格中的数据
-                        //$.ajax({});
-                        var loadindex = layer.load(1, {
-                            shade: [0.5, '#000']
-                        });
-                        $.ajax({
-                            type: "POST",
-                            url: "/Admin/PreAmountRecord/ImportByQueuePost?r=" + Math.random(1),
-                            data: userdata,
-                            dataType: "text",
-                            success: function (data) {
-                                if (data.indexOf("success") == 0) {
-                                    var datalist = data.split('|');
-                                    var key = datalist[1];
-                                    CheckImport(table, key, loadindex, index);
-                                } else {
-                                    layer.msg(data);
-                                }
-                            }
-                        });
-                    });
-
-                    submit.trigger('click');
+            ExcelKind = 1;
+            layer.open({
+                type: 1,
+                title: '导入',
+                maxmin: false,
+                area: ['460px', '280px'],
+                content: $('#excelForm'),
+                cancel: function () {
                 }
             });
+            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
         }
         , ExportExcel: function () {
             var userdata = '';