From ec511e31e01a195bfea5145f9e7e929a68cd9f7e Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Wed, 25 Mar 2020 01:05:55 +0800
Subject: [PATCH] 提交
---
SunshineIns/src/page/ActiveManageEdit.jsx | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/SunshineIns/src/page/ActiveManageEdit.jsx b/SunshineIns/src/page/ActiveManageEdit.jsx
index c9e5893..54d86a0 100644
--- a/SunshineIns/src/page/ActiveManageEdit.jsx
+++ b/SunshineIns/src/page/ActiveManageEdit.jsx
@@ -164,8 +164,9 @@
questionnaireCancle = () => {
- const {selectedQuestionnaireData}=this.state;
- this.props.history.push(`/questionnaire/detail/${selectedQuestionnaireData.id}`)
+ const { selectedQuestionnaireData } = this.state;
+ // this.props.history.push(`/questionnaire/detail/${selectedQuestionnaireData.id}`)
+ window.open('index.html#/activeManageEditquestionnaire/' + selectedQuestionnaireData.id);
}
questionnaireDel = () => {
@@ -719,7 +720,7 @@
<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}>
@@ -729,7 +730,14 @@
</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
}
--
Gitblit v1.8.0