diff --git a/src/pages/order3/SaleTask/api.ts b/src/pages/order3/SaleTask/api.ts index f8397e5..6df1ea0 100644 --- a/src/pages/order3/SaleTask/api.ts +++ b/src/pages/order3/SaleTask/api.ts @@ -189,9 +189,10 @@ export interface PreviewTaskReq { secondManageId?: number; thirdManageId?: number; taskId?: number; - orderTaskApprovalType: number; - id: number; + orderTaskApprovalType?: number; + id?: number; token?: string; + keywords?: string; } export interface TaskListItem { diff --git a/src/pages/order3/SaleTask/components/EntryTaskPreview.tsx b/src/pages/order3/SaleTask/components/EntryTaskPreview.tsx index 6541c8f..291500a 100644 --- a/src/pages/order3/SaleTask/components/EntryTaskPreview.tsx +++ b/src/pages/order3/SaleTask/components/EntryTaskPreview.tsx @@ -1,17 +1,27 @@ import React, { useState } from "react"; -import { Card, Radio, RadioChangeEvent, Row, Table } from "antd"; +import { + Card, + DatePicker, + Input, + Radio, + RadioChangeEvent, + Row, + Table, +} from "antd"; import { observer } from "mobx-react-lite"; import * as API from "../api"; import { OrderTaskApprovalType } from "../entity"; import useInitial from "@/hooks/useInitail"; import ModifiedTableCell from "./ModifiedTableCell"; import { ColumnsType } from "antd/es/table"; +import { Moment } from "moment"; const RadioButton = Radio.Button; const RadioGroup = Radio.Group; // 预览任务入口弹框 interface EntryTaskPreviewProps { + month: Moment; params: any; // API.PreviewTaskReq showAdviserModal: ( record: API.TaskListItem, @@ -24,6 +34,7 @@ interface EntryTaskPreviewProps { } const EntryTaskPreview = ({ + month, params, showAdviserModal, showSeriesModal, @@ -40,14 +51,12 @@ const EntryTaskPreview = ({ if (value === 99) { setType(OrderTaskApprovalType.新车一级管理维度); setParams( - // @ts-ignore { orderTaskApprovalType: OrderTaskApprovalType.新车一级管理维度 }, true ); return; } setType(value); - // @ts-ignore setParams({ orderTaskApprovalType: value }, true); }; @@ -164,53 +173,72 @@ const EntryTaskPreview = ({ ]; return ( - - - - 门店 - - - 销顾 - - 销售管理层 - - {type !== OrderTaskApprovalType.门店维度 && - type !== OrderTaskApprovalType.销售顾问维度 && ( - - - 销售一级管理 - - - 销售二级管理 - - - 销售三级管理 - - - )} - - } - > - + + + { + setParams({ keywords: v }, true); + }} + /> + + + + + 门店 + + + 销顾 + + 销售管理层 + + {type !== OrderTaskApprovalType.门店维度 && + type !== OrderTaskApprovalType.销售顾问维度 && ( + + + 销售一级管理 + + + 销售二级管理 + + + 销售三级管理 + + + )} + } - loading={loading} - dataSource={data.taskList} - pagination={false} - scroll={{ y: 450 }} - /> - + > +
+ + ); }; diff --git a/src/pages/order3/SaleTask/index.tsx b/src/pages/order3/SaleTask/index.tsx index cc37c7d..d7abbc5 100644 --- a/src/pages/order3/SaleTask/index.tsx +++ b/src/pages/order3/SaleTask/index.tsx @@ -466,24 +466,8 @@ function SaleTaskList() { destroyOnClose footer={null} > - - - { - // todo setParams({ shopName: v }, true); - }} - /> -