feats

src/pages/property/building/BatchImport.jsx

@@ -18,15 +18,10 @@ export default props => {
   const excelRef = useRef()
 
   const downloadExcel = () => {
-    buildingDownloadExcel().then(res => {
-      const url = window.URL.createObjectURL(new Blob([res]))
-      const link = document.createElement('a')
-      link.href = url
-      link.setAttribute('download', '业主资料库.xlsx')
-      link.click()
-    }).catch(err => {
-      console.error(err)
-    })
+    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.setAttribute('download', '业主资料库.xlsx')
+    link.click()
   }
 
   const importExcel = () => {

src/pages/property/proprietor/Audit.jsx

@@ -3,6 +3,7 @@ import { Spin, Button, Form, Input, Popconfirm,  } from 'antd'
 import { fetch, fetchList, apis } from '@/utils/request'
 import Search from '../components/Search'
 import List from '../components/List'
+import AuditNot from './components/AuditNot'
 
 const Condition = props => {
   return (
@@ -47,6 +48,7 @@ const userVerifyAudit = fetch(apis.propUser.userVerifyAudit)
 
 export default props => {
   const [loading, setLoading] = useState(false)
+  const [noPassShow, setNoPassShow] = useState(false)
   const [listData, setListData] = useState([])
 
   const handleSearch = vals => {}
@@ -96,6 +98,7 @@ export default props => {
           />
         </List>
       </Spin>
+      <AuditNot visible={noPassShow} onSubmit={handleSubmit} onCancel={() => setNoPassShow(false)} />
     </div>
   )
 }

src/pages/property/proprietor/Notice.jsx

@@ -0,0 +1,132 @@
+import React, { useState, useEffect } from 'react'
+import { Select, Spin, Table, Button, Form, Input } from 'antd'
+import NavLink from 'umi/navlink'
+import { fetchList, apis } from '@/utils/request'
+import Search from '../components/Search'
+import List from '../components/List'
+
+
+const Condition = props => {
+  return (
+    <Search
+      onSearch={props.onSearch}
+      onReset={props.onReset}
+      render={form => {
+        const { getFieldDecorator, setFieldsValue } = form
+        
+        return (
+          <>
+            <Form.Item label="公告编号">
+            {
+              getFieldDecorator('announcementNumber')(<Input placeholder="公告编号" />)
+            }
+            </Form.Item>
+            <Form.Item label="公告标题">
+            {
+              getFieldDecorator('announcementTitle')(<Input placeholder="公告标题" />)
+            }
+            </Form.Item>
+          </>
+        )
+      }}
+    />
+  )
+}
+
+const StatusDict = {
+  '0': '已作废',
+  '1': '已发布',
+  '2': '草稿'
+}
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [listData, setListData] = useState([])
+
+  const handleSearch = () => {
+
+  }
+
+  const handleDeleteRow = row => {
+
+  }
+
+  const handlePageChange = (pageNum, pageSize) => {
+
+  }
+
+  return (
+    <div>
+      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <div style={{ margin: '24px 0' }}>
+        <NavLink to={`/xxx`}>
+          <Button type="primary">添加</Button>
+        </NavLink>
+        <Button style={{ marginLeft: '24px' }}>修改</Button>
+        <Button type="danger" style={{ marginLeft: '24px' }}>修改</Button>
+      </div>
+      <Spin spinning={loading}>
+        <List dataSource={listData} onPageChange={handlePageChange} rowKey="id">
+          <Table.Column title="编号" dataIndex="id" key="id" />
+          <Table.Column
+            title="标题"
+            dataIndex="announcementTitle"
+            key="announcementTitle"
+            render={(_, row) => {
+              return (
+                <NavLink to={`/xxx?id=${row.id}`}>
+                  <Button type="link">{row.announcementTitle}</Button>
+                </NavLink>
+              )
+            }}
+          />
+          <Table.Column title="查看数量" dataIndex="viewCount" key="viewCount" />
+          <Table.Column
+            title="状态"
+            dataIndex="status"
+            key="status"
+            render={(_, row) => {
+              if (row.status === '1' && (row.updateDate > row.createDate)) {
+                return '已修改'
+              }
+
+              return StatusDict[row.status]
+            }}
+          />
+          <Table.Column title="身份" dataIndex="roleName" key="roleName" />
+          <Table.Column
+            title="审核状态"
+            dataIndex="verifyStatus"
+            key="verifyStatus"
+            render={(_, row) => {
+              return (
+                <span>
+                  {verifyStatusDict[row.verifyStatus] || ''}
+                </span>
+              )
+            }}
+          />
+          <Table.Column title="编辑人" dataIndex="updateName" key="updateName" />
+          <Table.Column title="编辑时间" dataIndex="createDate" key="createDate" />
+          <Table.Column
+            title="操作"
+            key="action"
+            render={(_, row) => {
+              return (
+                <Popconfirm
+                  title="确认进行删除操作?"
+                  onConfirm={() => handleDeleteRow(row)}
+                  okText="删除"
+                  cancelText="取消"
+                >
+                  <Button type="link">删除</Button>
+                </Popconfirm>
+              )
+            }}
+          />
+        </List>
+      </Spin>
+
+    </div>
+  )
+}