From 2ea56ed08b58386f0612635101b1acd51cd4a44c Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 29 Apr 2020 18:06:45 +0800
Subject: [PATCH] 浏览日志,操作日志;用户中心(个人信息);用户管理(用户中心)

---
 src/components/page/index/rulesList/index.jsx |   40 ++++++++++++++++------------------------
 1 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/components/page/index/rulesList/index.jsx b/src/components/page/index/rulesList/index.jsx
index c57276e..29d7f52 100644
--- a/src/components/page/index/rulesList/index.jsx
+++ b/src/components/page/index/rulesList/index.jsx
@@ -10,6 +10,7 @@
 import TableView from '../../../common/TableView';
 import SearchFormView from '../../../common/SearchFormView';
 import moment from 'moment';
+import FindAlreadyReadOrNotView from '../../../common/FindAlreadyReadOrNotView';
 
 import './index.scss';
 const { TabPane } = Tabs;
@@ -36,7 +37,6 @@
   componentDidMount() { }
 
   link = (id) => {
-    console.log(id)
     this.props.history.push({ pathname: "/document/detail/" + id });
   }
 
@@ -46,27 +46,30 @@
 
   renderColumns = () => {
     return [
-      { title: '标题', dataIndex: 'documentTitle' },
+      { title: '标题', dataIndex: 'documentTitle', ellipsis: true },
       {
-        title: '通知内容', dataIndex: 'documentContent', width: '40%', ellipsis: true, render: (cur, item) => {
+        title: '通知内容', dataIndex: 'documentContent', ellipsis: true, render: (cur, item) => {
           return cur ? this.emoveTAG(cur) : '无'
         }
       },
-      { title: '接受情况', dataIndex: 'groupType', render: (cur, item) => <a onClick={() => { this.setState({ visible: true }) }}> <span>{item.readNumber || 0}/{item.noticeNumber || 0}</span></a> },
+      { title: '接受情况', dataIndex: 'groupType', render: (cur, item) => <a onClick={() => { this.setState({ visible: true, documentId: item.id, curItem: item }) }}> <span>{item.readNumber || 0}/{item.noticeNumber || 0}</span></a> },
       { title: '发布时间', dataIndex: 'createTime', render: (cur, item) => cur !== "" && cur != null ? moment(cur).format("YYYY-MM-DD HH:mm") : "" },
       { title: '操作', render: (text, record) => <a onClick={() => this.link(record.id)}>查看</a> }
     ];
   }
 
   setFormData = data => {
-    console.log('form', data);
     this.setState({
       formData: data,
     });
   }
 
+  onTabsChange = (key) => {
+  }
+
+
   render() {
-    const { formData, visible } = this.state;
+    const { formData, visible, documentId, curItem } = this.state;
 
     let tableParams = {
       url: `api/document/getNotice`,
@@ -84,25 +87,14 @@
           visible={visible}
           onCancel={() => this.setState({ visible: false })}
           footer={null}
-          title="接收情况"
+          title={<div >
+            {curItem ? curItem.documentTitle : '接受情况'}
+          </div>}
         >
-          <Tabs defaultActiveKey="1" >
-            <TabPane tab="未读" key="1">
-              <div className="modal-list">
-                {
-                  [1,2,3].map((a)=>(
-                    <div className="flex-box-row align-center modal-list-item" >
-                      <Avatar src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" />
-                      <span className="modal-label">柯礼钦</span>
-                      <span className="modal-time">2010-10-10 24:00</span>
-                    </div>
-                  ))
-                }
-              </div>
-            </TabPane>
-            <TabPane tab="已读" key="2">
-            </TabPane>
-          </Tabs>
+          {
+            documentId &&
+            <FindAlreadyReadOrNotView key={documentId} documentId={documentId} />
+          }
 
         </Modal>
         <SearchFormView

--
Gitblit v1.8.0