Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage

src/pages/launchSystemV3/material/tencent/search.tsx

@@ -1,4 +1,4 @@
-import { Button, Card, Col, Form, InputNumber, Row, Segmented, Select, Space } from "antd"
+import { Button, Card, Col, DatePicker, Form, InputNumber, Row, Segmented, Select, Space } from "antd"
 import React, { useEffect } from "react"
 import { getUserAllApi } from "@/services/operating/account";
 import { useAjax } from "@/Hook/useAjax";
@@ -38,9 +38,12 @@ const Search: React.FC<Props> = ({ onSearch, pageShowType, setPageShowType }) =>
             if (['accountIds', 'adgroupIds', 'dynamicCreativeIds', 'tencentMaterialId'].includes(key) && value) {
                 let value1 = value.replace(/[,，\s]/g, ',')
                 params[key] = value1.split(',').filter((a: any) => a)
-            } else if ('uploadTime' === key && value?.length === 2) {
-                params.uploadTimeMin = moment(value?.[0]).format('YYYY-MM-DD')
-                params.uploadTimeMax = moment(value?.[1]).format('YYYY-MM-DD')
+            } else if ('costTime' === key && value?.length === 2) {
+                params.costTimeMin = moment(value?.[0]).format('YYYY-MM-DD')
+                params.costTimeMax = moment(value?.[1]).format('YYYY-MM-DD')
+            } else if ('createTime' === key && value?.length === 2) {
+                params.createTimeMix = moment(value?.[0]).format('YYYY-MM-DD')
+                params.createTimeMax = moment(value?.[1]).format('YYYY-MM-DD')
             } else if ('sizeQueries' === key) {
                 params[key] = [value]
             } else {
@@ -69,7 +72,7 @@ const Search: React.FC<Props> = ({ onSearch, pageShowType, setPageShowType }) =>
                 }}
             >
                 <Row gutter={[0, 6]}>
-                    <Form.Item name={'designerIds'}>
+                    <Col><Form.Item name={'designerIds'}>
                         <Select
                             placeholder="设计师"
                             filterOption={(input, option) =>
@@ -82,7 +85,19 @@ const Search: React.FC<Props> = ({ onSearch, pageShowType, setPageShowType }) =>
                             loading={getUserAll.loading}
                             options={getUserAll?.data?.map((item: { nickname: any; userId: any }) => ({ label: item.nickname, value: item.userId }))}
                         />
-                    </Form.Item>
+                    </Form.Item></Col>
+                    <Col><Form.Item name={'pitcherId'}>
+                        <Select
+                            placeholder="投手"
+                            filterOption={(input, option) =>
+                                ((option?.label ?? '') as any).toLowerCase().includes(input.toLowerCase())
+                            }
+                            style={{ minWidth: 120 }}
+                            allowClear
+                            loading={getUserAll.loading}
+                            options={getUserAll?.data?.map((item: { nickname: any; userId: any }) => ({ label: item.nickname, value: item.userId }))}
+                        />
+                    </Form.Item></Col>
                     <Col><Form.Item name="materialType">
                         <Select
                             placeholder="素材类型"
@@ -121,19 +136,12 @@ const Search: React.FC<Props> = ({ onSearch, pageShowType, setPageShowType }) =>
                             />
                         </Form.Item>
                     </Col>
-                    {/* <Col><Form.Item name={'sysUserIds'}>
-                    <Select
-                        placeholder="投手"
-                        filterOption={(input, option) =>
-                            ((option?.label ?? '') as any).toLowerCase().includes(input.toLowerCase())
-                        }
-                        style={{ width: 190 }}
-                        maxTagCount={1}
-                        mode="multiple"
-                        allowClear
-                        options={getUserAll?.data?.map((item: { nickname: any; userId: any }) => ({ label: item.nickname, value: item.userId }))}
-                    />
-                </Form.Item></Col> */}
+                    {<Col><Form.Item name='costTime'>
+                        <DatePicker.RangePicker style={{ width: 250 }} placeholder={['消耗时间开始', '消耗时间结束']} />
+                    </Form.Item></Col>}
+                    {<Col><Form.Item name='createTime'>
+                        <DatePicker.RangePicker style={{ width: 250 }} placeholder={['创建时间开始', '创建时间结束']} />
+                    </Form.Item></Col>}
                     <Col><Form.Item>
                         <Space>
                             <Button onClick={() => form.resetFields()}>重置</Button>