From 43adddd11fff212ecca367b077790a8c9a69cecf Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Thu, 28 Jul 2022 11:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20key=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/keysFind/index.jsx | 16 +++++++++++++---
 src/pages/plan/keyList/index.jsx  |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/keysFind/index.jsx b/src/components/keysFind/index.jsx
index f3835835..9ab95165 100644
--- a/src/components/keysFind/index.jsx
+++ b/src/components/keysFind/index.jsx
@@ -2,7 +2,7 @@
  * @Author: Wind
  * @Date: 2022-07-25 10:53:41
  * @LastEditors: Wind
- * @LastEditTime: 2022-07-28 09:49:31
+ * @LastEditTime: 2022-07-28 11:26:12
  * @Description:key列表查询组件
  * @FilePath: \frontend\src\components\keysFind\index.jsx
  */
@@ -57,6 +57,16 @@ export default ({ onQuery }) => {
     })
   }, [])
 
+  function onChange(data) {
+    return {
+      date: data.date.length || null,
+      reseller: data.reseller?.key,
+      plan: data.plan?.key,
+      state: data.state?.key,
+      key: data.key || null
+    }
+  }
+
   return (
     <div className='keysFind'>
       <Form>
@@ -116,13 +126,13 @@ export default ({ onQuery }) => {
         </FormItem>
 
         <div>
-          <Button type='primary' onClick={() => onQuery(models)}>
+          <Button type='primary' onClick={() => onQuery(onChange(models))}>
             查询
           </Button>
           <Button
             onClick={() => {
               setModels(init())
-              onQuery(init())
+              onQuery(onChange(init()))
             }}>
             重置
           </Button>
diff --git a/src/pages/plan/keyList/index.jsx b/src/pages/plan/keyList/index.jsx
index ad6eccca..465d8e9e 100644
--- a/src/pages/plan/keyList/index.jsx
+++ b/src/pages/plan/keyList/index.jsx
@@ -101,13 +101,13 @@ export default class acclist extends React.Component {
   }
 
   getKeyCodeList(data) {
-    console.log(data, this.state.conditionalQuery)
     let queryParams = _.omitBy(
       { ...data, ...this.state.conditionalQuery },
       (value) => {
         return _.isNaN(value) || _.isNil(value)
       }
     )
+    console.log(queryParams)
     let id = sessionStorage.getItem('key_batch_id')
 
     getkeyDetailList(id, queryParams).then((res) => {