From 9c7c21e8eacda173feb418bdfe739f7f97358233 Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Sun, 29 Mar 2020 17:28:46 +0800
Subject: [PATCH] bug修复
---
SunshineIns/src/page/ActiveManageEdit.jsx | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/SunshineIns/src/page/ActiveManageEdit.jsx b/SunshineIns/src/page/ActiveManageEdit.jsx
index 4e68068..b0a77c5 100644
--- a/SunshineIns/src/page/ActiveManageEdit.jsx
+++ b/SunshineIns/src/page/ActiveManageEdit.jsx
@@ -164,7 +164,7 @@
questionnaireCancle = () => {
- const {selectedQuestionnaireData}=this.state;
+ const { selectedQuestionnaireData } = this.state;
// this.props.history.push(`/questionnaire/detail/${selectedQuestionnaireData.id}`)
window.open('index.html#/activeManageEditquestionnaire/' + selectedQuestionnaireData.id);
}
@@ -510,16 +510,18 @@
title: '报名方',
dataIndex: 'proposerName',
key: 'proposerName'
- }, {
- title: '报名方性质',
- dataIndex: 'signerType',
- key: 'signerType',
- render: text => (<span>{text == 1 ? '个人' : '企业'}</span>)
- }, {
- title: '报名人数',
- dataIndex: 'signNum',
- key: 'signNum',
- }, {
+ },
+ // {
+ // title: '报名方性质',
+ // dataIndex: 'signerType',
+ // key: 'signerType',
+ // render: text => (<span>{text == 1 ? '个人' : '企业'}</span>)
+ // }, {
+ // title: '报名人数',
+ // dataIndex: 'signNum',
+ // key: 'signNum',
+ // },
+ {
title: '审核状态',
dataIndex: 'signStatus',
key: 'signStatus',
@@ -539,10 +541,11 @@
cancelText="不通过"
>
<a href="#">审核</a>
- </Popconfirm> : <span disabled>审核</span>
+ </Popconfirm> : <span disabled></span>
)
}];
-
+ console.log('savedate.activityStatus', savedate.activityStatus)
+ console.log('savedate.activityType', savedate.activityType)
return (
<div className="app-page">
<Spin spinning={loading}>
@@ -701,26 +704,26 @@
}
{
- activityType == 'act_1' ? (dateSource.length > 0 ?
+ savedate.activityType == 'act_1' ? (dateSource.length > 0 ?
<div style={divStyle}>
<Divider orientation="left" style={{ margin: '20px', width: '97%' }}>报名人员信息</Divider>
<TableView columns={columns} data={dateSource} pageSize='6' size='small' />
</div> : null) : null
}
{
- activityType == 'act_2' || activityType == 'act_3' ? (dateSource.length > 0 ?
+ savedate.activityType == 'act_2' || savedate.activityType == 'act_3' ? (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) : null
}
{
- activityType == 'act_2' || activityType == 'act_3' ? (dateSource.length > 0 ?
+ savedate.activityType == 'act_2' || savedate.activityType == 'act_3' ? (dateSource.length > 0 ?
<div style={divStyle}>
<Divider orientation="left" style={{ margin: '20px', width: '97%' }}>培训结果</Divider>
<div style={divStyle}>
<Row type="flex" align='top' justify="space-around">
- <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>添加结果图片</span></Col>
+ <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>结果材料</span></Col>
<Col span={18} push={0} >
<Upload disabled={disabled} listType="picture-card" onPreview={this.handlePreview} {...bottmProps}>
@@ -730,12 +733,19 @@
</Modal>
</Col>
</Row>
+ <Row type="flex" align='top' justify="space-around">
+ <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>培训结果</span></Col>
+ <Col span={18} push={0} >
+ <span>{savedate.result}</span>
+ </Col>
+ </Row>
</div>
+
</div> : null) : null
}
{
- activityType == 'act_1' && (
+ savedate.activityType == 'act_1' && (
savedate.activityStatus == null || savedate.activityStatus == 0 ?
<div style={{ display: 'flex', justifyContent: 'center' }}>
<Button style={{ marginRight: '15px', width: '150px' }} type="primary" onClick={this.submit}>提交</Button>
@@ -755,7 +765,7 @@
)
}
{
- activityType == 'act_2' || activityType == 'act_3' && (
+ savedate.activityType == 'act_2' || savedate.activityType == 'act_3' ? (
savedate.activityStatus == null || savedate.activityStatus == 0 ?
<div style={{ display: 'flex', justifyContent: 'center' }}>
<Button style={{ marginRight: '15px', width: '150px' }} type="primary" onClick={this.submit}>提交</Button>
@@ -772,7 +782,7 @@
<Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.cancle}>返回</Button>
</div>
)
- )
+ ) : '123'
}
</BusDetailView>
--
Gitblit v1.8.0