wjx 2 éve
szülő
commit
5a847b9474

+ 13 - 2
src/pages/launchSystemNew/account/tableConfig.tsx

@@ -63,10 +63,21 @@ export function columnsMp(edit: (params: any) => void, del: (groupId: number, ac
             ellipsis: true,
         },
         {
-            title: '备注',
+            title: '腾讯备注',
+            dataIndex: 'memo',
+            key: 'memo',
+            align: 'center',
+            width: 100,
+            fixed: 'left',
+            ellipsis: true,
+        },
+        {
+            title: '本地备注',
             dataIndex: 'remark',
             key: 'remark',
-            width: 200,
+            align: 'center',
+            width: 100,
+            fixed: 'left',
             ellipsis: true,
         },
         // {

+ 132 - 18
src/pages/launchSystemNew/adq/ad/index.tsx

@@ -42,7 +42,19 @@ const Ad: React.FC<Props> = (props) => {
     const [update, setUpdate] = useState<{ visible: boolean, title: string }>({ visible: false, title: '' })
     const [model, setModel] = useState(true)
     const [copyData, setCopyData] = useState<{ visible: boolean }>({ visible: false })
-
+    const [queryFrom,set_queryFrom]=useState<{
+        pageNum: number;
+        pageSize: number;
+        accountIdList?: any[];
+        adgroupName?: string;
+        adgroupIdList?: any[];
+        promotedObjectType?: string;
+        isDeleted?: boolean
+        campaignIdList?: any[]
+        statusList?:any[],
+        memoList?:any[]
+        remarkList?:any[]
+    }>({pageNum:1,pageSize:20})
     const listAjax = useAjax((params) => getAdqAdgroupsList(params), { formatResult: true })
     const syncAjax = useAjax((adAccountId) => putAdqAdgroupsSync(adAccountId))
     const delListAdqAdgroups = useAjax((params) => delListAdqAdgroupsApi(params))
@@ -70,7 +82,9 @@ const Ad: React.FC<Props> = (props) => {
         promotedObjectType?: string;
         isDeleted?: boolean
         campaignIdList?: any[]
-        statusList?:any[]
+        statusList?:any[],
+        memoList?:any[]
+        remarkList?:any[]
     }) => {
         if (!params.adgroupName || params.adgroupName !== listAjax?.params[0]?.adgroupName) {
             !params.adgroupName && delete params.adgroupName
@@ -186,7 +200,8 @@ const Ad: React.FC<Props> = (props) => {
                                     value = value.replace(/[,,\s]/g,',')
                                     arr = value.split(',').filter(a=>a)
                                 }
-                                getList({ pageNum: 1, pageSize: 20, accountIdList: arr })
+                                set_queryFrom({...queryFrom,accountIdList: arr})
+                                getList({ ...queryFrom,pageNum: 1,  accountIdList: arr })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
@@ -197,7 +212,8 @@ const Ad: React.FC<Props> = (props) => {
                                         value = value.replace(/[,,\s]/g,',')
                                         arr = value.split(',').filter((a: any)=>a)
                                     }
-                                    getList({ pageNum: 1, pageSize: 20, accountIdList: arr })
+                                    set_queryFrom({...queryFrom,accountIdList: arr})
+                                    getList({...queryFrom, pageNum: 1, accountIdList: arr })
                                 }
                             }}
                             onChange={(e) => {
@@ -208,7 +224,8 @@ const Ad: React.FC<Props> = (props) => {
                                         value = value.replace(/[,,\s]/g,',')
                                         arr = value.split(',').filter((a: any)=>a)
                                     }
-                                    getList({ pageNum: 1, pageSize: 20, accountIdList: arr })
+                                    set_queryFrom({...queryFrom,accountIdList: arr})
+                                    getList({...queryFrom, pageNum: 1,  accountIdList: arr })
                                 }
                             }}
                         />
@@ -220,19 +237,22 @@ const Ad: React.FC<Props> = (props) => {
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, adgroupName: value })
+                                set_queryFrom({...queryFrom,adgroupName: value })
+                                getList({ ...queryFrom,pageNum: 1, adgroupName: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, adgroupName: value })
+                                    set_queryFrom({...queryFrom,adgroupName: value })
+                                    getList({ ...queryFrom,pageNum: 1,  adgroupName: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, adgroupName: value })
+                                    set_queryFrom({...queryFrom,adgroupName: value })
+                                    getList({...queryFrom, pageNum: 1,  adgroupName: value })
                                 }
                             }}
                         />
