From 72b96c6038cbcf3249e8ee2aedb866a842e04af4 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 16 Jun 2017 20:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E9=99=84=E4=BB=B6=E5=8F=AA?=
 =?UTF-8?q?=E8=83=BD=E4=B8=8A=E4=BC=A0=E4=B8=80=E4=B8=AA=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_upload_attachment.html.erb  |  3 +--
 app/views/student_work/show.html.erb          |  1 -
 public/javascripts/attachments.js             | 24 ++++++++++++-------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/views/student_work/_upload_attachment.html.erb b/app/views/student_work/_upload_attachment.html.erb
index 7bc78f2dc..9fb1ba565 100644
--- a/app/views/student_work/_upload_attachment.html.erb
+++ b/app/views/student_work/_upload_attachment.html.erb
@@ -46,11 +46,10 @@
         <textarea class="reUploadDetail" id="attachment_des" name="description" placeholder="请在此输入您补交附件的理由（必填）"></textarea>
       </div>
       <div class="cl"></div>
-      <p id="hint_message"></p>
-      <div class="cl"></div>
       <div class="_notice_box text_c none mt5" style="height: 20px; width: 397px; padding: 4px 4px; line-height: 20px;" id="_notice_box">注意：暂不支持IE浏览器的上传，请更换浏览器</div>
       <div class="cl"></div>
       <div class="mt10">
+        <p id="hint_message" class="color-red fl"></p>
         <a href="javascript:void(0);" id="upload_files_submit_btn" class="task-btn task-btn-blue fr sure" onclick="submit_revise_files();">确定</a>
         <a href="javascript:void(0);" class="pop_close task-btn fr mr10 cancel">取消</a>
         <div class="cl"></div>
diff --git a/app/views/student_work/show.html.erb b/app/views/student_work/show.html.erb
index 50557319a..b029c79d8 100644
--- a/app/views/student_work/show.html.erb
+++ b/app/views/student_work/show.html.erb
@@ -283,7 +283,6 @@
     function regex_des() {
         if ($.trim($("#attachment_des").val()) == "") {
             $("#hint_message").text("补交理由不能为空");
-            $("#hint_message").css('color','#ff0000');
             return false;
         } else {
             $("#hint_message").text("");
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index a468f9b37..95f569297 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -552,18 +552,24 @@ function uploadAndAttachReviseFiles(files, inputEl,btnId) {
     var maxFileSizeExceeded = $(inputEl).data('max-file-size-message');
 
     var sizeExceeded = false;
-    $.each(files, function() {
-        if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {
-            sizeExceeded = true;
-        }
-    });
-    if (sizeExceeded) {
-        notice_sure_box(maxFileSizeExceeded);
-    } else {
+    if(files.length > 1){
+        $("#hint_message").html("只能上传一个附件").show();
+    } else{
+        $("#hint_message").html("只能上传一个附件").hide();
         $.each(files, function() {
-            addReviseFile(inputEl, this, true,btnId);
+            if (this.size && maxFileSize != null && this.size > parseInt(maxFileSize)) {
+                sizeExceeded = true;
+            }
         });
+        if (sizeExceeded) {
+            notice_sure_box(maxFileSizeExceeded);
+        } else {
+            $.each(files, function() {
+                addReviseFile(inputEl, this, true,btnId);
+            });
+        }
     }
+
 }
 
 function uploadAndAttachFiles(files, inputEl,btnId) {