资讯

src/components/SelectButton/NewTypeSelect.jsx

@@ -29,7 +29,7 @@ const NewsTypeSelect = (props) => {
   }
 
   return (
-      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择类型" onChange={props.onChange}>
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择咨询类型" onChange={props.onChange}>
           {data.map(type => (
             <Option key={type.newsTypeId}>{type.newsTypeName}</Option>
           ))}

src/pages/news/list/NewsList.jsx

@@ -6,6 +6,8 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import SelectCity from '../../../components/SelectButton/CitySelect'
 
 
 const { Option } = Select;
@@ -14,6 +16,64 @@ const { Meta } = Card;
 
 const tempDate = [{ code: 's101' }]
 
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 6 })
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.news.getList, params: { ...params } }).then(res => {
+      setDataSource(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        getList({ pageNum: 1, pageSize: 6, ...values })
+      }
+    });
+  }
+
+  // 跳转到编辑资讯列表
+  const toEditList = (id) => ()  => {
+    router.push({
+      pathname: '/news/list/editNewsList',
+      query: {
+        id
+      },
+    });
+  }
+
+
+
 /**
  *卡片
  *
@@ -28,17 +88,6 @@ function CartBody(props) {
     });
   }
 
-  // 查询列表
-  const getList = (params) => {
-    request({
-        url: '/api/admin/taNews',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
-        cancelPage();
-    })
-  }
-
   //删除资讯
   const changeNewsListStatus = (newsId) => () => {
     Modal.confirm({
@@ -70,25 +119,45 @@ function CartBody(props) {
 
   function cancelRelease (newsId, newsStatus, buildingId,newsTypeId) {
     console.log("newsId" + newsId + "status" + newsStatus);
-    Modal.confirm({
-      title: '确认发布或取消该资讯？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk () {
-        request({
-          url: '/api/admin/taNews/' + newsId,
-          method: 'PUT',
-          data: { "newsStatus": newsStatus, "buildingId":buildingId, "newsTypeId":newsTypeId },
-        }).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
-        })
-      },
-      onCancel () {
-        console.log('Cancel');
-      },
-    });
-  
+    if (newsStatus === 1){
+      Modal.confirm({
+        title: '确认取消该资讯？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk () {
+          request({
+            url: '/api/admin/taNews/' + newsId,
+            method: 'PUT',
+            data: { "newsStatus": newsStatus, "buildingId":buildingId, "newsTypeId":newsTypeId },
+          }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10 });
+          })
+        },
+        onCancel () {
+          console.log('Cancel');
+        },
+      });
+    }else if (newsStatus === 0){
+      Modal.confirm({
+        title: '确认发布该资讯？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk () {
+          request({
+            url: '/api/admin/taNews/' + newsId,
+            method: 'PUT',
+            data: { "newsStatus": newsStatus, "buildingId":buildingId, "newsTypeId":newsTypeId },
+          }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10 });
+          })
+        },
+        onCancel () {
+          console.log('Cancel');
+        },
+      });
+    }  
   }
 
   return (
@@ -153,63 +222,6 @@ function CartBody(props) {
   )
 }
 
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-function body(props) {
-  const { getFieldDecorator } = props.form
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataSource, setDataSource] = useState({ records: [] })
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useEffect(() => {
-    getList({ pageNum: 1, pageSize: 6 })
-  }, [])
-
-  function getList(params) {
-    // 网路请求
-    request({ ...apis.news.getList, params: { ...params } }).then(res => {
-      setDataSource(res)
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
-  // 提交事件
-  function handleSubmit(e) {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        // eslint-disable-next-line no-console
-        console.log('提交数据: ', values)
-        const { startDate } = values
-        getList({ pageNum: 1, pageSize: 9, ...values })
-      }
-    });
-  }
-
-  // 跳转到编辑资讯列表
-  const toEditList = (id) => ()  => {
-    router.push({
-      pathname: '/news/list/editNewsList',
-      query: {
-        id
-      },
-    });
-  }
-
 
   // Change 事件
   function handleSelectChange(e) {
@@ -220,7 +232,7 @@ function body(props) {
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNum: pageNumber, pageSize: 9 })
+      getList({ pageNum: pageNumber, pageSize: 6 })
   }
 
   function getDate(value, dateString) {
@@ -233,17 +245,14 @@ function body(props) {
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
 
         <Form.Item>
-          {getFieldDecorator('city')(
-            <Select style={{ width: '180px' }} placeholder="请选择城市" onChange={handleSelectChange}>
-            </Select>,
+          {getFieldDecorator('cityId')(
+            <SelectCity />,  
           )}
         </Form.Item>
-
         <Form.Item>
-          {getFieldDecorator('project')(
-            <Select style={{ width: '180px' }} placeholder="请选择项目" onChange={handleSelectChange}>
-            </Select>,
-          )}
+          {getFieldDecorator('buildingId')(
+              <BuildSelect />,
+            )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('title')(
@@ -254,13 +263,13 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('buildingId')(
+          {getFieldDecorator('newsTypeId')(
             <NewsTypeSelect />,
           )}
         </Form.Item>       
         <Form.Item>
           {getFieldDecorator('newsStatus')(
-            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+            <Select style={{ width: '180px' }} placeholder="状态">
               <Option value="0">已发布</Option>
               <Option value="1">未发布</Option>
             </Select>,