合并冲突

src/pages/plan/keyList/index.jsx

@@ -27,7 +27,8 @@ import {
   handelResponse,
   getKeysList,
   batchUploadVoid,
-  batchUploadUsed
+  batchUploadUsed,
+  exportKey
 } from '@/assets/api.js'
 import _ from 'lodash'
 import menu from '@/assets/enum.js'
@@ -87,7 +88,9 @@ export default class acclist extends React.Component {
       bachUrl: '',
       conditionalQuery: {}, //条件查询
       bachApiType: 1,
-      lodging: false
+      lodging: false,
+      exportKeyBtn: false,
+      hashPop: ''
     }
   }
 
@@ -101,7 +104,7 @@ export default class acclist extends React.Component {
   }
 
   componentDidMount(e) {
-    // this.iptsureFn()
+    // this.iptsureFn();
   }
   componentWillMount() {
     this.setState({ tableHeight: window.innerHeight - 430 })
@@ -388,6 +391,14 @@ export default class acclist extends React.Component {
     this.setState(obj)
   }
 
+  // 批量导出
+  bachExportKey() {
+    let param = {
+      hash: this.state.hashPop
+    }
+    console.log('批量导出 =>', param)
+  }
+
   // 取消按钮
   bachOnClose() {
     this.setState({ bachVisible: false })
@@ -575,6 +586,13 @@ export default class acclist extends React.Component {
                 disabled={this.state.multiple}>
                 批量标记为已使用
               </Button>
+              <Button
+                onClick={() => {
+                  this.bachExportKey()
+                }}
+                disabled={this.state.exportKeyBtn}>
+                导出
+              </Button>
             </div>
           </div>
           <div>