fix

src/pages/weComTask/components/filterUser/newFiterUser.tsx

@@ -1,4 +1,4 @@
-import { App, Button, Card, Checkbox, DatePicker, Form, Input, InputNumber, Modal, Select, Space } from 'antd';
+import { App, Button, Card, Checkbox, DatePicker, Divider, Form, Input, InputNumber, Modal, Select, Space } from 'antd';
 import React, { useEffect, useState } from 'react';
 import style from './index.less'
 import { useAjax } from '@/Hook/useAjax';
@@ -483,7 +483,65 @@ const NewFilterUser: React.FC<NewFilterUserProps> = ({ bookCityList, configType
                         />
                     </Form.Item>
                 </div>
-
+                <Divider orientation="left">用户去重筛选</Divider>
+                <div className={style.newSpace}>
+                    <Form.Item name="isRepeat" label={<strong>用户去重筛选</strong>} style={{ marginBottom: 0 }} valuePropName='checked'>
+                        <Checkbox>是否开启用户去重筛选</Checkbox>
+                    </Form.Item>
+                </div>
+                {isRepeat && <>
+                    <div className={style.newSpace}>
+                        <Form.Item name="repeatRangType" label={<strong>重粉范围</strong>} style={{ marginBottom: 0 }} rules={[{ required: true, message: '请选择重粉范围' }]}>
+                            <Select
+                                placeholder='重粉范围'
+                                allowClear
+                                options={[
+                                    { value: 0, label: '任务内' },
+                                    { value: 1, label: '集团内' }
+                                ]}
+                            />
+                        </Form.Item>
+                    </div>
+                    <div className={style.newSpace}>
+                        <Form.Item name="repeatOperateType" label={<strong>重粉操作类型</strong>} style={{ marginBottom: 0 }} rules={[{ required: true, message: '请选择重粉操作类型' }]}>
+                            <Select
+                                placeholder='重粉操作类型'
+                                allowClear
+                                options={[
+                                    { value: 0, label: '排除运营' },
+                                    { value: 1, label: '去重运营' }
+                                ]}
+                            />
+                        </Form.Item>
+                    </div>
+                    <div className={style.newSpace}>
+                        <Form.Item label={<strong>添加主体</strong>} style={{ marginBottom: 0 }}>
+                            <Space>
+                                <Form.Item name="minCorpIdCount" noStyle rules={[{ required: true, message: '请输入添加主体最小数' }]}>
+                                    <InputNumber placeholder="添加主体最小数" style={{ width: 200 }} />
+                                </Form.Item>
+                                <span>-</span>
+                                <Form.Item name="maxCorpIdCount" noStyle rules={[{ required: true, message: '请输入添加主体最大数' }]}>
+                                    <InputNumber placeholder="添加主体最大数" style={{ width: 200 }} />
+                                </Form.Item>
+                            </Space>
+                        </Form.Item>
+                    </div>
+                    <div className={style.newSpace}>
+                        <Form.Item label={<strong>添加客服</strong>} style={{ marginBottom: 0 }}>
+                            <Space>
+                                <Form.Item name="minCorpUserIdCount" noStyle rules={[{ required: true, message: '请输入添加客服最小数' }]}>
+                                    <InputNumber placeholder="添加客服最小数" style={{ width: 200 }} />
+                                </Form.Item>
+                                <span>-</span>
+                                <Form.Item name="maxCorpUserIdCount" noStyle rules={[{ required: true, message: '请输入添加客服最大数' }]}>
+                                    <InputNumber placeholder="添加客服最大数" style={{ width: 200 }} />
+                                </Form.Item>
+                            </Space>
+                        </Form.Item>
+                    </div>
+                </>}
+                <Divider orientation="left">群聊用户筛选</Divider>
                 <div className={style.newSpace}>
                     <Form.Item name="firstAddGroupTime" label={<strong>首次拉群时间</strong>} style={{ marginBottom: 0 }}>
                         <DatePicker.RangePicker placeholder={["首次拉群时间开始", "首次拉群时间结束"]} />
@@ -582,63 +640,6 @@ const NewFilterUser: React.FC<NewFilterUserProps> = ({ bookCityList, configType
                         <Checkbox>是否查询所有公司</Checkbox>
                     </Form.Item>
                 </div>
-                <div className={style.newSpace}>
-                    <Form.Item name="isRepeat" label={<strong>重粉过滤</strong>} style={{ marginBottom: 0 }} valuePropName='checked'>
-                        <Checkbox>是否开启重粉过滤</Checkbox>
-                    </Form.Item>
-                </div>
-                {isRepeat && <>
-                    <div className={style.newSpace}>
-                        <Form.Item name="repeatRangType" label={<strong>重粉范围</strong>} style={{ marginBottom: 0 }} rules={[{ required: true, message: '请选择重粉范围' }]}>
-                            <Select
-                                placeholder='重粉范围'
-                                allowClear
-                                options={[
-                                    { value: 0, label: '任务内' },
-                                    { value: 1, label: '集团内' }
-                                ]}
-                            />
-                        </Form.Item>
-                    </div>
-                    <div className={style.newSpace}>
-                        <Form.Item name="repeatOperateType" label={<strong>重粉操作类型</strong>} style={{ marginBottom: 0 }} rules={[{ required: true, message: '请选择重粉操作类型' }]}>
-                            <Select
-                                placeholder='重粉操作类型'
-                                allowClear
-                                options={[
-                                    { value: 0, label: '排除运营' },
-                                    { value: 1, label: '去重运营' }
-                                ]}
-                            />
-                        </Form.Item>
-                    </div>
-                    <div className={style.newSpace}>
-                        <Form.Item label={<strong>添加主体</strong>} style={{ marginBottom: 0 }}>
-                            <Space>
-                                <Form.Item name="minCorpIdCount" noStyle rules={[{ required: true, message: '请输入添加主体最小数' }]}>
-                                    <InputNumber placeholder="添加主体最小数" style={{ width: 200 }} />
-                                </Form.Item>
-                                <span>-</span>
-                                <Form.Item name="maxCorpIdCount" noStyle rules={[{ required: true, message: '请输入添加主体最大数' }]}>
-                                    <InputNumber placeholder="添加主体最大数" style={{ width: 200 }} />
-                                </Form.Item>
-                            </Space>
-                        </Form.Item>
-                    </div>
-                    <div className={style.newSpace}>
-                        <Form.Item label={<strong>添加客服</strong>} style={{ marginBottom: 0 }}>
-                            <Space>
-                                <Form.Item name="minCorpUserIdCount" noStyle rules={[{ required: true, message: '请输入添加客服最小数' }]}>
-                                    <InputNumber placeholder="添加客服最小数" style={{ width: 200 }} />
-                                </Form.Item>
-                                <span>-</span>
-                                <Form.Item name="maxCorpUserIdCount" noStyle rules={[{ required: true, message: '请输入添加客服最大数' }]}>
-                                    <InputNumber placeholder="添加客服最大数" style={{ width: 200 }} />
-                                </Form.Item>
-                            </Space>
-                        </Form.Item>
-                    </div>
-                </>}
             </>}
         </Form>
     </Modal>

src/pages/weComTask/page/corpUserManage/selectCorpUser.tsx

@@ -106,8 +106,8 @@ interface SelectCorpUserModalProps extends Props {
 const SelectCorpUserModal: React.FC<SelectCorpUserModalProps> = React.memo(({ open, type = 'checkbox', value, corpId, onClose, onChange, placeholder }) => {
 
     /*******************************************/
-    const [queryForm, setQueryForm] = useState<CORP_USER_ASSIGN_API.GetCorpUserProps>({ pageNum: 1, pageSize: 20, stopUse: false, status: 1 })
-    const [queryFormNew, setQueryFormNew] = useState<CORP_USER_ASSIGN_API.GetCorpUserProps>({ pageNum: 1, pageSize: 20, stopUse: false, status: 1 })
+    const [queryForm, setQueryForm] = useState<CORP_USER_ASSIGN_API.GetCorpUserProps>({ pageNum: 1, pageSize: 20, status: 1 })
+    const [queryFormNew, setQueryFormNew] = useState<CORP_USER_ASSIGN_API.GetCorpUserProps>({ pageNum: 1, pageSize: 20, status: 1 })
     const [editSelectedRow, setEditSelectedRow] = useState<any[]>([])
     const { message } = App.useApp()