search

src/pages/carouselFigure/SelectActivity.jsx

@@ -1,8 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Select, Modal, Button,Table, Divider, Tag } from 'antd';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
 const getActivities = fetch(apis.activity.listSelected)
+const { Search } = Input;
 
 export default (props) => {
   const {
@@ -13,7 +14,7 @@ export default (props) => {
 
   const [list, setList] = useState([]);
   const [visible, setVisible] = useState(false);
-  const [ activity, setActivity ] = useState({ dynamicId: undefined, title: '请选择活动' })
+  const [activity, setActivity] = useState({ dynamicId: undefined, title: '请选择活动' })
   const getActTitle = val => ((list.filter(x => x.dynamicId === val)[0]) || {}).title || '请选择活动'
   const setAct = val => setActivity({ dynamicId: val, title: getActTitle(val) })
 
@@ -39,12 +40,29 @@ export default (props) => {
   if (value !== activity.dynamicId) {
     setAct(value);
   }
+  const searchActivity =(e)=>{
+    getActivities({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        activityStatus: 2,
+        name:e
+      }
+    }).then((data) => {
+      setList(data.list || [])
+
+      console.log('----', buildingId, value)
+
+      // setAct(buildingId ? undefined : value);
+    })
+  }
 
   let chooseVal = value
 
   const handleChange = val => chooseVal = val
 
-  const setData=val=>{
+  const setData = val => {
     setAct(val)
     onChange(val)
     setVisible(false)
@@ -55,35 +73,43 @@ export default (props) => {
       title: '标题',
       dataIndex: 'title',
       key: 'dynamicId',
-      align:'center',
-      ellipsis:true,
+      align: 'center',
+      ellipsis: true,
       render: text => <a>{text}</a>,
     },
     {
       title: '操作',
       dataIndex: 'name',
-      align:'center',
-      width:'20%',
+      align: 'center',
+      width: '20%',
       render: (text, record) => (
         <span>
-          <a onClick={() => setData(record.dynamicId)} style={{color:'blue'}}>选择</a>
+          <a onClick={() => setData(record.dynamicId)} style={{ color: 'blue' }}>选择</a>
         </span>
       ),
     },
   ];
 
   return (
-  <div>
-    <div onClick={() => setVisible(true)}>{activity.title}</div>
+
+    <div>
+      <div onClick={() => setVisible(true)}>{activity.title}</div>
       <Modal
-        title="请选择H5"
+        title="请选择"
         visible={visible}
-         onCancel={() => setVisible(false)}
-         footer={[]}
+        onCancel={() => setVisible(false)}
+        footer={[]}
       >
-       <Table rowKey={list => list.dynamicId} columns={columns} dataSource={list} />
+        <Search
+          placeholder="输入h5名称"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchActivity(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.dynamicId} columns={columns} dataSource={list} />
       </Modal>
-  </div>
+    </div>
 
   );
 }

src/pages/carouselFigure/SelectGroup.jsx

@@ -1,7 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Select, Modal, Button,Table, Divider, Tag } from 'antd';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
+const { Search } = Input;
+
 const getGroupList = fetch(apis.groupActivity.EffectiveList)
 
 export default props => {
@@ -35,16 +37,31 @@ export default props => {
       updateGroup(buildingId ? undefined : value);
     })
   }, [buildingId]);
+  const searchGroup = (e) => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        name: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
 
+      updateGroup(buildingId ? undefined : value);
+      // setAct(buildingId ? undefined : value);
+    })
+  }
   if (value !== group.groupId) {
     updateGroup(value);
   }
 
   const handleChange = val => {
-      onChange(val)
+    onChange(val)
   }
 
-  const setData=val=>{
+  const setData = val => {
     updateGroup(val)
     onChange(val)
     setVisible(false)
@@ -55,33 +72,40 @@ export default props => {
       title: '标题',
       dataIndex: 'activityName',
       key: 'groupActivityId',
-      align:'center',
-      ellipsis:true,
+      align: 'center',
+      ellipsis: true,
       render: text => <a>{text}</a>,
     },
     {
       title: '操作',
-      align:'center',
-      width:'20%',
+      align: 'center',
+      width: '20%',
       render: (text, record) => (
         <span>
-          <a onClick={() => setData(record.groupActivityId)} style={{color:'blue'}}>选择</a>
+          <a onClick={() => setData(record.groupActivityId)} style={{ color: 'blue' }}>选择</a>
         </span>
       ),
     },
   ];
 
   return (
-  <div>
-    <div onClick={() => setVisible(true)}>{group.groupName}</div>
+    <div>
+      <div onClick={() => setVisible(true)}>{group.groupName}</div>
       <Modal
-        title="请选择H5"
+        title="请选择"
         visible={visible}
-         onCancel={() => setVisible(false)}
-         footer={[]}
+        onCancel={() => setVisible(false)}
+        footer={[]}
       >
-       <Table rowKey={list => list.groupActivityId} columns={columns} dataSource={list} />
+        <Search
+          placeholder="输入h5名称"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchGroup(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.groupActivityId} columns={columns} dataSource={list} />
       </Modal>
-  </div>
+    </div>
   );
 }