@@ -249,7 +269,8 @@ const Ad: React.FC<Props> = (props) => {
                                     value = value.replace(/[,,\s]/g,',')
                                     arr = value.split(',').filter((a: any)=>a)
                                 }
-                                getList({ pageNum: 1, pageSize: 20, adgroupIdList: arr })
+                                set_queryFrom({...queryFrom,adgroupIdList: arr  })
+                                getList({...queryFrom, pageNum: 1,  adgroupIdList: arr })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
@@ -260,7 +281,8 @@ const Ad: React.FC<Props> = (props) => {
                                         value = value.replace(/[,,\s]/g,',')
                                         arr = value.split(',').filter((a: any)=>a)
                                     }
-                                    getList({ pageNum: 1, pageSize: 20, adgroupIdList: arr })
+                                    set_queryFrom({...queryFrom,adgroupIdList: arr  })
+                                    getList({...queryFrom, pageNum: 1,  adgroupIdList: arr })
                                 }
                             }}
                             onChange={(e) => {
@@ -271,7 +293,8 @@ const Ad: React.FC<Props> = (props) => {
                                         value = value.replace(/[,,\s]/g,',')
                                         arr = value.split(',').filter((a: any)=>a)
                                     }
-                                    getList({ pageNum: 1, pageSize: 20, adgroupIdList: arr })
+                                    set_queryFrom({...queryFrom,adgroupIdList: arr  })
+                                    getList({...queryFrom, pageNum: 1,  adgroupIdList: arr })
                                 }
                             }}
                         />
@@ -288,7 +311,8 @@ const Ad: React.FC<Props> = (props) => {
                                     value = value.replace(/[,,\s]/g,',')
                                     arr = value.split(',').filter((a: any)=>a)
                                 }
-                                getList({ pageNum: 1, pageSize: 20, campaignIdList: arr })
+                                set_queryFrom({...queryFrom,campaignIdList: arr  })
+                                getList({ ...queryFrom,pageNum: 1,  campaignIdList: arr })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
@@ -299,7 +323,8 @@ const Ad: React.FC<Props> = (props) => {
                                         value = value.replace(/[,,\s]/g,',')
                                         arr = value.split(',').filter((a: any)=>a)
                                     }
-                                    getList({ pageNum: 1, pageSize: 20, campaignIdList: arr })
+                                    set_queryFrom({...queryFrom,campaignIdList: arr  })
+                                    getList({ ...queryFrom,pageNum: 1,  campaignIdList: arr })
                                 }
                             }}
                             onChange={(e) => {
@@ -310,7 +335,8 @@ const Ad: React.FC<Props> = (props) => {
                                         value = value.replace(/[,,\s]/g,',')
                                         arr = value.split(',').filter((a: any)=>a)
                                     }
-                                    getList({ pageNum: 1, pageSize: 20, campaignIdList: arr })
+                                    set_queryFrom({...queryFrom,campaignIdList: arr  })
+                                    getList({ ...queryFrom,pageNum: 1,  campaignIdList: arr })
                                 }
                             }}
                         />
