diff --git a/public/react/src/modules/courses/coursesPublic/Associationmodel.js b/public/react/src/modules/courses/coursesPublic/Associationmodel.js index 9af795931..d263a933b 100644 --- a/public/react/src/modules/courses/coursesPublic/Associationmodel.js +++ b/public/react/src/modules/courses/coursesPublic/Associationmodel.js @@ -59,15 +59,18 @@ class Associationmodel extends Component{ goback=()=>{ + debugger this.setState({ Modalstype:false, }) - this.props.funlist() this.props.Cancel() + this.props.funlist() + } setSaves=()=>{ + debugger let {projectvalue}=this.state; let taskid=this.props.taskid; let url="/graduation_tasks/"+taskid+"/graduation_works/relate_project.json"; @@ -76,19 +79,14 @@ class Associationmodel extends Component{ project_id: projectvalue }).then((result)=>{ - if(result.status===200){ - if(result.data.status===0){ - + this.goback() // this.setState({ // Modalstype:true, // Modalstopval:result.data.message, // ModalSave:this.goback, // loadtype:true // }) - this.goback - } - } }).catch((error)=>{ console.log(error) @@ -115,7 +113,7 @@ class Associationmodel extends Component{ project_id: projectvalue } }).then((result)=>{ - if(result.status===200){ + if(result.data.is_relate===false){ this.setSaves() }else{ @@ -126,7 +124,7 @@ class Associationmodel extends Component{ loadtype:true }) } - } + }).catch((error)=>{ console.log(error) }) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index 4d6c6777b..b2a28110d 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -59,12 +59,12 @@ class GraduateTaskItem extends Component{ axios.get(url).then((result)=>{ if(result.data.status===0){ - this.setState({ - Modalstype:true, - Modalstopval:result.data.message, - cardsModalsavetype:this.cannerassocition, - loadtype:true - }) + // this.setState({ + // Modalstype:true, + // Modalstopval:result.data.message, + // cardsModalsavetype:this.cannerassocition, + // loadtype:true + // }) this.props.funlist() } diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js index 28955e268..98983ba9b 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js @@ -249,8 +249,8 @@ class GraduationTasksappraise extends Component{ {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.length===0?"": -
-
+
+
补交附件
@@ -291,7 +291,7 @@ class GraduationTasksappraise extends Component{
} {datalist&&datalist.project_info===undefined?"": -
+
关联项目
@@ -301,7 +301,7 @@ class GraduationTasksappraise extends Component{
} {/*{*/} { datalist === undefined?"": datalist && datalist.task_type===undefined ?"" : datalist.task_type===1? "": datalist && datalist.work_members && datalist.work_members.length == 0 ?"": -
+
其他组员
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index ebb221902..229a8399a 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -544,12 +544,12 @@ class GraduationTaskssettinglist extends Component{ if(result.data.status===0){ this.searchValue() - this.setState({ - Modalstype:true, - Modalstopval:result.data.message, - ModalSave:this.cannerassocition, - loadtype:true - }) + // this.setState({ + // Modalstype:true, + // Modalstopval:result.data.message, + // ModalSave:this.cannerassocition, + // loadtype:true + // }) } }).catch((error)=>{