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

src/pages/launchSystemV3/adqv3/ad/index.tsx

@@ -28,7 +28,7 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
     const [addDynamicVisible, setAddDynamicVisible] = useState<boolean>(false)
     const [handleType, setHandleType] = useState<number>(1)
     const [czjlShow, setCzjlShow] = useState(false)
-    const [updateData, setUpdateDate] = useState<{ visible: boolean, type: '修改出价' | '修改名称' | '修改日限额' | '修改投放时间' | '删除' | '深度优化ROI' }>({ visible: false, type: '修改出价' })
+    const [updateData, setUpdateDate] = useState<{ visible: boolean, type: '修改出价' | '修改名称' | '修改日限额' | '修改投放时间' | '删除' | '深度优化ROI' | '修改投放首日开始时间' }>({ visible: false, type: '修改出价' })
 
     const syncBatch = useAjax((params) => syncBatchApi(params))
     const modifyStatusBatch = useAjax((params) => modifyStatusBatchApi(params))
@@ -247,7 +247,8 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
                             setSelectedRows([])
                         }}
                         value={handleType}
-                        options={[{ label: '广告操作', value: 1 }, { label: '创意操作', value: 2 }, { label: '修改深度优化', value: 3 }]}
+                        dropdownMatchSelectWidth={false}
+                        options={[{ label: '广告操作', value: 1 }, { label: '创意操作', value: 2 }, { label: '修改深度优化期望ROI', value: 3 }]}
                     /></Col>
                     <Col>
                         <Button type='dashed' onClick={() => { setCzjlShow(true) }}>操作记录</Button>
@@ -271,7 +272,10 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
                                 }}>修改日限额</Menu.Item>
                                 <Menu.Item disabled={selectedRows.length === 0} onClick={() => {
                                     setUpdateDate({ visible: true, type: '修改投放时间' })
-                                }}>修改投放时间</Menu.Item>
+                                }}>修改投放日期</Menu.Item>
+                                <Menu.Item disabled={selectedRows.length === 0} onClick={() => {
+                                    setUpdateDate({ visible: true, type: '修改投放首日开始时间' })
+                                }}>修改投放首日开始时间</Menu.Item>
                             </Menu>}
                             placement="bottomLeft"
                             arrow
@@ -314,7 +318,7 @@ const Ad: React.FC<ADQV3.AdProps> = ({ userId, creativeHandle }) => {
                     </> : handleType === 3 ? <>
                         <Col><Button type='primary' disabled={selectedRows.length === 0} onClick={() => {
                             setUpdateDate({ visible: true, type: '深度优化ROI' })
-                        }}>修改深度优化ROI</Button></Col>
+                        }}>修改深度优化期望ROI</Button></Col>
                     </> : null}
                 </Row>
             </Space>}

src/pages/launchSystemV3/adqv3/ad/updateAd3.tsx

@@ -11,9 +11,10 @@ import { getTimeSeriesList } from "@/pages/launchSystemNew/adq/ad/const"
 import { txtLength } from "@/utils/utils"
 import InputName from "@/components/InputName"
 import New1Radio from "../../components/New1Radio"
+import { SelectTimeList } from "../../tencentAdPutIn/const"
 
 interface Props {
-    type: '修改出价' | '修改名称' | '修改日限额' | '修改投放时间' | '删除' | '深度优化ROI'
+    type: '修改出价' | '修改名称' | '修改日限额' | '修改投放时间' | '删除' | '深度优化ROI' | '修改投放首日开始时间'
     updateData: any[],
     visible?: boolean,
     onClose?: () => void
@@ -61,6 +62,7 @@ const UpdateAd3: React.FC<Props> = ({ visible, type, onClose, onChange, updateDa
                 break
             case '修改名称':
             case '深度优化ROI':
+            case '修改投放首日开始时间':
                 updateBatchAdgroupInfo.run({ accountAdgroupMaps, ...values }).then(res => {
                     if (res?.failIdList?.length === 0) {
                         message.success(`修改操作完成！`)
@@ -138,7 +140,7 @@ const UpdateAd3: React.FC<Props> = ({ visible, type, onClose, onChange, updateDa
                 form={form}
                 name="updateAd3.0"
                 labelAlign='left'
-                labelCol={{ span: 4 }}
+                labelCol={{ span: type === '修改投放首日开始时间' ? 6 : 4 }}
                 colon={false}
                 style={{ backgroundColor: '#f1f4fc', maxHeight: 600, overflow: 'hidden', overflowY: 'auto', padding: '10px 10px 10px', borderRadius: '0 0 8px 8px' }}
                 scrollToFirstError
@@ -247,7 +249,14 @@ const UpdateAd3: React.FC<Props> = ({ visible, type, onClose, onChange, updateDa
                         >
                             <InputNumber style={{ width: 480 }} placeholder={`期望ROI目标范围0.001~1000，输入0.05，表示ROI目标为5%`} />
                         </Form.Item>
-                    </> : null}
+                    </> : type === '修改投放首日开始时间' ? <Form.Item name='firstDayBeginTime' label={<strong>首日开始时间</strong>} rules={[{ required: true, message: '请选择首日开始时间' }]}>
+                        <Select
+                            style={{ width: 180 }}
+                            allowClear
+                            placeholder='请选择首日开始时间'
+                            options={SelectTimeList}
+                        />
+                    </Form.Item> : null}
                 </Card>
                 <Form.Item className="submit_pull">
                     <Space>