diff --git a/src/App.css b/src/App.css
index f084f29e..dffe6588 100644
--- a/src/App.css
+++ b/src/App.css
@@ -176,3 +176,7 @@ resize: none;
   border: none!important;
 }
 
+.zent-btn-primary.zent-btn-disabled.zent-btn
+{
+	background-color: #B8BCC2 !important;
+}
\ No newline at end of file
diff --git a/src/pages/plan/add/edit.js b/src/pages/plan/add/edit.js
index 2dc84083..9f65561b 100644
--- a/src/pages/plan/add/edit.js
+++ b/src/pages/plan/add/edit.js
@@ -60,7 +60,8 @@ export default class add extends React.Component{
 	 componentDidMount(e){
 		 console.log("测试编辑")
 		 console.log(sessionStorage.getItem("plan_id"))
-		 if(sessionStorage.getItem("plan_status") == 4)
+		 let plan_status = sessionStorage.getItem("plan_status");
+		 if(plan_status == 3 ||plan_status == 4|| plan_status == 5 )
 		 {
 			 this.setState({disabled:true})
 		 }
diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js
index eee1c338..94fa46be 100644
--- a/src/pages/plan/key/list.js
+++ b/src/pages/plan/key/list.js
@@ -116,6 +116,7 @@ export default class acclist extends React.Component{
       distdata3:[],
       distdata11:[],
       tableHeight:600,
+	  disabled:false,
     email:"",
     key_word:'',
 	  phone:"",
@@ -329,6 +330,11 @@ onEditRow(status,row){
 
 componentWillMount(){
   this.setState({tableHeight:window.innerHeight-390});
+  if(sessionStorage.getItem("key_plan_status")==6)
+  {
+	  this.setState({disabled:true})
+  }
+  
 }
 
 phoneChange=(e)=>
@@ -539,7 +545,7 @@ onChangeCombinedDate(e){
       <div id="exchangecodelist">
          <TabPage slot={date} tabs={this.state.tabList} tabChange={this.tabFn.bind(this)}>
         <p className="codetable dflexj">
-        <Button type="primary" icon="plus" onClick={this.clickFn.bind(this)}>新建key</Button>
+        <Button type="primary" icon="plus" onClick={this.clickFn.bind(this)}  disabled={this.state.disabled} >新建key</Button>
         {/* <Button type="info">批量操作</Button> */}
         <Ipt  icon="search" placeholder={"请输入key批次ID进行匹配查询"} onChange={(e)=>this.setState({key_word:e})} value={this.state.key_word}  wordSearch={this.iptsureFn.bind(this)}  countShow={false} height={'36px'} width={'260px'}  onClearItem={(e)=>{this.setState({key_word:''})}} alignment={'left'}     />
         </p>
diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js
index b4166d23..7978612f 100644
--- a/src/pages/plan/list/list.js
+++ b/src/pages/plan/list/list.js
@@ -259,6 +259,7 @@ export default class acclist extends React.Component{
 		sessionStorage.setItem('breaknav',JSON.stringify(arr));
 		sessionStorage.setItem('linkshowname',"营销计划管理");
 		sessionStorage.setItem("key_plan_id",row.id)
+		sessionStorage.setItem("key_plan_status",row.status)
 		this.props.history.push('/home/key-list');
 	}
 	menuItemClick(e,key,row){
@@ -479,10 +480,12 @@ export default class acclist extends React.Component{
 	
 	onEdit(e,row){
 		console.log("计划任务ID")
-		
-		
-		if(row.status == 6 ||row.status == 0)
+		if(row.status == 2 || row.status == 6)
 		{
+			Notify.error("不可编辑")
+			return;
+		}
+	
 		sessionStorage.setItem("plan_id",row.id)
 		sessionStorage.setItem("plan_status",row.status)
 		let link = window.location.href.replace(window.location.hash,"#/home/plan-edit");
@@ -495,11 +498,7 @@ export default class acclist extends React.Component{
 		sessionStorage.setItem('breaknav',JSON.stringify(arr));
 		sessionStorage.setItem('linkshowname',"营销计划管理");
 		
-		}
-		else{
-			
-				Notify.error("不可编辑此行")
-		}
+		
 		
 	}
   render(){