src/pages/carouselFigure/SelectH5.1.jsx

@@ -1,8 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Select, Modal, Button } from 'antd';
+import { Select, Modal, Button, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
 const getH5List = fetch(apis.h5Activity.EffectiveList)
+const { Search } = Input;
 
 export default props => {
   const {
@@ -13,9 +14,9 @@ export default props => {
 
   const [list, setList] = useState([]);
   const [visible, setVisible] = useState(false);
-  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择H5' })
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择' })
   const getGroupTitle = val => {
-    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择H5'
+    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
   }
   const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
 
@@ -33,16 +34,31 @@ export default props => {
       updateGroup(value ? undefined : value);
     })
   }, []);
+  const searchH5 = (e) => {
+    getH5List({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        activityStatus: 2,
+        name: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
+
+      updateGroup(value ? undefined : value);
+    })
+  }
 
   if (value !== group.groupId) {
     updateGroup(value);
   }
 
   const handleChange = val => {
-      onChange(val)
+    onChange(val)
   }
 
-  const setData=val=>{
+  const setData = val => {
     updateGroup('')
     onChange('')
   }
@@ -51,25 +67,32 @@ export default props => {
     <div>
       <div onClick={() => setVisible(true)}>{group.groupName}</div>
       <Modal
-        title="请选择H5"
+        title="请选择"
         visible={visible}
-         onCancel={() => setVisible(false)}
-         footer={[
-            <Button key="back" onClick={() => setVisible(false)}>
-              取消
+        onCancel={() => setVisible(false)}
+        footer={[
+          <Button key="back" onClick={() => setVisible(false)}>
+            取消
             </Button>,
-            <Button key="cancel" onClick={() => setData(value)}>
-              清空
+          <Button key="cancel" onClick={() => setData(value)}>
+            清空
             </Button>,
-            <Button key="submit" type="primary" onClick={() => {
-              updateGroup(value)
-              onChange(value)
-              setVisible(false)
-            }}>
-              提交
+          <Button key="submit" type="primary" onClick={() => {
+            updateGroup(value)
+            onChange(value)
+            setVisible(false)
+          }}>
+            提交
             </Button>
-          ]}
+        ]}
       >
+        <Search
+          placeholder="输入h5名称"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchH5(value)}
+          style={{ marginBottom: '16px' }}
+        />
         <Select
           showSearch
           value={value ? parseInt(value) : undefined}

src/pages/carouselFigure/SelectH5.jsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Select, Modal, Button,Table, Divider, Tag } from 'antd';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
 const { Column, ColumnGroup } = Table;
 const getH5List = fetch(apis.h5Activity.EffectiveList)
-
+const { Search } = Input;
 export default props => {
   const {
     value,
@@ -14,9 +14,9 @@ export default props => {
 
   const [list, setList] = useState([]);
   const [visible, setVisible] = useState(false);
-  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择H5' })
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择' })
   const getGroupTitle = val => {
-    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择H5'
+    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
   }
   const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
 
@@ -34,16 +34,31 @@ export default props => {
       updateGroup(value ? undefined : value);
     })
   }, []);
+  const searchH5 = (e) => {
+    getH5List({
+      params: {
+        pageNum: 1,
+        pageSize: 999,
+        isMiniapp: 1,
+        status: 1,
+        name: e
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(value ? undefined : value);
+    })
+  }
 
   if (value !== group.groupId) {
     updateGroup(value);
   }
 
   const handleChange = val => {
-      onChange(val)
+    onChange(val)
   }
 
-  const setData=val=>{
+  const setData = val => {
     updateGroup(val)
     onChange(val)
     setVisible(false)
@@ -54,33 +69,40 @@ export default props => {
       title: '标题',
       dataIndex: 'name',
       key: 'drainageId',
-      align:'center',
-      ellipsis:true,
+      align: 'center',
+      ellipsis: true,
       render: text => <a>{text}</a>,
     },
     {
       title: '操作',
-      align:'center',
-      width:'20%',
+      align: 'center',
+      width: '20%',
       render: (text, record) => (
         <span>
-          <a onClick={() => setData(record.drainageId)} style={{color:'blue'}}>选择</a>
+          <a onClick={() => setData(record.drainageId)} style={{ color: 'blue' }}>选择</a>
         </span>
       ),
     },
   ];
 
-  return(
+  return (
     <div>
       <div onClick={() => setVisible(true)}>{group.groupName}</div>
-        <Modal
-          title="请选择H5"
-          visible={visible}
-           onCancel={() => setVisible(false)}
-           footer={[]}
-        >
-         <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
-        </Modal>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="输入h5名称"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchH5(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
+      </Modal>
     </div>
   )
 }

src/pages/carouselFigure/SelectHelp.jsx

@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from 'react';
 
-import { Form, Select, Modal, Button,Table, Divider, Tag } from 'antd';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
+const { Search } = Input;
 
 const getHelpList = fetch(apis.helpActivity.effectiveList)
 
@@ -37,7 +38,21 @@ export default props => {
       updateHelp(value ? undefined : value);
     })
   }, [buildingId]);
+  const searchHelp = (e) => {
+    getHelpList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        name: e
+      },
+    }).then(data => {
+      setList(data.records || [])
 
+      updateHelp(value ? undefined : value);
+    })
+  }
   if (value !== help.helpId) {
     updateHelp(value);
   }
