From 33e5a49f9f0817c767bd173d4d39aef601dd3eaf Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Thu, 28 Jul 2022 15:44:33 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=20=20key=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=AE=A1=E7=90=86=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E8=BE=93=E5=85=A5=E6=A1=86=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=202=E3=80=81?=
 =?UTF-8?q?=E4=B8=8E=E5=90=8E=E7=AB=AF=E5=AF=B9=E6=8E=A5=20key=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=AE=A1=E7=90=86=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20=E9=9D=99=E6=80=81=E5=AD=97=E6=AE=B5=203?=
 =?UTF-8?q?=E3=80=81=E8=B0=83=E8=AF=95=E5=AE=8C=E6=88=90key=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=204=E3=80=81=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/api.js                 |  2 +-
 src/components/keysFind/index.jsx | 25 ++++++++++++++-----------
 src/pages/plan/keyList/index.jsx  | 12 ++++++------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/assets/api.js b/src/assets/api.js
index 33556a86..b3a9aca2 100644
--- a/src/assets/api.js
+++ b/src/assets/api.js
@@ -868,7 +868,7 @@ export const addFund = (data, id) => {
 
 // key列表
 export const getKeysList = (data) => {
-  return req('post', baseurl + '/key', data)
+  return req('get', baseurl + '/key', data)
 }
 
 // 批量上传查询
diff --git a/src/components/keysFind/index.jsx b/src/components/keysFind/index.jsx
index de6cc9cc..c041ceb6 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 14:43:42
+ * @LastEditTime: 2022-07-28 15:29:24
  * @Description:key列表查询组件
  * @FilePath: \frontend\src\components\keysFind\index.jsx
  */
@@ -15,11 +15,11 @@ import FormItem from '@/components/form-item/main'
 import _ from 'lodash'
 
 const stateList = [
-  { key: 1, text: '全部' },
-  { key: 2, text: '待使用' },
-  { key: 3, text: '已使用' },
-  { key: 4, text: '已完结' },
-  { key: 5, text: '已作废' }
+  { key: 0, text: '全部' },
+  { key: 1, text: '待使用' },
+  { key: 2, text: '已使用' },
+  { key: 3, text: '已完结' },
+  { key: 4, text: '已作废' }
 ]
 function init() {
   return {
@@ -38,9 +38,9 @@ export default ({ onQuery }) => {
     return {
       begin_time: data.date[0] || null,
       end_time: data.date[1] || null,
-      reseller_name: data.reseller?.text,
-      plan_name: data.plan?.text,
-      status: data.state?.key,
+      reseller_name: data.reseller || null,
+      plan_name: data.plan || null,
+      status: data.state?.key || null,
       key: data.key || null
     }
   }
@@ -75,7 +75,8 @@ export default ({ onQuery }) => {
             labelWidth='0px'
             placeholder='请输入'
             width={204}
-            onChange={(va) => setModels({ ...models, key: va })}
+            onClearItem={() => setModels({ ...models, reseller: '' })}
+            onChange={(va) => setModels({ ...models, reseller: va })}
           />
         </FormItem>
 
@@ -86,7 +87,8 @@ export default ({ onQuery }) => {
             labelWidth='0px'
             placeholder='请输入'
             width={204}
-            onChange={(va) => setModels({ ...models, key: va })}
+            onChange={(va) => setModels({ ...models, plan: va })}
+            onClearItem={() => setModels({ ...models, plan: '' })}
           />
         </FormItem>
         <FormItem labelname='KEY：' required='' labelwidth='50px'>
@@ -97,6 +99,7 @@ export default ({ onQuery }) => {
             placeholder='请输入'
             width={204}
             onChange={(va) => setModels({ ...models, key: va })}
+            onClearItem={() => setModels({ ...models, key: '' })}
           />
         </FormItem>
 
diff --git a/src/pages/plan/keyList/index.jsx b/src/pages/plan/keyList/index.jsx
index 102b82c4..710d7eaf 100644
--- a/src/pages/plan/keyList/index.jsx
+++ b/src/pages/plan/keyList/index.jsx
@@ -375,15 +375,15 @@ export default class acclist extends React.Component {
         title: '归属营销计划',
         width: 'auto',
         type: 'normal',
-        prop: 'plan_title',
-        name: 'plan_title'
+        prop: 'title',
+        name: 'title'
       },
       {
         title: '归属KEY批次',
-        prop: 'status',
-        name: 'status',
+        prop: 'batch_name',
+        name: 'batch_name',
         width: 'auto',
-        type: 'slot'
+        type: 'normal'
       },
       {
         title: '状态',
@@ -446,7 +446,7 @@ export default class acclist extends React.Component {
         name: 'update_time',
         prop: 'update_time',
         type: 'normal',
-        width: 'auto'
+        width: '220px'
       }
     ]
     const date = (