From 4cc190dc393eaeffc844ad37bbf3e99a2f46f8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 28 Jun 2019 11:23:36 +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 --- .../tasks/GraduationTasksSubmitedit.js | 240 +++++++++++------- .../tasks/GraduationTasksSubmitnew.js | 25 +- .../graduation/tasks/GraduationTasksedit.js | 6 +- .../graduation/tasks/GraduationTasksnew.js | 6 +- 4 files changed, 164 insertions(+), 113 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index b5c120879..76ff783d3 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -33,7 +33,8 @@ class GraduationTasksSubmitedit extends Component{ Loadtype:false, description:undefined, attachments:undefined, - spinnings:false + spinnings:false, + shixunsreplace:false, } } @@ -84,99 +85,8 @@ class GraduationTasksSubmitedit extends Component{ window.location.href="/courses/"+coursesId+"/graduation_tasks/"+workId+"/appraise"; } - handleSubmit=(e) => { - - let {fileList,selectmemberslist,workslist}=this.state; - - let userids=[]; - - for(var list of selectmemberslist){ - - if(list.user_id!=undefined&&list.user_id!=null){ - userids.push(list.user_id) - } - - } - - let listid=[]; - - for(var list of fileList){ - listid.push(list.response.id) - } - - e.preventDefault(); - if( GraduationTasksnewtype===true){ - this.props.form.validateFields((err, values) => { - if (!err) { - console.log(values.description); - // console.log(fileList); - if(values.description===undefined||values.description===""){ - - return - } - if(workslist.task_type===2){ - if(userids.length<2){ - this.setState({ - minvalue:2, - setvalue:"小于", - minmaxtype:true - }) - - return - }else if(userids.length>5){ - this.setState({ - minvalue:5, - setvalue:"大于", - minmaxtype:true - }) - return - } - - } - this.setState({ - spinnings:true - }) - let workId=this.props.match.params.work_Id; - - let url="/graduation_works/"+workId+".json"; - axios.put(url, { - description:values.description, - attachment_ids:listid, - user_ids:userids - } - ).then((response) => { - this.setState({ - spinnings:false - }) - if(response.status===200) { - GraduationTasksnewtype=false; - if(response.data.status===0){ - // this.setState({ - // Modalstype:true, - // Modalstopval:response.data.message, - // ModalSave:this.setedit, - // Loadtype:true - // }) - this.setedit() - }else{ - GraduationTasksnewtype=true; - } - } - }).catch((error) => { - console.log(error) - }) - - } - }); - } - // setTimeout(function () { - // GraduationTasksnewtype=true - // },10000) - - } - handleSelectChange = (value) => { console.log(value); this.props.form.setFieldsValue({ @@ -414,10 +324,126 @@ class GraduationTasksSubmitedit extends Component{ window.history.go(-1) } + handleSubmit=(e) => { + + let {fileList,selectmemberslist,workslist}=this.state; + if(fileList.length===0){ + this.setState({ + shixunsreplace:true, + }) + return + } + + this.Commoninterface(fileList,selectmemberslist,workslist); + // setTimeout(function () { + // GraduationTasksnewtype=true + // },10000) + + } + Commoninterface =(fileList,selectmemberslist,workslist)=>{ + let userids=[]; + + for(var list of selectmemberslist){ + + if(list.user_id!=undefined&&list.user_id!=null){ + userids.push(list.user_id) + } + + } + + let listid=[]; + + for(var list of fileList){ + listid.push(list.response.id) + } + + this.props.form.validateFields((err, values) => { + if (!err) { + console.log(values.description); + // console.log(fileList); + if(values.description===undefined||values.description===""){ + + return + } + if(workslist.task_type===2){ + if(userids.length<2){ + this.setState({ + minvalue:2, + setvalue:"小于", + minmaxtype:true + }) + + return + }else if(userids.length>5){ + this.setState({ + minvalue:5, + setvalue:"大于", + minmaxtype:true + }) + return + } + + } + this.setState({ + spinnings:true + }) + let workId=this.props.match.params.work_Id; + + let url="/graduation_works/"+workId+".json"; + axios.put(url, { + description:values.description, + attachment_ids:listid, + user_ids:userids + } + ).then((response) => { + this.setState({ + spinnings:false + }) + if(response!== undefined){ + this.setedit() + + } + // if(response.status===200) { + // GraduationTasksnewtype=false; + // if(response.data.status===0){ + // // this.setState({ + // // Modalstype:true, + // // Modalstopval:response.data.message, + // // ModalSave:this.setedit, + // // Loadtype:true + // // }) + // }else{ + // GraduationTasksnewtype=true; + // } + // } + }).catch((error) => { + console.log(error) + }) + + } + }); + + } + + hidestartshixunsreplace = ()=>{ + + let {fileList,selectmemberslist,workslist}=this.state; + + this.Commoninterface(fileList,selectmemberslist,workslist); + + } + + hidestartshixunsreplacetwo= ()=>{ + this.setState({ + shixunsreplace:false, + }) + } + + render(){ const { getFieldDecorator } = this.props.form; let {search,fileList, workslist,setvalue,minvalue,minmaxtype,Loadtype,description,attachments, - Modalstype,Modalstopval,ModalCancel,ModalSave,memberslist,task_status,selectmemberslist} =this.state; + Modalstype,Modalstopval,ModalCancel,ModalSave,memberslist,task_status,selectmemberslist,shixunsreplace} =this.state; let courseId=this.props.match.params.coursesId; let category_id=this.props.match.params.category_id; @@ -460,6 +486,24 @@ class GraduationTasksSubmitedit extends Component{ modalSave={ModalSave} loadtype={Loadtype} /> + +
+

还未上传附件

+

是否确认提交作品?

+
+
+ this.hidestartshixunsreplace()}>确认 + this.hidestartshixunsreplacetwo()}>取消 +
+
@@ -482,7 +526,9 @@ class GraduationTasksSubmitedit extends Component{ 返回
- {description&&description?
+ {description&&description? +
+ {/**/}