diff --git a/src/pages/plan/add/add.js b/src/pages/plan/add/add.js
index 6e7c17d5..ba31b446 100644
--- a/src/pages/plan/add/add.js
+++ b/src/pages/plan/add/add.js
@@ -81,9 +81,11 @@ export default class add extends React.Component{
 			let temp=[]
 			for(let i = 0;i < this.state.keys.length;i++)
 			{
-				
-				let data = this.refs[this.state.keys[i]].submit();
-				
+				let data = null
+				if(this.refs[this.state.keys[i]])
+				{
+				data = this.refs[this.state.keys[i]].submit();
+				}
 				if(data)
 				{
 					temp.push(data)
@@ -94,7 +96,6 @@ export default class add extends React.Component{
 					return;
 				}
 			}
-			console.log("第二部过了")
 			
 			
 			let obj = {
@@ -106,8 +107,6 @@ export default class add extends React.Component{
 		await addPlanStep(plan_id,obj).then((res)=>{
 			    handelResponse(res,(req,msg)=>{
 					this.setState({curstep:3})
-					
-					console.log("第二部")
 					sessionStorage.setItem("step2", JSON.stringify(temp))
 					this.setState({card_visible:true})
 					return;
@@ -117,8 +116,6 @@ export default class add extends React.Component{
 			})
 			
 		}
-		
-		console.log("第三部")
 	   if(this.state.curstep == 3){
 		
 		    let data =  this.refs.step3.submit();
@@ -180,9 +177,14 @@ export default class add extends React.Component{
 	
 	closeStep(index){
 		
-		delete this.state.keys[index];
-		this.setState({keys:this.state.keys})
+		// delete this.state.keys[index];
 		
+		_.remove(this.state.keys, (n)=>{
+		  return   n ==  this.state.keys[index];
+		});
+		
+		this.setState({keys:this.state.keys})
+		console.log(this.state.keys)
 	}
 	
 	
diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js
index 37586789..eee1c338 100644
--- a/src/pages/plan/key/list.js
+++ b/src/pages/plan/key/list.js
@@ -568,7 +568,7 @@ onChangeCombinedDate(e){
           ComponentHandler={(com,rowData)=>{
           if(com == "switch")
           {
-          	return <Switch  size="small" checked={rowData.status==4?true:false}  onChange={(e)=>{this.onSwitchChange(e,rowData)}}></Switch>;
+          	return <Switch  size="small" checked={rowData.status==4?true:false}   disabled={rowData.status >= 6 ? true :false }      onChange={(e)=>{this.onSwitchChange(e,rowData)}}></Switch>;
           }
 		  
 		 if(com == "status")
@@ -577,23 +577,41 @@ onChangeCombinedDate(e){
 		 	}
 		  if(com == "edit")
 		  {
-			 return  <span>
-				<a  className="grid-link" onClick={(e)=>{this.onEditRow(e,rowData)}} >编辑</a>
-				 <Dropdown position={DropdownPosition.RightTop  } >
-				    <DropdownClickTrigger>
-				    <div className="linkmore"> 更多  <Icon type={"down"} /> </div>
-				    </DropdownClickTrigger>
-				    <DropdownContent>
-				      <Menu onClick={(e,key)=>this.menuItemClick(e,key,rowData)} style={{width:"400px"}}>
-				     <MenuItem key="1">再次发送密码</MenuItem>
-				     <MenuItem key="2">再次发送key</MenuItem>
-				     <MenuItem key="3">修改接收邮箱发送</MenuItem>
-				     <MenuItem key="4">修改接收手机发送</MenuItem>
-						<MenuItem key="5">作废</MenuItem>
-				      </Menu>
-				    </DropdownContent>
-				  </Dropdown>
-               </span> 
+			  
+			  
+			   let str2 = <span>
+			   <a  className="grid-link disabled"  >编辑</a>
+			    <Dropdown position={DropdownPosition.RightTop  }>
+			    <DropdownClickTrigger>
+			    <div className="linkmore disabled"> 更多  <Icon type={"down"} /> </div>
+			    </DropdownClickTrigger>
+			    <DropdownContent>
+			    </DropdownContent>
+			  </Dropdown>
+			   </span>  
+			   
+			   
+			   let str =    <span>
+			   				<a  className="grid-link" onClick={(e)=>{this.onEditRow(e,rowData)}} >编辑</a>
+			   				 <Dropdown position={DropdownPosition.RightTop  } >
+			   				    <DropdownClickTrigger>
+			   				    <div className="linkmore"> 更多  <Icon type={"down"} /> </div>
+			   				    </DropdownClickTrigger>
+			   				    <DropdownContent>
+			   				      <Menu onClick={(e,key)=>this.menuItemClick(e,key,rowData)} style={{width:"400px"}}>
+			   				     <MenuItem key="1">再次发送密码</MenuItem>
+			   				     <MenuItem key="2">再次发送key</MenuItem>
+			   				     <MenuItem key="3">修改接收邮箱发送</MenuItem>
+			   				     <MenuItem key="4">修改接收手机发送</MenuItem>
+			   						<MenuItem key="5">作废</MenuItem>
+			   				      </Menu>
+			   				    </DropdownContent>
+			   				  </Dropdown>
+			     </span> 
+			  
+			  
+			  
+			 return   rowData.status >= 6 ? str2 : str
 		  }
         }}
         />
diff --git a/src/pages/plan/key/list.less b/src/pages/plan/key/list.less
index 2878f5f6..51dec9dc 100644
--- a/src/pages/plan/key/list.less
+++ b/src/pages/plan/key/list.less
@@ -12,5 +12,7 @@
     color: #2B66F2;
     cursor: pointer;
   }
-
+  .linkmore.disabled ,.grid-link.disabled{
+	  color: #000000;
+  }	
 }
\ No newline at end of file
diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js
index 1ac0b725..51a97425 100644
--- a/src/pages/plan/list/list.js
+++ b/src/pages/plan/list/list.js
@@ -633,8 +633,12 @@ export default class acclist extends React.Component{
 				}
 				if(com == "opearo")
 				{
-				return  <span>
-				<a  className="grid-link"  onClick={(e)=>{this.onEdit(e,rowData)} } >编辑</a>
+			
+				   
+				   
+				   
+				let  str =    <span>
+				   <a  className="grid-link"  onClick={(e)=>{this.onEdit(e,rowData)} } >编辑</a>
 				 <Dropdown position={DropdownPosition.RightTop  }>
 				    <DropdownClickTrigger>
 				    <div className="linkmore"> 更多  <Icon type={"down"} /> </div>
@@ -648,7 +652,21 @@ export default class acclist extends React.Component{
 				      </Menu>
 				    </DropdownContent>
 				  </Dropdown>
-               </span>
+                   </span>  
+				   
+				   let str2 = <span>
+				   <a  className="grid-link"  >编辑</a>
+				    <Dropdown position={DropdownPosition.RightTop  }>
+				    <DropdownClickTrigger>
+				    <div className="linkmore"> 更多  <Icon type={"down"} /> </div>
+				    </DropdownClickTrigger>
+				    <DropdownContent>
+				    </DropdownContent>
+				  </Dropdown>
+                   </span>  
+				   
+				   
+				   	return  str
 				}
 			}}
 			/>