From 61d4bef11bb712be61323bef47515436e62292bb Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Wed, 27 May 2020 17:45:23 +0800
Subject: [PATCH] 2
---
SunshineIns/src/page/Newly.jsx | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/SunshineIns/src/page/Newly.jsx b/SunshineIns/src/page/Newly.jsx
index fdcf575..a41ee53 100644
--- a/SunshineIns/src/page/Newly.jsx
+++ b/SunshineIns/src/page/Newly.jsx
@@ -143,7 +143,6 @@
loading: true
});
Fetch.questionFindById(id).then(res => {
- console.log('res', res);
res.questionDtos = res.questionDtos && res.questionDtos.length ? res.questionDtos.map((item) => ({
...item,
remark: true
@@ -158,19 +157,41 @@
submitQuestionTemp = (questionDtos, extraData) => {
const { initData } = this.state;
console.log('questionDtos', questionDtos);
+ console.log('initData', initData);
if (!extraData.questionnairTitle) {
return message.error('请填写问卷标题');
}
+ if (!extraData.questionnairBusinessType) {
+ return message.error('请选择业务类型');
+ }
+ let sum = questionDtos.reduce((p, n) => {
+ if (n.type == 'radio') {
+ return p.concat(Math.max.apply(null, n.scores))
+ } else {
+ return p.concat(n.scores)
+ }
+ }, []).reduce(function (prev, curr, idx, arr) {
+ return Number(prev) + Number(curr);
+ });
+ console.log('总分值', sum);
+ if (sum > 100) {
+ return message.error('分值超过最大值，请重新设定分值');
+ }
+
questionDtos = questionDtos.map(({ type, title, required, remarkText, options, scores, warnFlag }) => ({
type, title, required, remarkText, options, scores, warnFlag
}));
+
this.setState({
btnLoading: true
})
+ console.log('questionDtos', questionDtos);
+
Fetch.saveQuestionTemp({
...initData,
title: extraData.questionnairTitle,
content: extraData.questionnairDescription,
+ businessType: extraData.questionnairBusinessType,
questionDtos
}).then(res => {
console.log('res', res);
@@ -179,6 +200,7 @@
})
if (res.code == 0) {
message.success('问卷提交成功');
+ this.props.history.push('/questionnaire/newlyList');
}
})
}
@@ -192,13 +214,13 @@
const { data, loading, resetKey, initData, btnLoading } = this.state;
const { id } = this.props.match.params;
return (
- <div className="app-page">
+ <div className="app-page" >
<div style={{
margin: '10px 0 0 10px'
}}>
<Breadcrumb>
<Breadcrumb.Item>
- <a onClick={()=>{
+ <a onClick={() => {
this.props.history.goBack();
}}>问卷管理</a>
</Breadcrumb.Item>
@@ -209,9 +231,9 @@
</div>
{
loading ?
- <div style={{ height: 200, width: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+ <div style={{ height: 200, width: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' }} >
<Spin spinning={loading} />
- </div> :
+ </div > :
initData && <Questionnair submitQuestionTemp={this.submitQuestionTemp} btnLoading={btnLoading} initData={initData} editors={initData.questionDtos || []} />
}
</div>
--
Gitblit v1.8.0