'commit'

WebRoot/view/ywgl/rywh/import.html

@@ -37,12 +37,18 @@
                     选择文件
                 </button>
             </div>
-            <div class="layui-form-item">
-                <blockquote class="layui-elem-quote" style="color: red;">
+            <div class="layui-form-item" id="info">
+                <blockquote class="layui-elem-quote" style="color: #1e9fff;">
                     温馨提示：导入教工需要严格按照导入模板编辑教工信息，<a style="text-decoration:underline;cursor: pointer;"
                         id="downTemplate">请点此下载</a>
                 </blockquote>
             </div>
+            <div class="layui-form-item" id="error" style="display: none">
+                <blockquote class="layui-elem-quote" style="color: #ff5722;border-left: 5px solid #ff5722;">
+                    错误：Excel中的数据不正确，请下载修改后重新上传！，<a style="text-decoration:underline;cursor: pointer;"
+                        id="downError">请点此下载</a>
+                </blockquote>
+            </div>
 
 
         </div>
@@ -67,12 +73,18 @@
             var $ = layui.jquery;
             var upload = layui.upload;
 
+            var errorUUID = "";
+
             var bureauId = GetQueryString("bureau_id");
 
             $("#downTemplate").click(function () {
                 window.location.href = '/QingLong/teacher/getImportTemplate';
             });
 
+            $("#downError").click(function () {
+                window.location.href = '/QingLong/teacher/downloadErrorXls?uuidString=' + errorUUID;
+            });
+
             upload.render({
                 elem: '#selectFile',
                 url: '/QingLong/teacher/UploadToImportTeacher',
@@ -88,6 +100,7 @@
                 done: function (res) {
                     if (res.success) {
                         layer.closeAll('loading');
+                        $("#error").hide();
                         layer.msg("上传成功！", {
                             icon: 1,
                             time: 1300
@@ -98,10 +111,13 @@
                         });
                     } else {
                         layer.closeAll('loading');
-                        layer.msg(res.message, {
-                            icon: 2,
-                            time: 2000
-                        });
+                        // layer.msg(res.message, {
+                        //     icon: 2,
+                        //     time: 2000
+                        // });
+                        errorUUID = res.uuid;
+                        $("#error").show();
+                        $("#info").hide();
                     }
                 }
             });

WebRoot/view/ywgl/rywh/index.html

@@ -278,7 +278,7 @@
                                             type: 2,
                                             title: '导入Excel',
                                             shade: 0.1,
-                                            area: ['510px', '240px'],
+                                            area: ['550px', '240px'],
                                             content: './import.html?bureau_id=' + bureauId + '&identity=1'
                                         });
                                         break;