计划任务白名单互斥修改

src/pages/plan/add/add.js

@@ -37,7 +37,8 @@ export default class add extends React.Component{
 		payment_direction:["对私账户","对公账户","预付款扣除"],
 		isload:false,
 		is_audit:false,
-		whiteStyle:false
+		whiteStyle:false,
+		keyStyle:1,
     }
   }
 
@@ -118,15 +119,6 @@ export default class add extends React.Component{
 				let data = null
 				if(this.refs[this.state.keys[i]])
 				{
-				console.log("生成key",this.refs[this.state.keys[i]])	
-					
-					
-				console.log("key",this.refs[this.state.keys[i]])	
-				
-				
-				
-					
-					
 				data = this.refs[this.state.keys[i]].submit();
 				}
 				else{
@@ -134,15 +126,11 @@ export default class add extends React.Component{
 					continue;
 				}
 				
-				
-				
 				if(data)
 				{
 					temp.push(data)
 				}
 				else{
-					
-					console.log(7777)
 					return;
 				}
 			}
@@ -216,19 +204,22 @@ export default class add extends React.Component{
 		this.state.keys.push(step)
 		this.setState({keys:this.state.keys})
 		this.setState({isload:true})
-		if(this.refs[this.state.keys[0]].state.model.style == 1)
+		if(this.refs[this.state.keys[0]].state.model.style == 5)
 		{
 			this.setState({whiteStyle:true})
+			this.setState({keyStyle:5})
 		}
 		console.log(this.state.keys)
 	}
 	onStyleChange(e){
 		console.log("状态",e.target.value)
-		if(e.target.value == 1)
+		if(e.target.value == 5)
 		{
 			this.setState({whiteStyle:true})
+			this.setState({keyStyle:5})
 		}
 		else{
+			this.setState({keyStyle:e.target.value})
 			this.setState({whiteStyle:false})
 		}
 	}
@@ -360,7 +351,7 @@ export default class add extends React.Component{
 	   
     }>
 	
-		<Step2 ref={item}  addNewkey ={()=>{this.addNewkey()}}   onStyleChange={(e)=>{this.onStyleChange(e)}}     isload={this.state.isload} name={index} whiteStyle={this.state.whiteStyle}   />
+		<Step2 ref={item}  addNewkey ={()=>{this.addNewkey()}}   onStyleChange={(e)=>{this.onStyleChange(e)}}   keyStyle={this.state.keyStyle}     isload={this.state.isload} name={index} whiteStyle={this.state.whiteStyle}   />
 		</Card>
 		  ) : null
 		})

src/pages/plan/add/edit.js

@@ -46,6 +46,7 @@ export default class add extends React.Component{
 		theme_options:[],
 		isload:false,
 		is_Edit:false,
+		whiteStyle:false,
     }
   }
 
@@ -320,6 +321,14 @@ export default class add extends React.Component{
 		this.state.keys.push(step)
 		this.setState({keys:this.state.keys})
 		this.setState({isload:true})
+		// setTimeout(()=>{
+		// 	if(this.refs[this.state.keys[0]].state.model.style == 5)
+		// 	{
+		// 		this.setState({whiteStyle:true})
+		// 		this.setState({keyStyle:5})
+		// 	}
+		// },500)
+		
 	}
 	
 	onPhoneChange(e){
@@ -447,9 +456,6 @@ export default class add extends React.Component{
 						})
 					
 				}
-				
-				
-				
 				},(err)=>{
 					Notify.error(err)
 			   })
@@ -519,7 +525,18 @@ export default class add extends React.Component{
 			   })
 			})
 	}
-	
+	onStyleChange(e){
+		console.log("状态",e.target.value)
+		if(e.target.value == 5)
+		{
+			this.setState({whiteStyle:true})
+			this.setState({keyStyle:5})
+		}
+		else{
+			this.setState({keyStyle:e.target.value})
+			this.setState({whiteStyle:false})
+		}
+	}
   render(){
     return(
       <div id="plan-edit">
@@ -573,7 +590,7 @@ export default class add extends React.Component{
 	   
     }>
 	
-		<Step2 ref={"step2-"+ index}  addNewkey ={()=>{this.addNewkey()}}  isload={this.state.isload}  data={item}  disabled={this.state.disabled} />
+		<Step2 ref={"step2-"+ index}  addNewkey ={()=>{this.addNewkey()}}  name={index}  onStyleChange={(e)=>{this.onStyleChange(e)}} whiteStyle={this.state.whiteStyle}  keyStyle={this.state.keyStyle}  isload={this.state.isload}  data={item}  disabled={this.state.disabled} />
 		</Card>
 		  ) : null
 		})

