From 58ae2ba21efcd85df331cf996a94038a77302b51 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Wed, 27 May 2020 17:07:48 +0800
Subject: [PATCH] 修改报错问题

---
 SunshineIns/src/page/ActiveManageEdit.jsx |   51 ++++++++++++++++++++++-----------------------------
 1 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/SunshineIns/src/page/ActiveManageEdit.jsx b/SunshineIns/src/page/ActiveManageEdit.jsx
index b0a77c5..f4bd483 100644
--- a/SunshineIns/src/page/ActiveManageEdit.jsx
+++ b/SunshineIns/src/page/ActiveManageEdit.jsx
@@ -83,7 +83,6 @@
                 if (endTime == null) {
                     endTime = Date.now();
                 }
-                console.log(res.attachments)
                 this.setState({
                     savedate: {
                         ...res.activity,
@@ -125,18 +124,18 @@
         }))
     }
 
-    selectonClick = () => {
+    selectonClick = (value) => {
         this.setState({
             questionnaireModal: true,
             modalLoading: true
         })
         Fetch.questionQuery({
             status: 3,
+            title : value,
             page: this.state.page,
             size: this.state.pageSize,
         })
             .then(res => {
-                console.log('res', res);
                 this.setState({
                     modalLoading: false
                 })
@@ -152,6 +151,10 @@
 
                 }
             });
+    }
+
+    selClick = () =>{
+        this.selectonClick("");
     }
 
     selectCancelModel = () => {
@@ -174,24 +177,16 @@
     }
 
     handleOk = (e) => {
-        console.log(e)
         this.setState({
             questionnaireModal: false,
             selectedRowKeys: []
         })
     }
 
-    questionnaireSearch = (value) => {
-        console.log(value)
-    }
-
     submit = () => {
         const { savedate, selectedQuestionnaireData, fileList } = this.state;
         savedate.startTime = moment(savedate.startDate + " " + moment(savedate.startHour).format(format), 'YYYY-MM-DD HH:mm')
         savedate.endTime = moment(savedate.endDate + " " + moment(savedate.endHour).format(format), 'YYYY-MM-DD HH:mm')
-        // console.log({...savedate,queId:selectedQuestionnaireData[0].id});
-        console.log(savedate);
-        console.log(selectedQuestionnaireData);
         if (!savedate.host) {
             message.warning("主持人不能为空");
             return;
@@ -265,7 +260,6 @@
     }
 
     getNum = (e) => {
-        console.log(e.target.value)
         this.setState({
             num: e.target.value
         })
@@ -306,12 +300,10 @@
     }
 
     confirm = (e) => {
-        console.log(e);
         const data = { id: e, status: 2 };
         this.setState({ loading: true })
         Fetch.auditPerson(data).then(res => {
             if (res.code == 0) {
-                console.log(res)
                 this.setState({ loading: false })
                 message.success('审核通过');
                 this.getDetail();
@@ -324,12 +316,10 @@
     }
 
     cancel = (e) => {
-        console.log(e);
         const data = { id: e, status: 4 };
         this.setState({ loading: true })
         Fetch.auditPerson(data).then(res => {
             if (res.code == 0) {
-                console.log(res)
                 this.setState({ loading: false })
                 message.error('审核不通过');
                 this.getDetail();
@@ -387,13 +377,23 @@
     }
 
     handleEditorChange = (editorState) => {
+        console.log('editorState', editorState)
         this.setState({ editorState })
+        const htmlContent = editorState.toHTML()
+        console.log(htmlContent)
+        this.setState(({ savedate }) => ({
+            savedate: {
+                ...savedate,
+                course: htmlContent
+            }
+        }))
     }
 
     submitContent = () => {
         // 在编辑器获得焦点时按下ctrl+s会执行此方法
         // 编辑器内容提交到服务端之前,可直接调用editorState.toHTML()来获取HTML格式的内容
         const htmlContent = this.state.editorState.toHTML()
+        console.log(htmlContent)
         this.setState(({ savedate }) => ({
             savedate: {
                 ...savedate,
@@ -404,10 +404,6 @@
 
     onSelectChange = (selectedRowKeys, selectedRows) => {
         const { tableData } = this.state;
-        console.log('selectedRowKeys changed: ', selectedRowKeys);
-        console.log('selectedRowKeys changed: ', selectedRows);
-        console.log(tableData[selectedRowKeys[0]]);
-        console.log(tableData);
         this.setState({
             selectedQuestionnaireData: tableData[selectedRowKeys[0]],
             selectedRowKeys
@@ -417,7 +413,6 @@
     handleCancel = () => this.setState({ previewVisible: false })
     render() {
         const { savedate, previewVisible, previewImage, editorState, selectedRowKeys, fileList, attList1, dateSource, code, hitList, activityType, disabled, loading, modalLoading } = this.state;
-        console.log('disabled', fileList)
         const props = {
             action: domain + 'api/v1/attachment/materials?entityId=' + savedate.id,
             onChange: ({ file, fileList }) => {
@@ -482,7 +477,7 @@
             )
         }];
         const questionnaireColumns = [{
-            title: '主题',
+            title: '问卷标题',
             dataIndex: 'title',
             key: 'title',
             ellipsis: true,
@@ -544,8 +539,6 @@
                     </Popconfirm> : <span disabled></span>
             )
         }];
-        console.log('savedate.activityStatus', savedate.activityStatus)
-        console.log('savedate.activityType', savedate.activityType)
         return (
             <div className="app-page">
                 <Spin spinning={loading}>
@@ -680,7 +673,7 @@
                                                         <Button type="link" onClick={this.questionnaireCancle}>查看</Button>
                                                         <Button type="link" onClick={this.questionnaireDel}>删除</Button>
                                                     </div> :
-                                                    <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.selectonClick}>请选择</Button>
+                                                    <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.selClick}>请选择</Button>
                                             }
                                         </Col>
                                     </Row>
@@ -693,10 +686,10 @@
                                                 this.state.selectedQuestionnaireData.title ?
                                                     <div>
                                                         <span style={{ margin: '0 20px' }}>{this.state.selectedQuestionnaireData.title}</span>
-                                                        <Button type="link" disabled onClick={this.questionnaireCancle}>查看</Button>
+                                                        <Button type="link" onClick={this.questionnaireCancle}>查看</Button>
                                                         <Button type="link" disabled onClick={this.questionnaireDel}>删除</Button>
                                                     </div> :
-                                                    <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.selectonClick}>请选择</Button>
+                                                    <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.selClick}>请选择</Button>
                                             }
                                         </Col>
                                     </Row>
@@ -782,7 +775,7 @@
                                                 <Button style={{ marginLeft: '15px', width: '150px' }} onClick={this.cancle}>返回</Button>
                                             </div>
                                     )
-                            ) : '123'
+                            ) : ''
                         }
 
                     </BusDetailView>
@@ -838,7 +831,7 @@
                             enterButton="查询"
                             size="large"
                             style={{ margin: '12px' }}
-                            onSearch={value => this.questionnaireSearch(value)}
+                            onSearch={value => this.selectonClick(value)}
                         />
 
                         <Table

--
Gitblit v1.8.0