wjx 1 周之前
父節點
當前提交
01719d3bd1

+ 1 - 0
src/pages/weComTask/page/businessPlan/create/const.tsx

@@ -61,6 +61,7 @@ export const STATUS_ZJ: { [x: string]: JSX.Element } = {
     'TASK_STATUS_RUN': <Badge status="processing" text={'执行中'} />,
     'TASK_STATUS_FINISH': <Badge status="success" text={'执行完成'} />,
     'TASK_STATUS_FAIL': <Badge status="error" text={'执行失败'} />,
+    'TASK_STATUS_DELETE': <Badge status="error" text={'已删除'} />,
     'TASK_STATUS_SUSPEND': <Badge color={'purple'} text={'执行暂停'} />,
     'TASK_STATUS_CANCEL': <Badge color={'magenta'} text={'执行取消'} />
 }

+ 7 - 7
src/pages/weComTask/page/weAssociation/list/index.tsx

@@ -97,7 +97,7 @@ const WeAssociationList: React.FC = () => {
             value: 1,
             options
         })
-        setListData({ ...listData, userCountMin: userQuerys.numArr[0], userCountMax: userQuerys.numArr[1], })
+        setListData({ ...listData, userCountMin: userQuerys.numArr[0], userCountMax: userQuerys.numArr[1], pageNum: 1 })
         setOpen(false)
     }, [userQuerys, listData])
 
@@ -183,7 +183,7 @@ const WeAssociationList: React.FC = () => {
                             style={{ maxWidth: 150 }}
                             onChange={(e) => {
                                 let v = e.target.value
-                                setListData({ ...listData, chatName: v })
+                                setListData({ ...listData, chatName: v, pageNum: 1 })
                             }}
                         />
                         <Select
@@ -203,7 +203,7 @@ const WeAssociationList: React.FC = () => {
                         />
                         <DatePicker.RangePicker placeholder={['建群开始日期', '建群结束日期']} allowClear onChange={(dates, dateStrings) => {
                             console.log(dateStrings)
-                            setListData({ ...listData, createTimeStart: dateStrings[0], createTimeEnd: dateStrings[1] })
+                            setListData({ ...listData, createTimeStart: dateStrings[0], createTimeEnd: dateStrings[1], pageNum: 1 })
                         }} />
                         <Select
                             style={{ width: 200 }}
@@ -219,15 +219,15 @@ const WeAssociationList: React.FC = () => {
                                         options: []
                                     })
                                     let { userCountMin, userCountMax, ...newObj } = listData
-                                    setListData(newObj)
+                                    setListData({ ...newObj, pageNum: 1 })
                                 }
                                 console.log(value)
                             }}
                             open={open}
-                            onDropdownVisibleChange={(open) => {
+                            onOpenChange ={(open) => {
                                 setOpen(open)
                             }}
-                            dropdownRender={() => {
+                            popupRender={() => {
                                 return <div >
                                     <div style={{ display: 'flex', flexFlow: 'row', alignItems: 'center' }}>
                                         <Input placeholder="最小人数" allowClear value={userQuerys.numArr[0]} onChange={(e) => {
@@ -256,7 +256,7 @@ const WeAssociationList: React.FC = () => {
                             style={{ maxWidth: 150 }}
                             onChange={(e) => {
                                 let v = e.target.value
-                                setListData({ ...listData, remark: v })
+                                setListData({ ...listData, remark: v, pageNum: 1 })
                             }}
                         />
                         <Select