src/pages/plan/add/step2.js

@@ -60,7 +60,7 @@ export default class acclist extends React.Component{
 		 rowIndex:-1,
 	     isload:props.isload ? props.isload : false,
 		 import_visible:false,
-		 white_visible:true,
+		 white_visible:false,
 		 success_visible:false,
 		 fail_visible:false,
 		 file_loading:false,
@@ -92,7 +92,15 @@ export default class acclist extends React.Component{
 		//除了主key批次窗口其他都禁用
 		if(this.props.name > 0)
 		{
-			this.setState({whiteStyle:true})
+			
+			this.setState({whiteStyle:this.props.whiteStyle})
+			if(this.props.keyStyle == 5)
+			{
+				this.setState({white_visible:this.props.whiteStyle})
+			}
+			let model = this.state.model;
+			model.style = this.props.keyStyle
+			this.setState({model:model})
 		}
 	  
    }
@@ -103,7 +111,7 @@ export default class acclist extends React.Component{
 		{
 			let data = {};
 			data.batch_name = this.state.model.batch_name;
-			data.style = this.state.model.style;
+			data.style = this.state.model.style == 5 ? 1 : this.state.model.style;
 			data.quantity = this.state.model.quantity;
 			data.bind_object = this.state.checkedList;
 			data.allow_repetition = this.state.model.allow_repetition;
@@ -132,7 +140,7 @@ export default class acclist extends React.Component{
 		model2.style = e.target.value;
 		model2.quantity = 0
 		this.setState({model:model2})
-		if(e.target.value == 1)
+		if(e.target.value == 5)
 		{
 			this.setState({white_visible:true})
 		}
@@ -225,14 +233,33 @@ export default class acclist extends React.Component{
 	
 	
 	componentWillReceiveProps(nextProps) {
-		
 		if(this.state.whiteStyle != nextProps.whiteStyle)
+		{
+			if(this.props.name > 0)
+			{
+				this.setState({whiteStyle:nextProps.whiteStyle})
+			}
+		}
+		
+		if(this.state.model.style != nextProps.keyStyle)
 		{
 			
 			if(this.props.name > 0)
 			{
 				console.log("更改状态")
-				this.setState({whiteStyle:nextProps.whiteStyle})
+				
+				let model = this.state.model;
+				model.style = nextProps.keyStyle
+				this.setState({model:model})
+				
+				if(model.style == 5)
+				{
+					this.setState({white_visible:true})
+				}
+				else{
+					this.setState({white_visible:false})
+				}
+				
 			}
 		}
 	  }
@@ -900,9 +927,10 @@ export default class acclist extends React.Component{
 	  <Form  model={this.state.model} rules={rules} ref="form1">
 	    <FormItem labelname=" key样式" prop="style" id="style">
 			<RadioGroup onChange={(e)=>{ this.onStyleChange(e)} } value={this.state.model.style}>
-			        <RadioButton value={1}>串码</RadioButton>
+			        <RadioButton value={1}  disabled={this.props.name > 0 && this.state.model.style !=1} >串码</RadioButton>
-			        <RadioButton value={2} disabled={this.state.whiteStyle} >链接</RadioButton>
+			        <RadioButton value={2}  disabled={this.props.name > 0 && this.state.model.style !=2} >链接</RadioButton>
-					  <RadioButton value={4} disabled={this.state.whiteStyle}>二维码</RadioButton>
+					  <RadioButton value={4} disabled={this.props.name > 0 && this.state.model.style !=4} >二维码</RadioButton>
+					  <RadioButton value={5}  disabled={this.props.name > 0 && this.state.model.style !=5} >白名单</RadioButton>
 			 </RadioGroup>
 	      </FormItem>
 		  
@@ -949,7 +977,7 @@ export default class acclist extends React.Component{
 					  									  this.setState({model:model2}) 
 					  }}
 					  
-					  value={this.state.model.quantity}   disabled={this.state.import_success}      placeholder={"请输入"}  labelWidth={'0px'}  maxLength={5} height={'36px'} width={'400px'}   alignment={'left'}/>
+					  value={this.state.model.quantity}   disabled={this.state.model.style == 5}      placeholder={"请输入"}  labelWidth={'0px'}  maxLength={5} height={'36px'} width={'400px'}   alignment={'left'}/>