@@ -46,7 +61,7 @@ export default props => {
     onChange(val)
   }
 
-  const setData=val=>{
+  const setData = val => {
     updateHelp(val)
     onChange(val)
     setVisible(false)
@@ -57,17 +72,17 @@ export default props => {
       title: '标题',
       dataIndex: 'title',
       key: 'helpActivityId',
-      align:'center',
-      ellipsis:true,
+      align: 'center',
+      ellipsis: true,
       render: text => <a>{text}</a>,
     },
     {
       title: '操作',
-      align:'center',
-      width:'20%',
+      align: 'center',
+      width: '20%',
       render: (text, record) => (
         <span>
-          <a onClick={() => setData(record.helpActivityId)} style={{color:'blue'}}>选择</a>
+          <a onClick={() => setData(record.helpActivityId)} style={{ color: 'blue' }}>选择</a>
         </span>
       ),
     },
@@ -76,14 +91,21 @@ export default props => {
   return (
     <div>
       <div onClick={() => setVisible(true)}>{help.helpName}</div>
-        <Modal
-          title="请选择H5"
-          visible={visible}
-           onCancel={() => setVisible(false)}
-           footer={[]}
-        >
-         <Table rowKey={list => list.helpActivityId} columns={columns} dataSource={list} />
-        </Modal>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="输入h5名称"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchHelp(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.helpActivityId} columns={columns} dataSource={list} />
+      </Modal>
     </div>
   );
 }

src/pages/carouselFigure/SelectNews.jsx

@@ -1,8 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Select, Modal, Button,Table, Divider, Tag } from 'antd';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
 const getNewsList = fetch(apis.news.getList)
+const { Search } = Input;
 
 export default props => {
   const {
@@ -33,7 +34,21 @@ export default props => {
       updateNews(buildingId ? undefined : value);
     })
   }, [buildingId]);
+  const searchActivity = (e) => {
+    getNewsList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        newsStatus: 0,
+        name: e
+      },
+    }).then(data => {
+      setList(data.records || [])
 
+      updateNews(buildingId ? undefined : value);
+    })
+  }
   if (value !== news.newsId) {
     updateNews(value);
   }
@@ -42,7 +57,7 @@ export default props => {
     onChange(val)
   }
 
-  const setData=val=>{
+  const setData = val => {
     updateNews(val)
     onChange(val)
     setVisible(false)
@@ -53,17 +68,17 @@ export default props => {
       title: '标题',
       dataIndex: 'newsName',
       key: 'newsId',
-      align:'center',
-      ellipsis:true,
+      align: 'center',
+      ellipsis: true,
       render: text => <a>{text}</a>,
     },
     {
       title: '操作',
-      align:'center',
-      width:'20%',
+      align: 'center',
+      width: '20%',
       render: (text, record) => (
         <span>
-          <a onClick={() => setData(record.newsId)} style={{color:'blue'}}>选择</a>
+          <a onClick={() => setData(record.newsId)} style={{ color: 'blue' }}>选择</a>
         </span>
       ),
     },
@@ -72,14 +87,21 @@ export default props => {
   return (
     <div>
       <div onClick={() => setVisible(true)}>{news.newsName}</div>
-        <Modal
-          title="请选择H5"
-          visible={visible}
-           onCancel={() => setVisible(false)}
-           footer={[]}
-        >
-         <Table rowKey={list => list.newsId} columns={columns} dataSource={list} />
-        </Modal>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="输入h5名称"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchActivity(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.newsId} columns={columns} dataSource={list} />
+      </Modal>
     </div>
   );
 }