From 2d89702df26921db47bff2e33c59ea1285b579e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 29 Jun 2019 18:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesPublic/AccessoryModal.js   | 35 ++++++++++++++++---
 .../exercise/Studentshavecompletedthelist.js  |  2 +-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index 26d4499aa..72512be43 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -17,7 +17,8 @@ class AccessoryModal extends Component{
       ModalSave:"",
       loadtype:false,
 			updatas:false,
-      shixunsreplace:false
+      shixunsreplace:false,
+      Errormessage:false,
     }
   }
 
@@ -41,7 +42,10 @@ class AccessoryModal extends Component{
     // for(var list of fileList ){
     //   console.log(fileList)
     // }
-    this.setState({ fileList });
+    this.setState({
+      fileList:fileList,
+      Errormessage:false,
+    });
   }
 
   onAttachmentRemove = (file) => {
@@ -121,10 +125,23 @@ class AccessoryModal extends Component{
 
         if (newfileList.length == 0) {
           // this.props.showNotification('请先上传附件')
-					this.setState({
-            shixunsreplace:true,
-					})
+          if(this.props.modalname === "补交附件"){
+            this.setState({
+              Errormessage:true,
+              shixunsreplace:false,
+            })
+          }else{
+            this.setState({
+              shixunsreplace:true,
+              Errormessage:false,
+            })
+          }
           return;
+        }else{
+          this.setState({
+            shixunsreplace:false,
+            Errormessage:false,
+          })
         }
 
         let url= this.props.reviseAttachmentUrl || "/graduation_works/"+id+"/revise_attachment.json"
@@ -326,6 +343,14 @@ class AccessoryModal extends Component{
               border:'1px solid rgba(234,234,234,1)',
               padding: '10px'
             }}></textarea>
+            {
+              this.state.Errormessage && this.state.Errormessage === true ?
+                <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px"}}>
+                  <span className="fl" style={{textAlign:"left",width: " 100%"}}>还未上传附件</span>
+                </p>
+                : <div style={{height:"25px"}}></div>
+
+            }
 						{this.state.updatas===true?<span className={"color-red"}>请上传附件</span>:""}
             <div className="clearfix mt30 edu-txt-center mb10">
               <a  className="task-btn color-white mr70" onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 4769cce87..c2930bcdf 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -55,7 +55,7 @@ class Studentshavecompletedthelist extends Component {
 			unsubmitted: false,
 			exercise_users: undefined,
 			loadingstate: true,
-			order: undefined,
+			order: "end_at",
 			current_answer_user: undefined,
 			course_groups: undefined,
 			course_groupsdatas: false,