@@ -325,7 +351,8 @@ const Ad: React.FC<Props> = (props) => {
                             }
                             allowClear
                             onChange={(value: any) => {
-                                getList({ pageNum: 1, pageSize: 20, promotedObjectType: value })
+                                set_queryFrom({...queryFrom,promotedObjectType: value  })
+                                getList({ ...queryFrom,pageNum: 1,  promotedObjectType: value })
                             }}
                         >
                             {Object.keys(PromotedObjectType).map(key => {
@@ -343,7 +370,8 @@ const Ad: React.FC<Props> = (props) => {
                             }
                             allowClear
                             onChange={(value: any) => {
-                                getList({ pageNum: 1, pageSize: 20, isDeleted: value })
+                                set_queryFrom({...queryFrom,isDeleted: value  })
+                                getList({ ...queryFrom,pageNum: 1,  isDeleted: value })
                             }}
                         >
                             <Select.Option value={true}>已删除</Select.Option>
@@ -361,7 +389,8 @@ const Ad: React.FC<Props> = (props) => {
                             }
                             allowClear
                             onChange={(value: any) => {
-                                getList({ pageNum: 1, pageSize: 20, statusList: value })
+                                set_queryFrom({...queryFrom,statusList: value  })
+                                getList({...queryFrom, pageNum: 1,  statusList: value })
                             }}
                         >
                             {
@@ -371,6 +400,90 @@ const Ad: React.FC<Props> = (props) => {
                             }
                         </Select>
                     </Col>
+                    <Col>
+                        <Input
+                            placeholder='腾讯备注'
+                            allowClear
+                            style={{ width: 150 }}
+                            onBlur={(e) => {
+                                let value = e.target.value
+                                let arr:any = []
+                                if(value){
+                                    value = value.replace(/[,,\s]/g,',')
+                                    arr = value.split(',').filter(a=>a)
+                                }
+                                set_queryFrom({...queryFrom,memoList: arr  })
+                                getList({...queryFrom, pageNum: 1,  memoList: arr })
+                            }}
+                            onKeyDownCapture={(e: any) => {
+                                let key = e.key
+                                if (key === 'Enter') {
+                                    let value = e.target.value
+                                    let arr:any = []
+                                    if(value){
+                                        value = value.replace(/[,,\s]/g,',')
+                                        arr = value.split(',').filter((a: any)=>a)
+                                    }
+                                    set_queryFrom({...queryFrom,memoList: arr  })
+                                    getList({...queryFrom, pageNum: 1,  memoList: arr })
+                                }
+                            }}
+                            onChange={(e) => {
+                                let value = e.target.value
+                                if (!value) {
+                                    let arr:any = []
+                                    if(value){
+                                        value = value.replace(/[,,\s]/g,',')
+                                        arr = value.split(',').filter((a: any)=>a)
+                                    }
+                                    set_queryFrom({...queryFrom,memoList: arr  })
+                                    getList({...queryFrom, pageNum: 1, memoList: arr })
+                                }
+                            }}
+                        />
+                    </Col>
+                    <Col>
+                        <Input
+                            placeholder='本地备注'
+                            allowClear
+                            style={{ width: 150 }}
+                            onBlur={(e) => {
+                                let value = e.target.value
+                                let arr:any = []
+                                if(value){
+                                    value = value.replace(/[,,\s]/g,',')
+                                    arr = value.split(',').filter(a=>a)
+                                }
+                                set_queryFrom({...queryFrom,remarkList: arr  })
+                                getList({...queryFrom, pageNum: 1,  remarkList: arr })
+                            }}
+                            onKeyDownCapture={(e: any) => {
+                                let key = e.key
+                                if (key === 'Enter') {
+                                    let value = e.target.value
+                                    let arr:any = []
+                                    if(value){
+                                        value = value.replace(/[,,\s]/g,',')
+                                        arr = value.split(',').filter((a: any)=>a)
+                                    }
+                                    set_queryFrom({...queryFrom,remarkList: arr  })
+                                    getList({...queryFrom, pageNum: 1,  remarkList: arr })
+                                }
+                            }}
+                            onChange={(e) => {
+                                let value = e.target.value
+                                if (!value) {
+                                    let arr:any = []
+                                    if(value){
+                                        value = value.replace(/[,,\s]/g,',')
+                                        arr = value.split(',').filter((a: any)=>a)
+                                    }
+                                    set_queryFrom({...queryFrom,remarkList: arr  })
+                                    getList({...queryFrom, pageNum: 1,  remarkList: arr })
+                                }
+                            }}
+                        />
+                    </Col>
                 </Row>
                 <Row gutter={[10, 10]} align='middle'>
                     <Col>
@@ -414,7 +527,8 @@ const Ad: React.FC<Props> = (props) => {
             onChange={(props: any) => {
                 let { sortData, pagination } = props
                 let { current, pageSize } = pagination
-                getList({ pageNum: current, pageSize })
+                set_queryFrom({...queryFrom,pageNum:current,pageSize})
+                getList({...queryFrom, pageNum: current, pageSize })
             }}
         />
     </div>

+ 18 - 0
src/pages/launchSystemNew/adq/ad/tableConfig.tsx

@@ -44,6 +44,24 @@ function tableConfig(
                 }}>{a}</a>
             }
         },
+        {
+            title: '腾讯备注',
+            dataIndex: 'memo',
+            key: 'memo',
+            align: 'center',
+            width: 100,
+            fixed: 'left',
+            ellipsis: true,
+        },
+        {
+            title: '本地备注',
+            dataIndex: 'remark',
+            key: 'remark',
+            align: 'center',
+            width: 100,
+            fixed: 'left',
+            ellipsis: true,
+        },
         {
             title: '广告ID',
             dataIndex: 'adgroupId',

+ 18 - 0
src/pages/launchSystemNew/adq/adAccount/tableConfig.tsx

@@ -35,6 +35,24 @@ function tableConfig(tableIdClick: (props: {
                 }}>{a}</a>
             }
         },
+        {
+            title: '腾讯备注',
+            dataIndex: 'memo',
+            key: 'memo',
+            align: 'center',
+            width: 100,
+            fixed: 'left',
+            ellipsis: true,
+        },
+        {
+            title: '本地备注',
+            dataIndex: 'remark',
+            key: 'remark',
+            align: 'center',
+            width: 100,
+            fixed: 'left',
+            ellipsis: true,
+        },
         {
             title: '账户余额(分)',
             dataIndex: 'balance',

+ 38 - 14
src/pages/launchSystemNew/adq/campaign/index.tsx

@@ -2,7 +2,7 @@
 import { useAjax } from '@/Hook/useAjax'
 import { CampaignTypeEnum, ConfiguredStatusEnum, PromotedObjectType } from '@/services/launchAdq/enum'
 import { Col, Row, Input, Select, message } from 'antd'
-import React, { useEffect, useCallback } from 'react'
+import React, { useEffect, useCallback, useState } from 'react'
 import TableData from '../../components/TableData'
 import tableConfig from './tableConfig'
 import { getAdqCampaignList, putAdqCampaignPage, putAdqCampaignConfigStatus } from '@/services/launchAdq/adq'
@@ -36,6 +36,17 @@ function Campaign(props: Props) {
     const listAjax = useAjax((params) => getAdqCampaignList(params), { formatResult: true })
     const syncAjax = useAjax((adAccountId) => putAdqCampaignPage(adAccountId))
     const switchAjax = useAjax((params) => putAdqCampaignConfigStatus(params))
+    const [queryFrom,set_queryFrom]=useState<{
+        pageNum: number;
+        pageSize: number;
+        userId?: string;//用户ID
+        accountId?: string;//账号本地ID
+        campaignName?: string;//计划名称
+        campaignId?: string;//计划ID
+        configuredStatus?: string;//计划状态
+        campaignType?: string;//计划类型
+        promotedObjectType?: string;//推广目标类型
+    }>({pageNum:1,pageSize:20})
     console.log('创意=====》')
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 20, accountId, ...queryParmas })
@@ -101,19 +112,22 @@ function Campaign(props: Props) {
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                set_queryFrom({...queryFrom,accountId: value})
+                                getList({...queryFrom, pageNum: 1,  accountId: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                    set_queryFrom({...queryFrom,accountId: value})
+                                    getList({ ...queryFrom,pageNum: 1, accountId: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                    set_queryFrom({...queryFrom,accountId: value})
+                                    getList({ ...queryFrom,pageNum: 1,accountId: value })
                                 }
                             }}
                         />
@@ -125,19 +139,22 @@ function Campaign(props: Props) {
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, campaignName: value })
+                                set_queryFrom({...queryFrom,campaignName: value})
+                                getList({ ...queryFrom,pageNum: 1, campaignName: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, campaignName: value })
+                                    set_queryFrom({...queryFrom,campaignName: value})
+                                    getList({ ...queryFrom,pageNum: 1,  campaignName: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, campaignName: value })
+                                    set_queryFrom({...queryFrom,campaignName: value})
+                                    getList({ ...queryFrom,pageNum: 1,campaignName: value })
                                 }
                             }}
                         />
