From d3429f26d341cd8047e79ada5f2f5468efe2947f Mon Sep 17 00:00:00 2001
From: liuwh <liuwh@hugeinfo.com.cn>
Date: Thu, 05 Mar 2020 18:54:42 +0800
Subject: [PATCH] 1

---
 SunshineIns/src/page/CareListEdit.jsx |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/SunshineIns/src/page/CareListEdit.jsx b/SunshineIns/src/page/CareListEdit.jsx
index 25c60e4..0be5abe 100644
--- a/SunshineIns/src/page/CareListEdit.jsx
+++ b/SunshineIns/src/page/CareListEdit.jsx
@@ -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)
@@ -431,6 +432,36 @@
                                 <Col span={12} pull={0}></Col>
                             </Row>
                         </div>
+
+                        {
+                            savedate.status !== 0 ?
+                                <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 !== 0 ?
+                                <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