Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_cs_new
杨树明 6 years ago
commit fa17b52356

@ -301,8 +301,8 @@ module.exports = {
}, },
warnings: false, warnings: false,
compress: { compress: {
drop_debugger: false, drop_debugger: true,
drop_console: false drop_console: true
} }
} }
}), }),

@ -132,13 +132,14 @@ class ShixunWorkModal extends Component{
onChange=(e)=>{ onChange=(e)=>{
let{group_list}=this.state; let{group_list}=this.state;
let {data}=this.props; let {data}=this.props;
if(e.target.checked===true){ if(e.target.checked===true){
if(data&&data.length===0){ if(data&&data.length===0){
let id=[] let id=[]
group_list.forEach((item,key)=>{ group_list.forEach((item,key)=>{
id.push(item.id) if(item.works_count!=0){
id.push(item.id)
}
}) })
this.setState({ this.setState({
group_ids:id, group_ids:id,
@ -147,7 +148,9 @@ class ShixunWorkModal extends Component{
}else{ }else{
let id=[] let id=[]
group_list.forEach((item,key)=>{ group_list.forEach((item,key)=>{
id.push(item.id) if(item.works_count!=0){
id.push(item.id)
}
}) })
this.setState({ this.setState({
group_ids:id, group_ids:id,
@ -161,6 +164,9 @@ class ShixunWorkModal extends Component{
}) })
} }
} }

Loading…
Cancel
Save