@@ -149,19 +166,22 @@ function Campaign(props: Props) {
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, campaignId: value })
+                                set_queryFrom({...queryFrom,campaignId: value})
+                                getList({...queryFrom, pageNum: 1, campaignId: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, campaignId: value })
+                                    set_queryFrom({...queryFrom,campaignId: value})
+                                    getList({ ...queryFrom,pageNum: 1,  campaignId: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, campaignId: value })
+                                    set_queryFrom({...queryFrom,campaignId: value})
+                                    getList({...queryFrom, pageNum: 1,  campaignId: value })
                                 }
                             }}
                         />
@@ -170,7 +190,8 @@ function Campaign(props: Props) {
                         <Select placeholder='推广目标选择' style={{ minWidth: 150 }} showSearch filterOption={(input: any, option: any) =>
                             (option!.children as unknown as string).toLowerCase().includes(input.toLowerCase())
                         } allowClear onChange={(value: any) => {
-                            getList({ pageNum: 1, pageSize: 20, promotedObjectType: value })
+                            set_queryFrom({...queryFrom,promotedObjectType: value})
+                            getList({...queryFrom, pageNum: 1, promotedObjectType: value })
                         }}>
                             {
                                 Object.keys(PromotedObjectType).map(key => {
@@ -184,7 +205,8 @@ function Campaign(props: Props) {
                         <Select placeholder='计划状态' style={{ minWidth: 150 }} showSearch filterOption={(input: any, option: any) =>
                             (option!.children as unknown as string).toLowerCase().includes(input.toLowerCase())
                         } allowClear onChange={(value: any) => {
-                            getList({ pageNum: 1, pageSize: 20, configuredStatus: value })
+                            set_queryFrom({...queryFrom,configuredStatus: value})
+                            getList({ ...queryFrom,pageNum: 1,  configuredStatus: value })
                         }}>
                             {
                                 Object.keys(ConfiguredStatusEnum).map(key => {
@@ -198,7 +220,8 @@ function Campaign(props: Props) {
                         <Select placeholder='计划类型' style={{ minWidth: 150 }} showSearch filterOption={(input: any, option: any) =>
                             (option!.children as unknown as string).toLowerCase().includes(input.toLowerCase())
                         } allowClear onChange={(value: any) => {
-                            getList({ pageNum: 1, pageSize: 20, campaignType: value })
+                            set_queryFrom({...queryFrom,campaignType: value})
+                            getList({...queryFrom, pageNum: 1,  campaignType: value })
                         }}>
                             {
                                 Object.keys(CampaignTypeEnum).map(key => {
@@ -214,7 +237,8 @@ function Campaign(props: Props) {
             onChange={(props: any) => {
                 let { sortData, pagination } = props
                 let { current, pageSize } = pagination
-                getList({ pageNum: current, pageSize })
+                set_queryFrom({...queryFrom,pageNum:current,pageSize})
+                getList({ ...queryFrom,pageNum: current, pageSize })
             }}
         />
     </div>

+ 30 - 12
src/pages/launchSystemNew/adq/creative/index.tsx

@@ -2,7 +2,7 @@
 import { useAjax } from '@/Hook/useAjax'
 import { PromotedObjectType } from '@/services/launchAdq/enum'
 import { Col, Row, Input, Select, message } from 'antd'
-import React, { useEffect, useCallback } from 'react'
+import React, { useEffect, useCallback, useState } from 'react'
 import TableData from '../../components/TableData'
 import tableConfig from './tableConfig'
 import { getAdqAdcreativeList, putAdqTargetingSyncAll } from '@/services/launchAdq/adq'
@@ -34,6 +34,13 @@ function Creative(props: Props) {
     // api方法
     const listAjax = useAjax((params) => getAdqAdcreativeList(params), { formatResult: true })
     const syncAjax = useAjax((adAccountId) => putAdqTargetingSyncAll(adAccountId))
+    const [queryFrom,set_queryFrom]=useState<{
+        pageNum: number;
+        pageSize: number;
+        accountId?: string;
+        adcreativeName?: string;
+        adcreativeId?: string;
+    }>({pageNum:1,pageSize:20})
     console.log('创意=====》')
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 20, accountId, ...queryParmas })
@@ -86,19 +93,22 @@ function Creative(props: Props) {
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                set_queryFrom({...queryFrom,accountId: value })
+                                getList({...queryFrom, pageNum: 1,  accountId: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                    set_queryFrom({...queryFrom,accountId: value })
+                                    getList({...queryFrom, pageNum: 1,accountId: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                    set_queryFrom({...queryFrom,accountId: value })
+                                    getList({ ...queryFrom,pageNum: 1, accountId: value })
                                 }
                             }}
                         />
@@ -110,19 +120,22 @@ function Creative(props: Props) {
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, adcreativeName: value })
+                                set_queryFrom({...queryFrom,adcreativeName: value })
+                                getList({...queryFrom, pageNum: 1, adcreativeName: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, adcreativeName: value })
+                                    set_queryFrom({...queryFrom,adcreativeName: value })
+                                    getList({ ...queryFrom,pageNum: 1,  adcreativeName: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, adcreativeName: value })
+                                    set_queryFrom({...queryFrom,adcreativeName: value })
+                                    getList({ ...queryFrom,pageNum: 1, adcreativeName: value })
                                 }
                             }}
                         />
@@ -134,19 +147,22 @@ function Creative(props: Props) {
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, adcreativeId: value })
+                                set_queryFrom({...queryFrom,adcreativeId: value })
+                                getList({...queryFrom, pageNum: 1,  adcreativeId: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, adcreativeId: value })
+                                    set_queryFrom({...queryFrom,adcreativeId: value })
+                                    getList({...queryFrom, pageNum: 1,  adcreativeId: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, adcreativeId: value })
+                                    set_queryFrom({...queryFrom,adcreativeId: value })
+                                    getList({...queryFrom, pageNum: 1,  adcreativeId: value })
                                 }
                             }}
                         />
@@ -155,7 +171,8 @@ function Creative(props: Props) {
                         <Select placeholder='推广目标选择' style={{ minWidth: 150 }} showSearch filterOption={(input: any, option: any) =>
                             (option!.children as unknown as string).toLowerCase().includes(input.toLowerCase())
                         } allowClear onChange={(value: any) => {
-                            getList({ pageNum: 1, pageSize: 20, accountId })
+                            set_queryFrom({...queryFrom,accountId: value })
+                            getList({...queryFrom, pageNum: 1,  accountId:value })
                         }}>
                             {
                                 Object.keys(PromotedObjectType).map(key => {
@@ -170,7 +187,8 @@ function Creative(props: Props) {
             onChange={(props: any) => {
                 let { sortData, pagination } = props
                 let { current, pageSize } = pagination
-                getList({ pageNum: current, pageSize })
+                set_queryFrom({...queryFrom,pageNum:current,pageSize})
+                getList({...queryFrom, pageNum: current, pageSize })
             }}
         />
     </div>

+ 24 - 8
src/pages/launchSystemNew/adq/landingPage/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback } from 'react'
+import React, { useEffect, useCallback, useState } from 'react'
 import { Col, Input, message, Row } from 'antd'
 import { useAjax } from '@/Hook/useAjax'
 import { getAdqLandingPageList, putAdqLandingPage } from '@/services/launchAdq/adq'
@@ -9,6 +9,15 @@ function LandingPage(props: { accountId: string, adAccountId: string, userId: st
     let { accountId, adAccountId, userId, tableIdClick } = props
     const listAjax = useAjax((params) => getAdqLandingPageList(params), { formatResult: true })
     const syncAjax = useAjax((adAccountId) => putAdqLandingPage(adAccountId))
+    const [queryFrom,set_queryFrom]=useState<{
+        pageNum: number;
+        pageSize: number;
+        accountId?: string;
+        pageName?: string;
+        pageType?: string;
+        pageTemplateId?: string;
+        pageStatus?: string;
+    }>({pageNum:1,pageSize:20})
     console.log('落地页=====》')
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 20, accountId })
@@ -64,19 +73,22 @@ function LandingPage(props: { accountId: string, adAccountId: string, userId: st
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                set_queryFrom({...queryFrom,accountId: value})
+                                getList({ ...queryFrom,pageNum: 1,  accountId: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                    set_queryFrom({...queryFrom,accountId: value})
+                                    getList({ ...queryFrom,pageNum: 1,  accountId: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                    set_queryFrom({...queryFrom,accountId: value})
+                                    getList({ ...queryFrom,pageNum: 1,  accountId: value })
                                 }
                             }}
                         />
@@ -88,19 +100,22 @@ function LandingPage(props: { accountId: string, adAccountId: string, userId: st
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, pageName: value })
+                                set_queryFrom({...queryFrom,pageName: value})
+                                getList({...queryFrom, pageNum: 1,  pageName: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, pageName: value })
+                                    set_queryFrom({...queryFrom,pageName: value})
+                                    getList({ ...queryFrom,pageNum: 1,  pageName: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, pageName: value })
+                                    set_queryFrom({...queryFrom,pageName: value})
+                                    getList({ ...queryFrom,pageNum: 1,  pageName: value })
                                 }
                             }}
                         />
@@ -124,7 +139,8 @@ function LandingPage(props: { accountId: string, adAccountId: string, userId: st
             onChange={(props: any) => {
                 let { sortData, pagination } = props
                 let { current, pageSize } = pagination
-                getList({ pageNum: current, pageSize })
+                set_queryFrom({...queryFrom,pageNum:current,pageSize})
+                getList({...queryFrom, pageNum: current, pageSize })
             }}
         />
     </div>

+ 1 - 2
src/pages/launchSystemNew/adq/log/index.tsx

@@ -35,7 +35,6 @@ const Log: React.FC<Props> = (props) => {
 
     const getLogList = useAjax((params) => getLogListApi(params), { formatResult: true })
     /**************************/
-
     useEffect(() => {
         if (queryParmas?.accountId || queryParmas?.adgroupId || userId) {
             setQueryparams({ ...queryparams, ...queryParmas, userId })
@@ -105,7 +104,7 @@ const Log: React.FC<Props> = (props) => {
                     </Col>
                     <Col>
                         <Input
-                            placeholder='定向名称'
+                            placeholder='广告名称'
                             allowClear
                             style={{ width: 150 }}
                             value={queryparams.adgroupName}

+ 21 - 8
src/pages/launchSystemNew/adq/targeting/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback } from 'react'
+import React, { useEffect, useCallback, useState } from 'react'
 import { Col, Input, message, Row } from 'antd'
 import { useAjax } from '@/Hook/useAjax'
 import { getAdqTargetingList, putAdqTargetingSyncAll } from '@/services/launchAdq/adq'
@@ -9,6 +9,12 @@ function Targeting(props: { adAccountId: any, userId: string, accountId: any, ta
     let { accountId, adAccountId, userId, tableIdClick } = props
     const listAjax = useAjax((params) => getAdqTargetingList(params), { formatResult: true })
     const syncAjax = useAjax((adAccountId) => putAdqTargetingSyncAll(adAccountId))
+    const [queryFrom,set_queryFrom]=useState<{
+        pageNum: number;
+        pageSize: number;
+        accountId?: string;
+        targetingName?: string;
+    }>({pageNum:1,pageSize:20})
     console.log('定向=====》')
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 20, accountId })
@@ -61,19 +67,22 @@ function Targeting(props: { adAccountId: any, userId: string, accountId: any, ta
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                set_queryFrom({...queryFrom, accountId: value})
+                                getList({...queryFrom, pageNum: 1, accountId: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                    set_queryFrom({...queryFrom, accountId: value})
+                                    getList({ ...queryFrom,pageNum: 1, accountId: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, accountId: value })
+                                    set_queryFrom({...queryFrom, accountId: value})
+                                    getList({ ...queryFrom,pageNum: 1,  accountId: value })
                                 }
                             }}
                         />
@@ -85,19 +94,22 @@ function Targeting(props: { adAccountId: any, userId: string, accountId: any, ta
                             style={{ width: 150 }}
                             onBlur={(e) => {
                                 let value = e.target.value
-                                getList({ pageNum: 1, pageSize: 20, targetingName: value })
+                                set_queryFrom({...queryFrom, targetingName: value})
+                                getList({...queryFrom, pageNum: 1,  targetingName: value })
                             }}
                             onKeyDownCapture={(e: any) => {
                                 let key = e.key
                                 if (key === 'Enter') {
                                     let value = e.target.value
-                                    getList({ pageNum: 1, pageSize: 20, targetingName: value })
+                                    set_queryFrom({...queryFrom, targetingName: value})
+                                    getList({ ...queryFrom,pageNum: 1, targetingName: value })
                                 }
                             }}
                             onChange={(e) => {
                                 let value = e.target.value
                                 if (!value) {
-                                    getList({ pageNum: 1, pageSize: 20, targetingName: value })
+                                    set_queryFrom({...queryFrom, targetingName: value})
+                                    getList({...queryFrom, pageNum: 1,  targetingName: value })
                                 }
                             }}
                         />
@@ -108,7 +120,8 @@ function Targeting(props: { adAccountId: any, userId: string, accountId: any, ta
             onChange={(props: any) => {
                 let { sortData, pagination } = props
                 let { current, pageSize } = pagination
-                getList({ pageNum: current, pageSize })
+                set_queryFrom({...queryFrom,pageNum:current,pageSize})
+                getList({...queryFrom, pageNum: current, pageSize })
             }}
         />
     </div>