diff --git a/WebRoot/Excel/5fd74c61-440d-4450-8659-31c65cb37b4e.xlsx b/WebRoot/Excel/5fd74c61-440d-4450-8659-31c65cb37b4e.xlsx new file mode 100644 index 00000000..ac686d31 Binary files /dev/null and b/WebRoot/Excel/5fd74c61-440d-4450-8659-31c65cb37b4e.xlsx differ diff --git a/WebRoot/Excel/b4aed330-ba5b-41d3-9c66-690f4da47f32.xlsx b/WebRoot/Excel/b4aed330-ba5b-41d3-9c66-690f4da47f32.xlsx new file mode 100644 index 00000000..ac686d31 Binary files /dev/null and b/WebRoot/Excel/b4aed330-ba5b-41d3-9c66-690f4da47f32.xlsx differ diff --git a/WebRoot/Excel/d66fe317-aba4-460d-a544-b07e07e6af65.xlsx b/WebRoot/Excel/d66fe317-aba4-460d-a544-b07e07e6af65.xlsx new file mode 100644 index 00000000..ac686d31 Binary files /dev/null and b/WebRoot/Excel/d66fe317-aba4-460d-a544-b07e07e6af65.xlsx differ diff --git a/WebRoot/view/jrgl/rzgl/index.html b/WebRoot/view/jrgl/rzgl/index.html index 004e12f9..6a4e9207 100644 --- a/WebRoot/view/jrgl/rzgl/index.html +++ b/WebRoot/view/jrgl/rzgl/index.html @@ -95,6 +95,8 @@ return null; } + + }); diff --git a/WebRoot/view/jrgl/rzgl/test.html b/WebRoot/view/jrgl/rzgl/test.html new file mode 100644 index 00000000..90a04809 --- /dev/null +++ b/WebRoot/view/jrgl/rzgl/test.html @@ -0,0 +1,115 @@ + + + + + + + + + + + + + +
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/WebRoot/view/tb/org/upload_excel.html b/WebRoot/view/tb/org/upload_excel.html index b3529d5f..794a4fd0 100644 --- a/WebRoot/view/tb/org/upload_excel.html +++ b/WebRoot/view/tb/org/upload_excel.html @@ -81,13 +81,21 @@ elem: '#upload-excel', url: '/QingLong/collect/uoloadTemplate', exts: 'xlsx', - done: function (res) { - layer.msg("上传成功!", { - icon: 1, - time: 1500 - }, function () { - window.location = "./fields_set.html?job_id=" + res.job_id; - }); + done: function (res) { + if (res.success) { + layer.msg("上传成功!", { + icon: 1, + time: 1500 + }, function () { + window.location = "./fields_set.html?job_id=" + res.job_id; + }); + } else { + layer.msg(res.message, { + icon: 2, + time: 4500 + }); + } + } });