wjx před 2 týdny
rodič
revize
d3a09d4be5

+ 2 - 18
src/pages/weComTask/page/businessPlan/taskList/components/groupTask/groupXfCorpTabls.tsx

@@ -10,15 +10,14 @@ import { cancelGroupSendApi, getSendTaskGroupuserListApi, GetSendTaskGroupuserLi
 
 interface Props {
     corpId: string
-    taskId: number,
-    weList: any[]
+    taskId: number
 }
 /**
  * 群发下发企微号列表
  * @param param0 
  * @returns 
  */
-const GroupXfCorpTabls: React.FC<Props> = ({ corpId, taskId, weList = [] }) => {
+const GroupXfCorpTabls: React.FC<Props> = ({ corpId, taskId }) => {
 
     /******************************/
     const { message } = App.useApp()
@@ -104,21 +103,6 @@ const GroupXfCorpTabls: React.FC<Props> = ({ corpId, taskId, weList = [] }) => {
                 }
                 options={[{ label: <Badge status="error" text='未发送' />, value: 0 }, { label: <Badge status="success" text='已发送' />, value: 2 }]}
             />
-            <Select
-                showSearch
-                style={{ minWidth: 120 }}
-                allowClear
-                value={queryForms.userId}
-                onChange={(valuse) => {
-                    setQueryForms({ ...queryForms, userId: valuse })
-                }}
-                placeholder="企微号"
-                filterOption={(input, option) =>
-                    ((option?.label ?? '') as string).toLowerCase().includes(input.toLowerCase())
-                }
-                options={weList?.map((item: any) => ({ label: item.name, value: item.corpUserId }))}
-
-            />
             <DatePicker placeholder="发送开始时间" onChange={(e, date) => { setQueryForms({ ...queryForms, sendTimeStartTime: date as string }) }} />
             <DatePicker placeholder="发送结束时间" onChange={(e, date) => { setQueryForms({ ...queryForms, sendTimeEndTime: date as string }) }} />
             <DatePicker.RangePicker placeholder={['预计送达时间(起始)', '预计送达时间(结束)']} onChange={(e, date) => { setQueryForms({ ...queryForms, createStartDate: date[0], createEndDate: date[1] }) }} />

+ 1 - 2
src/pages/weComTask/page/businessPlan/taskList/components/groupTask/index.tsx

@@ -159,7 +159,6 @@ export const ExpandedRow: React.FC<{ record: any }> = ({ record }) => {
     const { contentDTO, id, corpId } = record
     const { token } = useNewToken()
     const [activeKey, setActiveKey] = useState<string>('2')
-    const { corpList } = useContext(DispatchTaskDetails)!;
 
     return <div style={{ display: 'flex', gap: 10, maxHeight: 450 }}>
         <div style={{ width: 320, maxHeight: 450, overflow: 'hidden', overflowY: 'auto' }}>
@@ -185,7 +184,7 @@ export const ExpandedRow: React.FC<{ record: any }> = ({ record }) => {
                         key: '2',
                         label: '下发企微号',
                         children: <Card styles={{ body: { maxHeight: 400 } }}>
-                            {activeKey == '2' && <GroupXfCorpTabls corpId={corpId} taskId={id} weList={corpList?.find(item => item.corpId == corpId)?.weList} />}
+                            {activeKey == '2' && <GroupXfCorpTabls corpId={corpId} taskId={id} />}
                         </Card>
                     },
                     {

+ 2 - 18
src/pages/weComTask/page/businessPlan/taskList/components/highGroupTask/highGroupXfCorpTabls.tsx

@@ -10,15 +10,14 @@ import { getMessageSendTaskuserListApi, GetSendTaskGroupuserListProps, putMessag
 
 interface Props {
     corpId: string
-    taskId: number,
-    weList: any[]
+    taskId: number
 }
 /**
  * 群发下发企微号列表
  * @param param0 
  * @returns 
  */
-const HighGroupXfCorpTabls: React.FC<Props> = ({ corpId, taskId, weList = [] }) => {
+const HighGroupXfCorpTabls: React.FC<Props> = ({ corpId, taskId }) => {
 
     /******************************/
     const { message } = App.useApp()
@@ -64,21 +63,6 @@ const HighGroupXfCorpTabls: React.FC<Props> = ({ corpId, taskId, weList = [] })
                 }
                 options={[{ label: <Badge status="error" text='未发送' />, value: 0 }, { label: <Badge status="success" text='已发送' />, value: 2 }]}
             />
-            <Select
-                showSearch
-                style={{ minWidth: 120 }}
-                allowClear
-                value={queryForms.userId}
-                onChange={(valuse) => {
-                    setQueryForms({ ...queryForms, userId: valuse })
-                }}
-                placeholder="企微号"
-                filterOption={(input, option) =>
-                    ((option?.label ?? '') as string).toLowerCase().includes(input.toLowerCase())
-                }
-                options={weList?.map((item: any) => ({ label: item.name, value: item.corpUserId }))}
-
-            />
             <DatePicker placeholder="发送开始时间" onChange={(e, date) => { setQueryForms({ ...queryForms, sendTimeStartTime: date as string }) }} />
             <DatePicker placeholder="发送结束时间" onChange={(e, date) => { setQueryForms({ ...queryForms, sendTimeEndTime: date as string }) }} />
             <DatePicker.RangePicker placeholder={['预计送达时间(起始)', '预计送达时间(结束)']} onChange={(e, date) => { setQueryForms({ ...queryForms, createStartDate: date[0], createEndDate: date[1] }) }} />

+ 1 - 1
src/pages/weComTask/page/businessPlan/taskList/components/highGroupTask/index.tsx

@@ -258,7 +258,7 @@ export const ExpandedRow: React.FC<{ record: any }> = ({ record }) => {
                         key: '2',
                         label: '下发企微号',
                         children: <Card styles={{ body: { maxHeight: 400 } }}>
-                            {activeKey == '2' && <GroupXfCorpTabls corpId={corpId} taskId={id} weList={corpList?.find(item => item.corpId == corpId)?.weList} />}
+                            {activeKey == '2' && <GroupXfCorpTabls corpId={corpId} taskId={id} />}
                         </Card>
                     },
                     {