'commit'

WebRoot/view/tb/school/report_excel.html

@@ -38,15 +38,26 @@
             $("#downExcel").click(function () {
                 window.location = "/QingLong/Excel/" + downExcelPath;
             });
-            
+
             upload.render({
                 elem: '#uploadExcel',
                 url: '/QingLong/collect/importData',
                 data: { job_id: jobId },
                 exts: 'xlsx',
                 done: function (res) {
-                    layer.msg('上传成功');
+                    if (res.success) {
-                    console.log(res)
+                        layer.msg('上传成功');
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2,
+                            time: 2000
+                        }, function () {
+                            console.log(res.upload_excel_filename_user)
+                            window.location = "/QingLong/Excel/" + res.upload_excel_filename_user;
+                        });
+                    }
+
+
                 }
             });