feats

src/pages/property/building/BatchImport.jsx

@@ -18,7 +18,7 @@ export default props => {
 
   const downloadExcel = () => {
     const link = document.createElement('a')
-    link.href = "http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx"
+    link.href = "https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx"
     link.setAttribute('download', '楼栋库模板.xlsx')
     link.click()
   }

src/pages/property/news/Edit.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { Form, Input, Button, Radio, InputNumber, notification } from 'antd'
+import { Form, Input, Button, Radio, InputNumber, notification, Select } from 'antd'
 import router from 'umi/router'
 import { fetch, apis } from '@/utils/request'
 import ImageUpload from '@/components/uploadImage/ImageUpload'
@@ -32,10 +32,12 @@ const tailFormItemLayout = {
 const getNewsDetail = fetch(apis.propNews.getNewsDetail)
 const addNews = fetch(apis.propNews.addNews)
 const updateNews = fetch(apis.propNews.updateNews)
+const getTypeList = fetch(apis.propNews.newsType.list)
 
 export default Form.create()(props => {
   const [loading, setLoading] = useState(false)
   const [newsData, setNewsData] = useState({})
+  const [typeList, setTypeList] = useState([])
 
   const { id } = props.location.query
   
@@ -72,10 +74,29 @@ export default Form.create()(props => {
       })
     }
   }, [id])
+
+  useEffect(() => {
+    getTypeList({pageSize: 999}).then(res => setTypeList(res.records))
+  }, [])
   
   return (
     <div>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="分类">
+          {
+            props.form.getFieldDecorator('newsTypeId', {
+              rules: [
+                { required: true, message: '请选择分类' },
+              ],
+            })(
+              <Select>
+                {
+                  (typeList || []).map(x => <Select.Option key={x.newsTypeId} value={x.newsTypeId}>{x.newsTypeName}</Select.Option>)
+                }
+              </Select>
+            )
+          }
+        </Form.Item>
         <Form.Item label="标题">
           {
             props.form.getFieldDecorator('newsName', {

src/pages/property/news/index.jsx

@@ -8,6 +8,7 @@ import List from '../components/List'
 const getNewsList = fetchList(apis.propNews.getNewsList)
 const updateNews = fetch(apis.propNews.updateNews)
 const deleteNews = fetch(apis.propNews.deleteNews)
+const getTypeList = fetch(apis.propNews.newsType.list)
 
 const Condition = props => {
   return (
@@ -19,6 +20,17 @@ const Condition = props => {
         
         return (
           <>
+            <Form.Item label="分类">
+            {
+              getFieldDecorator('newsTypeId')(
+                <Select style={{width: '160px'}} placeholder="请选择分类">
+                  {
+                  (props.typeList || []).map(x => <Select.Option key={x.newsTypeId} value={x.newsTypeId}>{x.newsTypeName}</Select.Option>)
+                  }
+                </Select>
+              )
+            }
+            </Form.Item>
             <Form.Item label="标题">
             {
               getFieldDecorator('newsName')(<Input placeholder="标题" />)
@@ -41,6 +53,7 @@ export default props => {
   const [listData, setListData] = useState([])
   const [pagination, setPagination] = useState({})
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+  const [typeList, setTypeList] = useState([])
 
   const handleSearch = vals => {
     setQueryParams({
@@ -82,6 +95,8 @@ export default props => {
     })
   }
 
+  const getNewsTypeName = newsTypeId => ((typeList || []).filter(x => x.newsTypeId === newsTypeId)[0] || {}).newsTypeName || ''
+
   useEffect(() => {
     setLoading(true)
     getNewsList(queryParams).then(res => {
@@ -92,9 +107,13 @@ export default props => {
     }).catch(() => setLoading(false))
   }, [queryParams])
 
+  useEffect(() => {
+    getTypeList({pageSize: 999}).then(res => setTypeList(res.records))
+  }, [])
+
   return (
     <div>
-      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <Condition onSearch={handleSearch} typeList={typeList} onReset={handleSearch} />
       <div style={{ margin: '24px 0' }}>
         <NavLink to={`/property/news/edit`}>
           <Button type="primary">添加</Button>
@@ -102,6 +121,12 @@ export default props => {
       </div>
       <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="newsId">
         <Table.Column title="#ID" dataIndex="newsId" key="newsId" />
+        <Table.Column
+          title="分类"
+          dataIndex="newsTypeId"
+          key="newsTypeId"
+          render={x => getNewsTypeName(x)}
+        />
         <Table.Column
           title="标题"
           dataIndex="newsName"