forked from huge/frontEnd/hugeOA

Mr Ke
2020-04-06 ad9b5d0d1fd7c8729170df32cf82c3b029207cdd
修改规章制度列表
2 files added
2 files renamed
5 files modified
139 ■■■■ changed files
src/components/common/TopListTableView/index.jsx 7 ●●●●● patch | view | raw | blame | history
src/components/page/SystemPage/index.jsx 5 ●●●● patch | view | raw | blame | history
src/components/page/index/rulesList/index.jsx 85 ●●●●● patch | view | raw | blame | history
src/components/page/index/rulesList/index.scss 14 ●●●●● patch | view | raw | blame | history
src/components/page/index/workbench/index.jsx 6 ●●●● patch | view | raw | blame | history
src/components/page/index/workbench/index.scss patch | view | raw | blame | history
src/index.js 6 ●●●● patch | view | raw | blame | history
src/pages/index/System.jsx 14 ●●●●● patch | view | raw | blame | history
src/pages/index/workbench.jsx 2 ●●● patch | view | raw | blame | history
src/components/common/TopListTableView/index.jsx
@@ -8,6 +8,8 @@
import React, { ReactNode, ReactEventHandler, Component } from 'react';
import { Table, Row, Col } from 'antd';
import { tagList } from './tagList';
import fetch from '../../../api/request';
import './index.scss';
@@ -22,6 +24,11 @@
  }
  componentWillMount() {
    fetch({
      url: `api/merits/queryMerits`
    }).then(res => {
      console.log('res', res);
    })
    this.setState({
      topList: tagList
    })
src/components/page/SystemPage/index.jsx
@@ -6,9 +6,9 @@
/** Happy Coding */
import React, { ReactNode, ReactEventHandler, Component } from 'react';
// import { Link } from 'react-router-dom';
import moment from 'moment'
import { DatePicker, Table, Card, Row, Col, Icon, Form, Input, Button, Select, message } from 'antd';
import './index.scss';
import fetch from '../../../api/request';
@@ -33,9 +33,6 @@
      }
    };
  }
  componentWillMount() { }
src/components/page/index/rulesList/index.jsx
New file
@@ -0,0 +1,85 @@
/* eslint-disable */
/**柯礼钦
 * 4/6/2020, 5:17:40 PM
 * doc comment for the file goes here
 */
/** 工作制度 */
import React, { ReactNode, ReactEventHandler, Component } from 'react';
import TableView from '../../../common/TableView';
import SearchFormView from '../../../common/SearchFormView';
import moment from 'moment';
import './index.scss';
export default class RulesList extends Component {
  constructor(props) {
    super(props);
    this.config = {
    };
    this.state = {
      formData: {
        __key: Date.now(),
        type: '',
        title: '',
        page: 1,
        size: 10,
      },
    };
  }
  componentWillMount() { }
  componentDidMount() { }
  renderColumns = () => {
    return [
      { title: '通知标题', dataIndex: 'documentItle;' },
      { title: '通知内容', dataIndex: 'documentContent' },
      { title: '接受情况', dataIndex: 'groupType', render: (cur, item) => <span>{item.readNumber || 0}/{item.noticeNumber || 0}</span> },
      { title: '通知时间', dataIndex: 'createTime', render: (cur, item) => cur !== "" && cur != null ? moment(cur).format("YYYY-MM-DD HH:mm") : "" },
    ];
  }
  setFormData = data => {
    console.log('form', data);
    this.setState({
      formData: data,
    });
  }
  render() {
    const { formData } = this.state;
    let tableParams = {
      url: `api/document/getNotice`,
      formData,
      key: formData.__key,
      columns: this.renderColumns(),
      extraFromData: {
        type: '',
      },
      setFormData: this.setFormData
    }
    return (
      <div className="rules-list-main">
        <SearchFormView
          formData={formData}
          setFormData={this.setFormData}
          data={[
            { type: 'input', name: '标题', label: '标题', key: 'title' },
            {
              type: 'rangePicker',
              label: '发布时间',
              name: JSON.stringify(['开始时间', '结束时间']),
              key: JSON.stringify(['startTime', 'endTime']),
              keylistName: 'rangeTimelist',
            },
          ]} />
        <TableView {...tableParams} />
      </div>
    )
  }
}
src/components/page/index/rulesList/index.scss
New file
@@ -0,0 +1,14 @@
/* eslint-disable */
/**liuwh
 * 4/6/2020, 5:17:40 PM
 * doc comment for the file goes here
 */
/** Happy Coding */
.rules-list {
  &-main {
    background: #fff;
    margin: 20px;
    padding: 20px;
  }
}
src/components/page/index/workbench/index.jsx
File was renamed from src/components/page/workbench/index.jsx
@@ -6,9 +6,9 @@
/** 首页--工作台 */
import React, { ReactNode, ReactEventHandler, Component } from 'react';
import NotifyList from '../../common/NotifyList'; //通知列表
import TopListTableView from '../../common/TopListTableView'; //榜单列表
import HotListTableView from '../../common/HotListTableView'; //行业热点知识库
import NotifyList from '../../../common/NotifyList'; //通知列表
import TopListTableView from '../../../common/TopListTableView'; //榜单列表
import HotListTableView from '../../../common/HotListTableView'; //行业热点知识库
import './index.scss';
src/components/page/index/workbench/index.scss
src/index.js
@@ -51,17 +51,17 @@
              {/* 新建文档 */}
              <Route path="/document/create" component={DocumentEdit} />
              {/* 全部通知 */}
              <Route path="/index/workbench/announcement" component={Announcement} />
              {/* 规章制度 */}
              <Route path="/index/rules" component={System} />
              
              {/* 首页 */}
              <Route path="/index" component={Workbench} />
             
              {/* 规章制度 */}
              <Route path="/index/rules" component={System} />
              <Route path="/login" component={Login} />
              <Route path="/" component={Workbench} />
              {/* 路由的页面重定向 */}
              <Redirect to="/" component={Workbench} />
            </Switch>
src/pages/index/System.jsx
@@ -8,6 +8,7 @@
import React, { ReactNode, ReactEventHandler, Component } from 'react';
import BreadcrumbView from '../../components/common/BreadcrumbView';
import SystemPage from '../../components/page/SystemPage'
import RulesList from '../../components/page/index/rulesList'
export default class System extends Component {
  constructor(props) {
@@ -27,16 +28,11 @@
  render() {
    return (
      <div className="System-main">
        <BreadcrumbView data={[{ name: '工作制度'}]} />
        <SystemPage />
        <BreadcrumbView data={[{ name: '工作制度' }]} />
        {/* <SystemPage /> */}
        <RulesList {...this.prosp} />
      </div>
    )
  }
}
//export default function System({  }) {
//    return (
//     <div className="System-main">
//
//      </div>
//    )
//}
src/pages/index/workbench.jsx
@@ -7,7 +7,7 @@
/** 首页 -- 工作台 */
import React, { ReactNode, ReactEventHandler, Component } from 'react';
import BreadcrumbView from '../../components/common/BreadcrumbView';
import WorkbenchPage from '../../components/page/workbench'
import WorkbenchPage from '../../components/page/index/workbench'
export default class Workbench extends Component {
  constructor(props) {