diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js index bd427edf3..122157ea4 100644 --- a/public/react/src/modules/courses/new/Goldsubject.js +++ b/public/react/src/modules/courses/new/Goldsubject.js @@ -28,14 +28,14 @@ function disabledDateTime() { }; } -function disabledDate(current) { - console.log(current); - return current && current < moment().endOf('day').subtract(1, 'days'); -} -function disabledDateysl(current) { - console.log(current); - return current && current < moment().endOf('day').add(1, 'days'); -} +// function disabledDate(current) { +// console.log(current); +// return current && current < moment().endOf('day').subtract(1, 'days'); +// } +// function disabledDateysl(current) { +// console.log(current); +// return current && current < moment().endOf('day').add(1, 'days'); +// } class Goldsubject extends Component { @@ -66,12 +66,12 @@ class Goldsubject extends Component { const { datatime } = this.state; var datatimes=""; - // if(datatime!==undefined){ - // datatimes=datatime; - datatimes=moment(datatime, dateFormat); - // }else { - // datatimes=datatime; - // } + if(datatime!==undefined){ + datatimes=datatime; + datatimes=moment(datatimes, dateFormat).subtract(0, 'days');; + }else { + datatimes=datatime; + } if (!startValue || !datatimes) { return false; } @@ -84,12 +84,12 @@ class Goldsubject extends Component { // console.log(moment(new Date(), dateFormat).add(2, 'days')); const { datatimetwo } = this.state; var startvalue=""; - // if(datatimetwo!==undefined){ - // startvalue=datatimetwo; - startvalue=moment(datatimetwo, dateFormat); - // }else { - // startvalue=datatimetwo; - // } + if(datatimetwo!==undefined){ + startvalue=datatimetwo; + startvalue=moment(startvalue, dateFormat).add(1, 'days'); + }else { + startvalue=datatimetwo; + } // console.log("结束时间"); // console.log(endValue); // console.log(startvalue); @@ -313,9 +313,7 @@ class Goldsubject extends Component { // console.log('Received values of form: ', values); - - let url = "/courses/" + coursesId + ".json"; - axios.put(url, { + var datasysl={ // subject_id:128, //这是带过来的值 编辑就不要传值了 name: values.classroom, class_period: values.period, @@ -325,7 +323,12 @@ class Goldsubject extends Component { is_public: this.state.is_public, //这是也是带过来的值 course_module_types: values.checkboxgroup, school:values.school - } + }; + console.log("327"); + console.log(datasysl); + let url = "/courses/" + coursesId + ".json"; + axios.put(url, + datasysl ).then((response) => { // debugger if (response.data.status === 0) { @@ -359,12 +362,9 @@ class Goldsubject extends Component { }); } else { - debugger - this.props.form.validateFields((err, values) => { console.log("错误信息信息信息2"); console.log(err); - console.log("xingxixingxi"); if (err) { return; } diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 176438192..51d86b52e 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1315,7 +1315,7 @@ class Trainingjobsetting extends Component { }) if(this.state.allowreplenishment === true) { - if(end_time=== undefined || end_time===""){ + if(this.state.end_time=== undefined || this.state.end_time===""){ }else { this.setState({ @@ -1323,7 +1323,7 @@ class Trainingjobsetting extends Component { deadline:moment(handleDateString(dateString)).add(1, 'months').format('YYYY-MM-DD HH:mm'), }) } - if(late_time===undefined || late_time===""){ + if(this.state.late_time===undefined || this.state.late_time===""){ }else{ this.setState({ @@ -1342,7 +1342,7 @@ class Trainingjobsetting extends Component { } }else{ - if(end_time=== undefined || end_time===""){ + if(this.state.end_time=== undefined || this.state.end_time===""){ }else { this.setState({