From fc68f6006949a91fced69951778a7c88859cbb6c Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 06 May 2020 10:49:07 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/components/page/DocumentDetailPage/index.jsx | 73 ++++++++++++++----------------------
1 files changed, 29 insertions(+), 44 deletions(-)
diff --git a/src/components/page/DocumentDetailPage/index.jsx b/src/components/page/DocumentDetailPage/index.jsx
index 3ae3663..24bc71a 100644
--- a/src/components/page/DocumentDetailPage/index.jsx
+++ b/src/components/page/DocumentDetailPage/index.jsx
@@ -13,7 +13,8 @@
const { TextArea } = Input;
import fetch from '../../../api/request';
-import { BASE_URL } from '../../../api/httpurl'
+import { BASE_URL } from '../../../api/httpurl';
+import moment from 'moment';
const param = [{ value: 'DT00002', name: '通知公告' }, { value: 'DT00001', name: '规章制度' }]
export default class DocumentDetailPage extends Component {
@@ -158,55 +159,39 @@
<Spin spinning={loading}>
<Card style={{ border: 20, margin: 20, padding: 20 }}>
- <Row gutter={16}>
- <Col className="gutter-row marginTop flex-box-row" >
- <div className="document-detail-page-main-label">
- 文档类型：
- </div>
- <div className="document-detail-page-main-value">
- {
- saveData.documentType ? param.find(({ value }) => value == saveData.documentType).name : '无'
- }
- </div>
- </Col>
+ <Row className="document-detail-page-main-title">
+ {saveData.documentTitle || '无'}
</Row>
- <Row gutter={16} className="marginTop">
- <Col className="gutter-row marginTop flex-box-row">
- <div className="document-detail-page-main-label">
- {saveData.documentType && this.switchWordByType(saveData.documentType).title}标题：
- </div>
- <div className="document-detail-page-main-value">
- {saveData.documentTitle || '无'}
- </div>
- </Col>
+ <Row className="document-detail-page-main-documentType marginTop">
+ <div className="marginTop">
+ {
+ saveData.documentType ? param.find(({ value }) => value == saveData.documentType).name : '无'
+ }
+ </div>
</Row>
- <Row gutter={16} className="marginTop">
- <Col className="gutter-row marginTop flex-box-row flex-start">
- <div className="document-detail-page-main-label">
- 通知内容：
- </div>
- <div className="flex-1">
- {
- saveData.documentContent ? <div dangerouslySetInnerHTML={{
- __html: saveData.documentContent
- }} style={{ width: '70%' }} /> : <div className="document-detail-page-main-value">
- 无
+ <Row className="document-detail-page-main-detail marginTop">
+ <Row gutter={16} type="flex" className="marginTop">
+ <Col>广州恒巨信息科技有限公司</Col>
+ <Col>{saveData.createTime && moment(saveData.createTime).format("YYYY-MM-DD HH:mm")}</Col>
+ </Row>
+ <Row className="marginTop">
+ {saveData.readNumber}人已读，{saveData.noticeNumber - saveData.readNumber}人未读
+ </Row>
+ </Row>
+
+ <Row className="marginTop">
+ <div>
+ {
+ saveData.documentContent ? <div dangerouslySetInnerHTML={{
+ __html: saveData.documentContent
+ }} style={{ width: '70%' }} /> : <div className="document-detail-page-main-value">
+ 无
</div>
- }
- </div>
-
- </Col>
+ }
+ </div>
</Row>
-
- {/* 当有富文本内容的时候 -- 显示 */}
- {/* {
- saveData.documentContent &&
- <div dangerouslySetInnerHTML={{
- __html: saveData.documentContent
- }} style={{ width: '70%' }} className="marginTB" />
- } */}
<Row gutter={16} className="marginTop">
<Col className="gutter-row marginTop flex-box-row flex-start">
--
Gitblit v1.8.0