From 195470935427dfd29f9221d14765fd5169720d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=A3=9A?= <849005670@qq.com>
Date: Fri, 7 Jan 2022 17:33:06 +0800
Subject: [PATCH] =?UTF-8?q?key=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/plan/key/detail/list.js | 21 ++++++++++-----------
 src/pages/plan/key/detail/log.js  | 12 +++++++-----
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/pages/plan/key/detail/list.js b/src/pages/plan/key/detail/list.js
index 250a1679..cf5c0b1a 100644
--- a/src/pages/plan/key/detail/list.js
+++ b/src/pages/plan/key/detail/list.js
@@ -216,10 +216,7 @@ export default class acclist extends React.Component{
 			
 			keyCancel(formdata).then((res)=>{
 					  handelResponse(res,(req,msg)=>{
-						
-						
-						
-						
+						Notify.success("作废成功")
 					  },(err)=>{
 						  console.log(err)
 					  })
@@ -235,7 +232,7 @@ export default class acclist extends React.Component{
 			
 			keyBatchUsage(formdata).then((res)=>{
 					  handelResponse(res,(req,msg)=>{
-					
+						Notify.success("标记为使用成功")
 					  },(err)=>{
 						  console.log(err)
 					  })
@@ -244,11 +241,13 @@ export default class acclist extends React.Component{
 		}
 		if(key == 3)
 		{
-			console.log(rowData)
-			this.props.history.push('/home/key-log?key='+rowData.key);
+			   sessionStorage.setItem("keyCode",rowData.key)
+			console.log("key数据",rowData)
+			this.props.history.push('/home/key-log');
 			sessionStorage.setItem('pathname2','/home/key-log')
 			
 			let cur_nav = sessionStorage.getItem("breakchangenav")
+	     
 			if(cur_nav.length > 0 && cur_nav[0].items)
 			{
 				cur_nav[0].items.push({path:"/home/key-log",name:cur_nav[0].items[cur_nav[0].items.length - 1].name+"日志"})
@@ -280,12 +279,12 @@ export default class acclist extends React.Component{
 		})
 		
 		let formdata={
-			keys:keys.toString()
+			keys:keys
 		}
 		
 		keyBatchCancel(formdata).then((res)=>{
 				  handelResponse(res,(req,msg)=>{
-				
+					 Notify.success("批量作废成功")
 				  },(err)=>{
 					  console.log(err)
 				  })
@@ -297,12 +296,12 @@ export default class acclist extends React.Component{
 		})
 		
 		let formdata={
-			keys:keys.toString()
+			keys:keys
 		}
 		
 		keyBatchUsage(formdata).then((res)=>{
 				  handelResponse(res,(req,msg)=>{
-				
+					Notify.success("批量标记为使用成功")
 				  },(err)=>{
 					  console.log(err)
 				  })
diff --git a/src/pages/plan/key/detail/log.js b/src/pages/plan/key/detail/log.js
index 333fe4c7..1835a8b6 100644
--- a/src/pages/plan/key/detail/log.js
+++ b/src/pages/plan/key/detail/log.js
@@ -35,6 +35,7 @@ const Column = [
 export default class Key extends React.Component{
   constructor(props){
     super(props)
+	console.log("属性",props)
     this.state={
       tabList:[{title:"日志"}],
       tabactive:0,
@@ -42,7 +43,7 @@ export default class Key extends React.Component{
       keyDetail_data:{},
       tableHeight:500,
       page:1,
-      orderNo:'',
+      key:'',
       limit:10,
       total:0,
     }
@@ -50,13 +51,12 @@ export default class Key extends React.Component{
   componentDidMount(e){
   	  let data = {
   		  page:1,
-  		  limit:10
+  		  limit:10,
   	  }
   	  this.getKeyLogFn(data);
   }
   tabFn(index){
     this.getKeyLogFn();
-  
   }
   selection(){
 
@@ -64,10 +64,12 @@ export default class Key extends React.Component{
   //获取订单日志
   getKeyLogFn(){
     let  _self=this;
-    let {page,limit,orderNo}=this.state;
+    let {page,limit}=this.state;
+	
     let data={
       page,
-      limit
+      limit,
+	  key:sessionStorage.getItem("keyCode")
     }
     getKeyLog(data).then(res=>{
       handelResponse(res,(response,msg)=>{