diff --git a/src/assets/api.js b/src/assets/api.js index e3d104b1..483a0be9 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); }; export const bachUploadAll = (url, file) => { 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 })} /> @@ -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: '' })} /> @@ -97,6 +99,7 @@ export default ({ onQuery }) => { placeholder='请输入' width={204} onChange={(va) => setModels({ ...models, key: va })} + onClearItem={() => setModels({ ...models, key: '' })} /> diff --git a/src/pages/plan/keyList/index.jsx b/src/pages/plan/keyList/index.jsx index de966137..a3f9e3c5 100644 --- a/src/pages/plan/keyList/index.jsx +++ b/src/pages/plan/keyList/index.jsx @@ -395,15 +395,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: "状态", @@ -466,7 +466,7 @@ export default class acclist extends React.Component { name: "update_time", prop: "update_time", type: "normal", - width: "auto", + width: "220px", }, ]; const date = (