|
|
|
|
@ -33,52 +33,108 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
super(props);
|
|
|
|
|
this.state={
|
|
|
|
|
group_ids:[],
|
|
|
|
|
endtime:""
|
|
|
|
|
endtime:"",
|
|
|
|
|
course_groups:undefined,
|
|
|
|
|
Checkboxtype:true
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
componentDidMount() {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(this.props.course_groups!=undefined&&this.props.course_groups.length!=0){
|
|
|
|
|
|
|
|
|
|
let arr=this.props.course_groups.map(item => item.id);
|
|
|
|
|
this.shixunhomeworkedit(arr);
|
|
|
|
|
if(this.props.course_groups!=undefined) {
|
|
|
|
|
let arr = this.props.course_groups.map(item => item.id);
|
|
|
|
|
let newarr = [];
|
|
|
|
|
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");
|
|
|
|
|
// }
|
|
|
|
|
item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
|
|
|
|
|
newarr.push(item)
|
|
|
|
|
} else {
|
|
|
|
|
newarr.push(item)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
this.setState({
|
|
|
|
|
course_groups: newarr
|
|
|
|
|
})
|
|
|
|
|
this.shixunhomeworkedit(arr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(this.props.starttimes===undefined||this.props.starttimes===""||this.props.starttimes===null){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'months')).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
if(this.props.starttimesend===undefined){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
}else{
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(handleDateString(this.props.starttimesend)).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(handleDateString(this.props.starttimes)).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
if(this.props.starttimesend===undefined){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
}else{
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(handleDateString(this.props.starttimesend)).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
componentDidUpdate=(prevProps)=>{
|
|
|
|
|
// if(prevProps.visible!=this.props.visible){
|
|
|
|
|
//
|
|
|
|
|
// if(this.props.course_groups!=undefined){
|
|
|
|
|
// let arr=this.props.course_groups.map(item => item.id);
|
|
|
|
|
// this.shixunhomeworkedit(arr);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
if(prevProps.course_groups!=this.props.course_groups){
|
|
|
|
|
if(this.props.course_groups!=undefined){
|
|
|
|
|
let arr=this.props.course_groups.map(item => item.id);
|
|
|
|
|
this.shixunhomeworkedit(arr);
|
|
|
|
|
}
|
|
|
|
|
if(this.props.course_groups!=undefined){
|
|
|
|
|
let arr=this.props.course_groups.map(item => item.id);
|
|
|
|
|
let newarr=[];
|
|
|
|
|
let course_groups=this.props.course_groups;
|
|
|
|
|
course_groups.map((item,key)=>{
|
|
|
|
|
if(item.end_time===null){
|
|
|
|
|
item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
|
|
|
|
|
newarr.push(item)
|
|
|
|
|
}else{
|
|
|
|
|
newarr.push(item)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
this.setState({
|
|
|
|
|
course_groups:newarr
|
|
|
|
|
})
|
|
|
|
|
this.shixunhomeworkedit(arr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(prevProps.starttimes!=this.props.starttimes){
|
|
|
|
|
|
|
|
|
|
if(this.props.starttimes===undefined||this.props.starttimes===""||this.props.starttimes===null){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'months')).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
if(this.props.starttimesend===undefined){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
}else{
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(handleDateString(this.props.starttimesend)).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(handleDateString(this.props.starttimes)).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
if(this.props.starttimesend===undefined){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
}else{
|
|
|
|
|
this.setState({
|
|
|
|
|
endtime:moment(handleDateString(this.props.starttimesend)).format("YYYY-MM-DD HH:mm")
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -101,50 +157,140 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
onChangeTimeendlist=(date, dateString,id)=>{
|
|
|
|
|
let {course_groups,endtimetypeid}=this.state;
|
|
|
|
|
if(endtimetypeid===id){
|
|
|
|
|
if(date!=null){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtimetypeid:undefined
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
if(moment(dateString,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){}else{
|
|
|
|
|
if(date!=null){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtimetypeid:undefined
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
let arr=course_groups;
|
|
|
|
|
|
|
|
|
|
arr.map((item,key)=>{
|
|
|
|
|
if(item.id===id){
|
|
|
|
|
item.end_time=date===null?"":moment(handleDateString(dateString)).format('YYYY-MM-DD HH:mm')
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
this.setState({
|
|
|
|
|
course_groups:arr
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
propsSaves=(ds,endtime)=>{
|
|
|
|
|
let {course_groups}=this.state;
|
|
|
|
|
|
|
|
|
|
if(ds.length ===0&&endtime === ""){
|
|
|
|
|
if(this.props.typs=="end"){
|
|
|
|
|
this.props.Saves()
|
|
|
|
|
}else{
|
|
|
|
|
if(this.props.typs!="end"){
|
|
|
|
|
if(endtime === ""||endtime===undefined||endtime===null){
|
|
|
|
|
|
|
|
|
|
if(this.props.typs!="end"){
|
|
|
|
|
if(!endtime){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtimetype:true,
|
|
|
|
|
endtimetypevalue:"截止时间不能为空"
|
|
|
|
|
})
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(moment(endtime,"YYYY-MM-DD HH:mm") <= moment(this.props.starttimes,"YYYY-MM-DD HH:mm")){
|
|
|
|
|
if(moment(endtime,"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtimetype:true,
|
|
|
|
|
endtimetypevalue:"必须晚于发布时间"
|
|
|
|
|
endtimetypevalue:"必须晚于当前时间"
|
|
|
|
|
})
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
this.props.Saves(ds,moment(handleDateString(endtime),"YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm"))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let type=false
|
|
|
|
|
if(course_groups===undefined||course_groups.length===0){
|
|
|
|
|
this.props.Saves(ds,moment(handleDateString(endtime),"YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm"))
|
|
|
|
|
}else{
|
|
|
|
|
let arr=[]
|
|
|
|
|
ds.map((item,key)=>{
|
|
|
|
|
course_groups.map((items,key)=>{
|
|
|
|
|
if(item===items.id){
|
|
|
|
|
if(!items.end_time){
|
|
|
|
|
type=true
|
|
|
|
|
this.setState({
|
|
|
|
|
endtimetype:true,
|
|
|
|
|
endtimetypeid:items.id,
|
|
|
|
|
endtimetypevalue:"截止时间不能为空"
|
|
|
|
|
})
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
// 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")){
|
|
|
|
|
this.setState({
|
|
|
|
|
endtimetype:true,
|
|
|
|
|
endtimetypevalue:"必须晚于当前时间"
|
|
|
|
|
})
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
arr.push(items.end_time)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
if(type===false){
|
|
|
|
|
this.props.Saves(ds,arr)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
render(){
|
|
|
|
|
let {group_ids,endtime}=this.state;
|
|
|
|
|
let {course_groups}=this.props;
|
|
|
|
|
Checkboxtype=(e)=>{
|
|
|
|
|
|
|
|
|
|
// console.log(this.props.starttimes)
|
|
|
|
|
// console.log(endtime)
|
|
|
|
|
// console.log(this.props.starttimes)
|
|
|
|
|
// console.log(this.state.endtime)
|
|
|
|
|
let {course_groups}=this.state;
|
|
|
|
|
|
|
|
|
|
// console.log(this.props.starttime,this.props.endtime)
|
|
|
|
|
// TODO course_groups为空时的处理
|
|
|
|
|
let arr=[];
|
|
|
|
|
if(e.target.checked==true){
|
|
|
|
|
course_groups.map((item,key)=>{
|
|
|
|
|
arr.push(item.id)
|
|
|
|
|
})
|
|
|
|
|
}else{
|
|
|
|
|
arr=[]
|
|
|
|
|
}
|
|
|
|
|
this.setState({
|
|
|
|
|
Checkboxtype:e.target.checked,
|
|
|
|
|
group_ids:arr
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// let endtimelist=this.props.starttimes===undefined||this.props.starttimes===""?"":moment(handleDateString(endtime)).add(1,'months')
|
|
|
|
|
render(){
|
|
|
|
|
let {group_ids,endtime,course_groups}=this.state;
|
|
|
|
|
console.log(this.props.modaltype)
|
|
|
|
|
let course_groupstype=course_groups===undefined||course_groups.length===0;
|
|
|
|
|
// TODO course_groups为空时的处理
|
|
|
|
|
return(
|
|
|
|
|
<div>
|
|
|
|
|
<style>
|
|
|
|
|
{
|
|
|
|
|
`
|
|
|
|
|
.ant-input, .ant-input .ant-input-suffix{
|
|
|
|
|
background-color: #fff !important;
|
|
|
|
|
}
|
|
|
|
|
.width300{
|
|
|
|
|
width:300px;
|
|
|
|
|
display: inline-block;
|
|
|
|
|
}
|
|
|
|
|
`
|
|
|
|
|
}
|
|
|
|
|
</style>
|
|
|
|
|
{
|
|
|
|
|
this.props.OneSelftype===true?<style>
|
|
|
|
|
{
|
|
|
|
|
@ -186,22 +332,22 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
{this.props.Topval}
|
|
|
|
|
<span className={"color-blue underline"}>{this.props.Topvalright}</span>
|
|
|
|
|
</p>
|
|
|
|
|
<p className="task-popup-text-center font-16 mt10">
|
|
|
|
|
{this.props.Botvalleft===undefined?"":<span className={"colorFF6800"}>"{this.props.Botvalleft}"</span>}
|
|
|
|
|
{this.props.Botval}
|
|
|
|
|
</p>
|
|
|
|
|
{/*<p className="task-popup-text-center font-16 mt10">*/}
|
|
|
|
|
{/*{this.props.Botvalleft===undefined?"":<span className={"colorFF6800"}>"{this.props.Botvalleft}"</span>}*/}
|
|
|
|
|
{/*{this.props.Botval}*/}
|
|
|
|
|
{/*</p>*/}
|
|
|
|
|
</React.Fragment> }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{this.props.starttime===undefined||
|
|
|
|
|
this.props.starttime===""?""
|
|
|
|
|
: <p className="task-popup-text-center font-16 mt20">
|
|
|
|
|
<span className={"font-14 mr20 color979797"}>
|
|
|
|
|
<span className={"mr10"}>发布时间:</span>
|
|
|
|
|
{this.props.starttime}</span>
|
|
|
|
|
: <p className="task-popup-text-center font-16 mt20 mb10">
|
|
|
|
|
{/*<span className={"font-14 mr20 color979797"}>*/}
|
|
|
|
|
{/*<span className={"mr10"}>发布时间:</span>*/}
|
|
|
|
|
{/*{this.props.starttime}</span>*/}
|
|
|
|
|
{this.props.modaltype===undefined||this.props.modaltype===2? <span className={"font-14 color979797"}>
|
|
|
|
|
{/*{this.props.endtime}*/}
|
|
|
|
|
<span className={"mr10"}>截止时间:</span>
|
|
|
|
|
<span className={"mr10"}>截止时间</span>
|
|
|
|
|
<DatePicker
|
|
|
|
|
dropdownClassName="hideDisable"
|
|
|
|
|
showTime={{ format: 'HH:mm' }}
|
|
|
|
|
@ -217,15 +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;
|
|
|
|
|
}
|
|
|
|
|
@ -249,7 +397,7 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
</li>
|
|
|
|
|
</div>}
|
|
|
|
|
{this.props.modaltype===undefined||this.props.modaltype===2
|
|
|
|
|
|| this.props.usingCheckBeforePost ?"":<ul className="upload_select_box fl clearfix mb30"
|
|
|
|
|
|| this.props.usingCheckBeforePost ?"":<ul className={this.state.endtimetypeid!=undefined&&this.state.endtimetype===true?"upload_select_box fl clearfix mb20":"upload_select_box fl clearfix mb30"}
|
|
|
|
|
style={{"overflow-y":"auto",padding:"10px 0px"}}
|
|
|
|
|
id="search_not_members_list"
|
|
|
|
|
|
|
|
|
|
@ -257,13 +405,13 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
|
|
|
|
|
{ <Checkbox.Group style={{ width: '100%' }} value={group_ids} onChange={this.shixunhomeworkedit}>
|
|
|
|
|
{
|
|
|
|
|
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" key={key}>
|
|
|
|
|
<div className="clearfix edu-txt-center lineh-40 mb10" key={key}>
|
|
|
|
|
<li style={{ width: '100%',padding: "0px 10px"}} className={"mb10"}>
|
|
|
|
|
<Checkbox
|
|
|
|
|
className="task-hide edu-txt-left"
|
|
|
|
|
className="task-hide edu-txt-left width300"
|
|
|
|
|
name="shixun_homework[]"
|
|
|
|
|
value={item.id}
|
|
|
|
|
key={item.id}
|
|
|
|
|
@ -279,11 +427,10 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
locale={locale}
|
|
|
|
|
format={dateFormat}
|
|
|
|
|
placeholder="请选择截止时间"
|
|
|
|
|
id={"endTime"}
|
|
|
|
|
width={"210px"}
|
|
|
|
|
value={item.end_time===null||item.end_time===""?"":moment(item.end_time, dateFormat)}
|
|
|
|
|
onChange={this.onChangeTimeend}
|
|
|
|
|
className={ this.state.endtimetype===true?"noticeTip fr":"fr"}
|
|
|
|
|
value={item.end_time===null||item.end_time===""?"":moment(handleDateString(item.end_time), dateFormat)}
|
|
|
|
|
onChange={(e,data)=>this.onChangeTimeendlist(e,data,item.id)}
|
|
|
|
|
className={ this.state.endtimetypeid===item.id&&this.state.endtimetype===true||moment(handleDateString(item.end_time),"YYYY-MM-DD HH:mm") <= moment(this.props.starttime,"YYYY-MM-DD HH:mm")?"noticeTip fr":"fr"}
|
|
|
|
|
/>
|
|
|
|
|
</li>
|
|
|
|
|
|
|
|
|
|
@ -295,11 +442,16 @@ class OneSelfOrderModal extends Component{
|
|
|
|
|
|
|
|
|
|
</ul>
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
<div className="clearfix mt30 edu-txt-center mb10">
|
|
|
|
|
{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={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>:<div className="clearfix mt30 edu-txt-center mb10">
|
|
|
|
|
{course_groupstype===true?"":<Checkbox className="fl ml10" checked={this.state.Checkboxtype} onChange={this.Checkboxtype}>全选</Checkbox>}
|
|
|
|
|
<a className="task-btn task-btn-orange fr" onClick={()=>this.propsSaves(group_ids,this.state.endtime)}>{this.props.Savesname}</a>
|
|
|
|
|
<a className="task-btn color-white mr30 fr" onClick={this.props.Cancel}>{this.props.Cancelname}</a>
|
|
|
|
|
</div>}
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
</Modal>:""}
|
|
|
|
|
|
