From 59bbb18b376dd25f5dfc4473bb8cfdb076f3f075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 25 Jun 2019 18:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=20=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   |  8 ++---
 .../graduation/tasks/GraduateTaskItem.js      | 32 +++++++++++++++--
 .../tasks/GraduationTasksappraise.js          |  2 +-
 .../tasks/GraduationTaskssettinglist.js       | 34 +++++++++++++++----
 4 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index acd583e43..df59cb4ae 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -115,10 +115,10 @@ class AccessoryModal extends Component{
           newfileList.push(list.response.id)
         }
 
-        if (newfileList.length == 0) {
-          this.props.showNotification('请先上传附件')
-          return;
-        }
+        // if (newfileList.length == 0) {
+        //   this.props.showNotification('请先上传附件')
+        //   return;
+        // }
 
         let url= this.props.reviseAttachmentUrl || "/graduation_works/"+id+"/revise_attachment.json"
         axios.post(url,{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index 419f26315..519850271 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -6,6 +6,8 @@ import {Link} from 'react-router-dom';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
 import Associationmodel from '../../coursesPublic/Associationmodel';
+import AccessoryModal from "../../coursesPublic/AccessoryModal";
+
 
 class GraduateTaskItem extends Component{
   constructor(props){
@@ -111,12 +113,26 @@ class GraduateTaskItem extends Component{
 
   }
 
+	addAccessory=()=>{
+		this.setState({
+			visibles:true
+		})
+	}
+
   Cancel=()=>{
     this.setState({
       visible:false
     })
   }
-
+	Cancelvisible=()=>{
+		this.setState({
+			visibles:false
+		})
+	}
+
+	setupdate=()=>{
+		this.props.funlist
+	}
   render(){
     let {
         Modalstype,
@@ -161,6 +177,15 @@ class GraduateTaskItem extends Component{
              taskid={taskid}
              funlist={this.props.funlist}
            />:""}
+					{this.state.visibles===true?<AccessoryModal
+						modalname={"补交附件"}
+						visible={this.state.visibles}
+						Cancelname={"取消"}
+						Savesname={"确认"}
+						Cancel={this.Cancelvisible}
+						categoryid={discussMessage.work_id}
+						setupdate={this.setupdate}
+					/>:""}
           <style>{`
             
             .graduateTopicList .ant-checkbox-input {
@@ -325,8 +350,9 @@ class GraduateTaskItem extends Component{
 
                         {item==="补交附件"?
 
-                          <WordsBtn className="colorblue font-16 mr20 fr mt12">
-                            <a className="btn colorblue " href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+discussMessage.work_id+"/appraise"}>补交附件</a>
+                          <WordsBtn className="colorblue font-16 mr20 fr mt12" onClick={this.addAccessory}>
+														补交附件
+                            {/*<a className="btn colorblue " href={"/courses/"+this.props.coursesId+"/graduation_tasks/"+discussMessage.work_id+"/appraise"}></a>*/}
                           </WordsBtn>
 
                           :""}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index ce7822d97..d141b5610 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -280,7 +280,7 @@ class GraduationTasksappraise extends Component{
 
                     <div className={"color-grey-6 h20 ml20"}>
 
-                      <span className={"color9B9B fr mr10"}>更新</span>
+                      <span className={"color9B9B fr"}>更新</span>
                       <span className={"fr font-13 mr10 ml10"}>{firelistdata&&firelistdata.atta_update_user}</span>
                       <span className={"color9B9B fr"}>
                         {moment(firelistdata&&firelistdata.atta_update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(firelistdata&&firelistdata.atta_update_time).format('YYYY-MM-DD HH:mm:ss')}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 229a8399a..6be02e4c5 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -12,6 +12,7 @@ import CoursesListType from '../../coursesPublic/CoursesListType';
 import ModulationModal from "../../coursesPublic/ModulationModal";
 import AllocationModal from "../../coursesPublic/AllocationModal";
 import Associationmodel from '../../coursesPublic/Associationmodel';
+import AccessoryModal from "../../coursesPublic/AccessoryModal";
 
 const CheckboxGroup = Checkbox.Group;
 const Search = Input.Search;
@@ -436,12 +437,25 @@ class GraduationTaskssettinglist extends Component{
 
 
 	handaccessory=()=>{
-	  let {taskslistdata}=this.state;
-		let courseId=this.props.match.params.coursesId;
+	  // let {taskslistdata}=this.state;
+		// let courseId=this.props.match.params.coursesId;
+		//
+		// let url="/courses/"+courseId+"/graduation_tasks/"+taskslistdata.work_id+"/appraise"
+		//
+		// window.location.href=url;
+		this.setState({
+			avisible:true
+		})
+	}
 
-		let url="/courses/"+courseId+"/graduation_tasks/"+taskslistdata.work_id+"/appraise"
+	Cancelvisible=()=>{
+		this.setState({
+			avisible:false
+		})
+	}
 
-		window.location.href=url;
+	setupdate=()=>{
+	  this.searchValue()
 	}
 
 	showModulationtype=(id)=>{
@@ -1354,8 +1368,16 @@ class GraduationTaskssettinglist extends Component{
 						funlist={()=>this.searchValue()}
 					  />
 					:""}
-
-					{taskslistdata&&taskslistdata?
+					
+					{this.state.avisible===true?<AccessoryModal
+						modalname={"补交附件"}
+						visible={this.state.avisible}
+						Cancelname={"取消"}
+						Savesname={"确认"}
+						Cancel={this.Cancelvisible}
+						categoryid={taskslistdata.work_id}
+						setupdate={this.setupdate}
+					/>:""}					{taskslistdata&&taskslistdata?
 						// 教师列表
 						this.props.isAdmin()?<div className="newMain clearfix">
 								<div className={"educontent mb20"}>