From 12e9a4001d693505cc044fe2df0614257c26d535 Mon Sep 17 00:00:00 2001
From: liuwh <liuwh@hugeinfo.com.cn>
Date: Sat, 14 Mar 2020 21:40:31 +0800
Subject: [PATCH] bug修复
---
SunshineIns/src/page/CareListEdit.jsx | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/SunshineIns/src/page/CareListEdit.jsx b/SunshineIns/src/page/CareListEdit.jsx
index 2ed56ab..a0417c0 100644
--- a/SunshineIns/src/page/CareListEdit.jsx
+++ b/SunshineIns/src/page/CareListEdit.jsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { Row, Col, Input, DatePicker, Button, Modal, Upload, Icon, message, Divider, TimePicker, Badge, Select, Popconfirm, Spin } from 'antd';
+import { Row, Col, Input, DatePicker, Button, Modal, Upload, Icon, message, Breadcrumb, TimePicker, Badge, Select, Popconfirm, Spin } from 'antd';
const { TextArea } = Input;
import HeadView from '../view/HeadView';
import BusDetailView from '../view/BusDetailView';
@@ -82,8 +82,9 @@
},
taskType: res.taskType || 1,
// status: res.activityStatus || '',
- socialTaskObject: res.socialTaskObject?{id:res.socialTaskObject.objectId,objectName:res.socialTaskObject.objectName}:{},
+ socialTaskObject: res.socialTaskObject ? { id: res.socialTaskObject.objectId, objectName: res.socialTaskObject.objectName, taskReport:res.socialTaskObject.taskReport } : {},
disabled: res.status ? true : false,
+ fileList: res.attachments || [],
loading: false,
});
})
@@ -180,9 +181,9 @@
handleOk = e => {
const { savedate } = this.state;
console.log(savedate);
-
+
this.setState({
- visible: false,
+ visible: false,
});
Fetch.socialUpdate(savedate.id)
.then(res => {
@@ -193,7 +194,7 @@
message.error('保存失败，请联系管理员', 2)
}
});
- };
+ };
getNum = (e) => {
console.log(e.target.value)
@@ -360,6 +361,10 @@
<div className="app-page">
<Spin spinning={loading}>
<HeadView history={this.props.history} />
+ <Breadcrumb style={{ padding: '20px' }}>
+ <Breadcrumb.Item><a href="index.html#/careList">社会关护管理</a></Breadcrumb.Item>
+ <Breadcrumb.Item>社会关护管理活动</Breadcrumb.Item>
+ </Breadcrumb>
<BusDetailView type='社会关护管理活动' >
<div style={divStyle}>
<Row type="flex" align='middle' justify="space-around">
@@ -427,6 +432,36 @@
<Col span={12} pull={0}></Col>
</Row>
</div>
+
+ {
+ savedate.status ?
+ <div style={divStyle}>
+ <Row type="flex" align='middle' justify="space-around">
+ <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>任务汇报</span></Col>
+ <Col span={6} push={0} >
+ <TextArea disabled={disabled} rows={4} style={{ width: '92%' }} value={socialTaskObject.taskReport || ""} onChange={this.saveInputChange} name='taskReport' />
+ </Col>
+ <Col span={12} pull={0}></Col>
+ </Row>
+ </div> : ''
+ }
+
+ {
+ savedate.status ?
+ <div style={divStyle}>
+ <div style={divStyle}>
+ <Row type="flex" align='top' justify="space-around">
+ <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} {...props}>
+
+ </Upload>
+ </Col>
+ </Row>
+ </div>
+ </div> :''
+ }
+
{
savedate.status == 2 || savedate.status == 99 ?
--
Gitblit v1.8.0