|
@@ -1,5 +1,5 @@
|
|
|
import React from 'react';
|
|
|
-import { Spin, Button, Tabs, Table, message } from 'antd';
|
|
|
+import { Spin, Button, Tabs, Table, message, Modal } from 'antd';
|
|
|
import ajax from 'jquery/src/ajax/xhr.js'
|
|
|
import $ from 'jquery/src/ajax';
|
|
|
|
|
@@ -13,7 +13,7 @@ const TabPane = Tabs.TabPane;
|
|
|
const MessageModal = React.createClass({
|
|
|
getInitialState() {
|
|
|
return {
|
|
|
- visible: false,
|
|
|
+ newVisible: false,
|
|
|
loading: false,
|
|
|
pagination: {
|
|
|
defaultCurrent: 1,
|
|
@@ -64,15 +64,16 @@ const MessageModal = React.createClass({
|
|
|
title: '内容',
|
|
|
dataIndex: 'content',
|
|
|
key: 'content',
|
|
|
- }, {
|
|
|
- title: '公司',
|
|
|
- dataIndex: 'unitName',
|
|
|
- key: 'unitName',
|
|
|
- }, {
|
|
|
- title: '业务员',
|
|
|
- dataIndex: 'principle',
|
|
|
- key: 'principle',
|
|
|
- }
|
|
|
+ },
|
|
|
+ // {
|
|
|
+ // title: '公司',
|
|
|
+ // dataIndex: 'unitName',
|
|
|
+ // key: 'unitName',
|
|
|
+ // }, {
|
|
|
+ // title: '业务员',
|
|
|
+ // dataIndex: 'principle',
|
|
|
+ // key: 'principle',
|
|
|
+ // }
|
|
|
],
|
|
|
data: []
|
|
|
};
|
|
@@ -333,13 +334,18 @@ const MessageModal = React.createClass({
|
|
|
};
|
|
|
this.state.UnreadPagination.current = data.data.pageNo;
|
|
|
this.state.UnreadPagination.total = data.data.totalCount;
|
|
|
+ if(data.data.list.length) {
|
|
|
+ this.setState({
|
|
|
+ newVisible: true
|
|
|
+ });
|
|
|
+ }
|
|
|
this.setState({
|
|
|
unreadData: this.state.data,
|
|
|
UnreadPagination: this.state.UnreadPagination
|
|
|
});
|
|
|
}).always(function () {
|
|
|
this.setState({
|
|
|
- loading: false
|
|
|
+ loading: false,
|
|
|
});
|
|
|
}.bind(this));
|
|
|
},
|
|
@@ -348,27 +354,62 @@ const MessageModal = React.createClass({
|
|
|
this.loadUnread();
|
|
|
this.mainMenu();
|
|
|
},
|
|
|
+ handleOk() {
|
|
|
+ this.setState({
|
|
|
+ newVisible: false
|
|
|
+ });
|
|
|
+ },
|
|
|
render() {
|
|
|
return (
|
|
|
- <div className="set-content">
|
|
|
- <div className="set-title">
|
|
|
- <span>信息中心</span>
|
|
|
- </div>
|
|
|
- <Spin spinning={this.state.loading} className='spin-box'>
|
|
|
- <Tabs defaultActiveKey="1">
|
|
|
- <Tabs.TabPane tab="新信息" key="1">
|
|
|
- <Table columns={this.state.columns}
|
|
|
- dataSource={this.state.unreadData}
|
|
|
- pagination={this.state.UnreadPagination} />
|
|
|
- </Tabs.TabPane>
|
|
|
- <Tabs.TabPane tab="已读信息" key="2">
|
|
|
- <Table columns={this.state.columns}
|
|
|
- dataSource={this.state.dataSource}
|
|
|
- pagination={this.state.pagination} />
|
|
|
- </Tabs.TabPane>
|
|
|
- </Tabs>
|
|
|
- </Spin>
|
|
|
+ <div className="set-content">
|
|
|
+ <div className="set-title">
|
|
|
+ <span>信息中心</span>
|
|
|
</div>
|
|
|
+ <Spin spinning={this.state.loading} className="spin-box">
|
|
|
+ <Tabs defaultActiveKey="1">
|
|
|
+ <Tabs.TabPane tab="新信息" key="1">
|
|
|
+ <Table
|
|
|
+ columns={this.state.columns}
|
|
|
+ dataSource={this.state.unreadData}
|
|
|
+ pagination={this.state.UnreadPagination}
|
|
|
+ />
|
|
|
+ </Tabs.TabPane>
|
|
|
+ <Tabs.TabPane tab="已读信息" key="2">
|
|
|
+ <Table
|
|
|
+ columns={this.state.columns}
|
|
|
+ dataSource={this.state.dataSource}
|
|
|
+ pagination={this.state.pagination}
|
|
|
+ />
|
|
|
+ </Tabs.TabPane>
|
|
|
+ </Tabs>
|
|
|
+ </Spin>
|
|
|
+ <Modal
|
|
|
+ style={{ position: "relative" }}
|
|
|
+ title="消息提醒"
|
|
|
+ visible={this.state.newVisible}
|
|
|
+ width={1000}
|
|
|
+ closable={false}
|
|
|
+ footer={null}
|
|
|
+ >
|
|
|
+ <Table
|
|
|
+ columns={this.state.columns}
|
|
|
+ dataSource={this.state.unreadData}
|
|
|
+ pagination={false}
|
|
|
+ />
|
|
|
+ <Button
|
|
|
+ onClick={this.handleOk}
|
|
|
+ type={"primary"}
|
|
|
+ style={{
|
|
|
+ position: "relative",
|
|
|
+ left: "50%",
|
|
|
+ transform: "translateX(-50%)",
|
|
|
+ bottom: -10
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 我已阅读以上信息
|
|
|
+ </Button>
|
|
|
+ </Modal>
|
|
|
+ </div>
|
|
|
);
|
|
|
}
|
|
|
});
|