|
|
|
|
@ -48,11 +48,12 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
let course_groups = this.props.course_groups;
|
|
|
|
|
course_groups.map((item, key) => {
|
|
|
|
|
if (item.end_time === null) {
|
|
|
|
|
if(this.props.starttimesend===undefined){
|
|
|
|
|
// if(this.props.starttimesend===undefined){
|
|
|
|
|
// item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
|
|
|
|
|
// }else{
|
|
|
|
|
// item.end_time = moment(handleDateString(this.props.starttimesend)).format("YYYY-MM-DD HH:mm");
|
|
|
|
|
// }
|
|
|
|
|
item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
|
|
|
|
|
}else{
|
|
|
|
|
item.end_time = moment(handleDateString(this.props.starttimesend)).format("YYYY-MM-DD HH:mm");
|
|
|
|
|
}
|
|
|
|
|
newarr.push(item)
|
|
|
|
|
} else {
|
|
|
|
|
newarr.push(item)
|
|
|
|
|
@ -97,11 +98,7 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
let course_groups=this.props.course_groups;
|
|
|
|
|
course_groups.map((item,key)=>{
|
|
|
|
|
if(item.end_time===null){
|
|
|
|
|
if(this.props.starttimesend===undefined){
|
|
|
|
|
item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
|
|
|
|
|
}else{
|
|
|
|
|
item.end_time = moment(handleDateString(this.props.starttimesend)).format("YYYY-MM-DD HH:mm");
|
|
|
|
|
}
|
|
|
|
|
newarr.push(item)
|
|
|
|
|
}else{
|
|
|
|
|
newarr.push(item)
|
|
|
|
|
@ -208,7 +205,7 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
if(moment(endtime,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtimetype:true,
|
|
|
|
|
endtimetypevalue:"必须晚于发布时间"
|
|
|
|
|
endtimetypevalue:"必须晚于当前时间"
|
|
|
|
|
})
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
@ -236,7 +233,7 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
if(moment(items.end_time,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtimetype:true,
|
|
|
|
|
endtimetypevalue:"必须晚于发布时间"
|
|
|
|
|
endtimetypevalue:"必须晚于当前时间"
|
|
|
|
|
})
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
@ -276,7 +273,7 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
|
|
|
|
|
render(){
|
|
|
|
|
let {group_ids,endtime,course_groups}=this.state;
|
|
|
|
|
// console.log(course_groups)
|
|
|
|
|
console.log(this.props.modaltype)
|
|
|
|
|
let course_groupstype=course_groups===undefined||course_groups.length===0;
|
|
|
|
|
// TODO course_groups为空时的处理
|
|
|
|
|
return(
|
|
|
|
|
@ -344,7 +341,7 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
|
|
|
|
|
{this.props.starttime===undefined||
|
|
|
|
|
this.props.starttime===""?""
|
|
|
|
|
: <p className="task-popup-text-center font-16 mt10 mb10">
|
|
|
|
|
: <p className="task-popup-text-center font-16 mt20 mb10">
|
|
|
|
|
{/*<span className={"font-14 mr20 color979797"}>*/}
|
|
|
|
|
{/*<span className={"mr10"}>发布时间:</span>*/}
|
|
|
|
|
{/*{this.props.starttime}</span>*/}
|
|
|
|
|
@ -366,16 +363,17 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
onChange={this.onChangeTimeend}
|
|
|
|
|
className={ this.state.endtimetype===true?"noticeTip":""}
|
|
|
|
|
/>
|
|
|
|
|
{this.state.endtimetype===true?<div className={"color-red fr mr90 mt5"}>{this.state.endtimetypevalue}</div>:""}
|
|
|
|
|
|
|
|
|
|
{/*<div className={"fr mr90 mt5"}>(仅支持半点和整点)</div>*/}
|
|
|
|
|
</span>:""}
|
|
|
|
|
|
|
|
|
|
</p>}
|
|
|
|
|
{/* usingCheckBeforePost 为true的时候 全选所有分班 */}
|
|
|
|
|
|
|
|
|
|
<style>
|
|
|
|
|
{
|
|
|
|
|
`
|
|
|
|
|
.ant-checkbox-wrapper {
|
|
|
|
|
.HomeworkModal .ant-checkbox-wrapper {
|
|
|
|
|
margin-top: 0px;
|
|
|
|
|
float: left;
|
|
|
|
|
}
|
|
|
|
|
@ -395,7 +393,7 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
<li style={{ width: '100%',padding: "0px 10px"}} className={"mb10"}>
|
|
|
|
|
<span style={{"float":"left","color":"#05101A"}} className="task-hide color-grey-name ml50">分班名称</span>
|
|
|
|
|
|
|
|
|
|
<span style={{"float":"right","color":"#05101A"}} className="task-hide color-grey-name mr20">截止时间</span>
|
|
|
|
|
<span style={{"float":"right","color":"#05101A"}} className="task-hide color-grey-name mr70">截止时间</span>
|
|
|
|
|
</li>
|
|
|
|
|
</div>}
|
|
|
|
|
{this.props.modaltype===undefined||this.props.modaltype===2
|
|
|
|
|
@ -407,7 +405,7 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
|
|
|
|
|
{ <Checkbox.Group style={{ width: '100%' }} value={group_ids} onChange={this.shixunhomeworkedit}>
|
|
|
|
|
{
|
|
|
|
|
course_groups===undefined?"":course_groups.map((item,key)=>{
|
|
|
|
|
course_groups===undefined||course_groups.length===0?"":course_groups.map((item,key)=>{
|
|
|
|
|
|
|
|
|
|
return(
|
|
|
|
|
<div className="clearfix edu-txt-center lineh-40 mb10" key={key}>
|
|
|
|
|
@ -444,8 +442,9 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
|
|
|
|
|
</ul>
|
|
|
|
|
}
|
|
|
|
|
{this.state.endtimetype===true&&course_groupstype===true?<div className={"color-red"} style={{'text-align': 'center'}}>{this.state.endtimetypevalue}</div>:""}
|
|
|
|
|
{this.state.endtimetypeid!=undefined&&this.state.endtimetype===true?<div className={"color-red fl ml10 mb20"}>{this.state.endtimetypevalue}</div>:""}
|
|
|
|
|
{course_groupstype===true?<div className="clearfix mt30 edu-txt-center mb10">
|
|
|
|
|
{course_groupstype===true?<div className={this.state.endtimetype===true&&course_groupstype===true?"clearfix mt10 edu-txt-center mb10":"clearfix mt20 edu-txt-center mb10"}>
|
|
|
|
|
<a className="task-btn color-white mr30" onClick={this.props.Cancel}>{this.props.Cancelname}</a>
|
|
|
|
|
<a className="task-btn task-btn-orange" onClick={()=>this.propsSaves(group_ids,this.state.endtime)}>{this.props.Savesname}</a>
|
|
|
|
|
</div>:<div className="clearfix mt30 edu-txt-center mb10">
|
|
|
|
|
|
