From 0ec802e93557b2b1422ddbd68aafa994fa68f455 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 27 May 2020 10:04:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/page/QuestionDetail.jsx | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/SunshineIns/src/page/QuestionDetail.jsx b/SunshineIns/src/page/QuestionDetail.jsx
index 85413ad..d1e92f7 100644
--- a/SunshineIns/src/page/QuestionDetail.jsx
+++ b/SunshineIns/src/page/QuestionDetail.jsx
@@ -2,8 +2,14 @@
import { Input, Button, DatePicker, Divider, message, Popconfirm, Select, Badge, Spin, Breadcrumb } from 'antd';
import Questionnair from '../page/Questionnair'
import Fetch from '../fetch'
+import TableView from '../view/TableView';
import HeadView from '../view/HeadView';
+import moment from 'moment';
+const divStyle = {
+ padding: '20px',
+ background: '#fff'
+}
export default class QuestionDetail extends React.Component {
constructor(props) {
super(props);
@@ -11,8 +17,8 @@
loading: false,
data: [],
initData: null,
- btnLoading: false
-
+ btnLoading: false,
+ dateSource: []
};
}
@@ -26,11 +32,20 @@
});
Fetch.questionFindById(id).then(res => {
console.log('res', res);
+ console.log('res.mps', res.submitMaps);
this.setState({
loading: false,
- initData: res
+ initData: res,
+ dateSource: res.submitMaps || [],
})
})
+ }
+
+
+ showModal = (userId) => {
+ const { id } = this.props.match.params;
+ console.log(id)
+ this.props.history.push("/questionnaire/persondetail/" + id + '/' + userId);
}
submitQuestionTemp = (questionDtos, extraData) => {
@@ -69,7 +84,26 @@
render() {
- const { data, loading, resetKey, initData, btnLoading } = this.state;
+ const { data, loading, resetKey, initData, btnLoading, dateSource } = this.state;
+ console.log(dateSource)
+ const act2columns = [{
+ title: '提交人昵称',
+ dataIndex: 'userName',
+ key: 'userName'
+ },
+ {
+ title: '提交时间',
+ dataIndex: 'createTime',
+ key: 'createTime',
+ render: text => <span>{text || ''}</span>
+ }, {
+ title: '操作',
+ dataIndex: 'isHit',
+ key: 'isHit',
+ render: (text, record) => (
+ <label className='theme-color' onClick={() => this.showModal(record.userId)} style={{ cursor: 'pointer' }}>查看</label>
+ )
+ }];
return (
<div className="app-page">
<HeadView history={this.props.history} />
@@ -106,7 +140,7 @@
问卷描述：{initData.content || '暂无'}
</h4>
<h4 style={{ marginBottom: 0 }}>
- 业务类型：{initData.businessType || '暂无'}
+ 业务类型：{typeStatus(initData.businessType) || '暂无'}
</h4>
</div>
</div>
@@ -115,6 +149,14 @@
{initData && initData.questionDtos.map((item, index) => (
<Questionnair.Editor editor={item} acitveAnswer={true} key={item.questionId} index={index} />
))}
+
+ {
+ dateSource.length > 0 ?
+ <div style={divStyle}>
+ <Divider orientation="left" style={{ margin: '20px', width: '97%' }}>问卷提交记录</Divider>
+ <TableView columns={act2columns} data={dateSource} pageSize='6' size='small' />
+ </div> : null
+ }
</React.Fragment>
}
@@ -123,3 +165,16 @@
}
}
+
+function typeStatus(type) {
+ switch (type) {
+ case 1:
+ return "企业体检";
+ case 2:
+ return "培训活动";
+ case 3:
+ return "未检调查";
+ case 4:
+ return "刑执监督";
+ }
+}
--
Gitblit v1.8.0