diff --git a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js index fb915164c..d02b99834 100644 --- a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js +++ b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js @@ -35,7 +35,10 @@ class OneSelfOrderModal extends Component{ group_ids:[], endtime:"", course_groups:undefined, - Checkboxtype:true + Checkboxtype:true, + endtimetypevalue:undefined, + endtimetypeid:undefined, + endtimetypename:undefined } } componentDidMount() { @@ -203,6 +206,9 @@ class OneSelfOrderModal extends Component{ propsSaves=(ds,endtime)=>{ debugger + this.setState({ + endtimetype:false + }) let {course_groups}=this.state; if(this.props.typs=="end"){ @@ -241,6 +247,7 @@ class OneSelfOrderModal extends Component{ this.setState({ endtimetype:true, endtimetypeid:items.id, + endtimetypename:items.name, endtimetypevalue:"截止时间不能为空" }) return @@ -248,12 +255,29 @@ class OneSelfOrderModal extends Component{ // arr.push(moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm")) }else{ if(moment(items.end_time,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){ + type=true this.setState({ endtimetype:true, - endtimetypevalue:"必须晚于当前时间" + endtimetypeid:items.id, + endtimetypename:items.name, + endtimetypevalue:"截止时间必须晚于当前时间" }) return } + + if(this.props.modallate_time){ + if(moment(items.end_time,"YYYY-MM-DD HH:mm") >= moment(this.props.modallate_time,"YYYY-MM-DD HH:mm")){ + type=true + this.setState({ + endtimetype:true, + endtimetypeid:items.id, + endtimetypename:items.name, + endtimetypevalue:"截止时间必须晚于补交结束时间" + }) + return + } + } + arr.push(handleDateString(items.end_time)) } } @@ -459,7 +483,7 @@ class OneSelfOrderModal extends Component{ } {this.state.endtimetype===true&&course_groupstype===true?