From 75fa1bb87cf216dc4525d1a427924de464b03e80 Mon Sep 17 00:00:00 2001
From: Mr Ke <kelq@hugeinfo.com.cn>
Date: Tue, 14 Apr 2020 10:33:39 +0800
Subject: [PATCH] 修稿favicon、修改bug

---
 src/components/page/DocumentEditPage/index.jsx |   41 +++++++++++++++++++++++++++--------------
 1 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/components/page/DocumentEditPage/index.jsx b/src/components/page/DocumentEditPage/index.jsx
index 051c78e..ba3c510 100644
--- a/src/components/page/DocumentEditPage/index.jsx
+++ b/src/components/page/DocumentEditPage/index.jsx
@@ -37,7 +37,8 @@
   }
 
   loadData = () => {
-    const { id } = this.props;
+    const { id } = this.props.match.params;
+    console.log(this.props)
     console.log(id)
     let _this = this;
     _this.setState({
@@ -75,11 +76,11 @@
     const { savedate } = this.state;
     console.log(savedate)
     if (savedate.documentType == 'DT00001') {
-      if (!savedate.documentItle) {
+      if (!savedate.documentTitle) {
         return message.warning('规章制度标题不能为空')
       }
     } else {
-      if (!savedate.documentItle) {
+      if (!savedate.documentTitle) {
         return message.warning('通知标题不能为空')
       } else if (!savedate.documentContent) {
         return message.warning('通知内容不能为空')
@@ -98,6 +99,8 @@
       _this.setState({
         iconLoading: false,
       });
+      message.success("提交成功！");
+      this.props.history.goBack()
     });
     // Fetch.savePatrolCom(savedate)
     //   .then(res => {
@@ -111,13 +114,23 @@
   }
 
   cancle = () => {
-    this.props.history.push("/index/workbench");
+    // this.props.history.push("/index/workbench");
+    const { id } = this.props.match.params;
+    if (id) {
+      this.props.history.goBack()
+    } else {
+      this.props.history.push("/index/workbench");
+    }
+    // console.log(this.props)
   }
 
   render() {
     const { savedate, fileList, loading, disabled } = this.state;
     const props = {
       action: BASE_URL + `api/attachment/materials?associateId=${savedate.documentType == 'DT00002' ? 1001 : 1002}&entityId=` + savedate.id,
+      header: {
+        Authorization: window.localStorage.getItem('token')
+      },
       onChange: ({ file, fileList }) => {
         if (file.status !== 'uploading') {
           console.log(file);
@@ -157,7 +170,7 @@
             <Row gutter={16}>
               <Col className="gutter-row" >
                 文档类型：
-            </Col>
+              </Col>
             </Row>
             <Row gutter={16}>
               <Col className="gutter-row" style={{ margin: '12px 0' }} >
@@ -176,7 +189,7 @@
               <Row gutter={16} style={{ marginTop: '12px' }}>
                 <Col className="gutter-row" style={{ marginTop: '12px' }}>
                   通知标题：
-                </Col>
+                                </Col>
               </Row>
             }
             {
@@ -184,12 +197,12 @@
               <Row gutter={16} style={{ marginTop: '12px' }}>
                 <Col className="gutter-row" style={{ marginTop: '12px' }}>
                   规章制度标题：
-                </Col>
+                                </Col>
               </Row>
             }
             <Row gutter={16}>
               <Col className="gutter-row" style={{ margin: '12px 0' }} >
-                <Input disabled={disabled} style={{ width: '300px' }} name='documentItle' onChange={this.saveInputChange} value={savedate.documentItle || ""} />
+                <Input disabled={disabled} style={{ width: '300px' }} name='documentTitle' onChange={this.saveInputChange} value={savedate.documentTitle || ""} />
               </Col>
             </Row>
 
@@ -198,7 +211,7 @@
               <Row gutter={16}>
                 <Col className="gutter-row" >
                   通知内容：
-            </Col>
+                                </Col>
               </Row>
             }
             {
@@ -220,8 +233,8 @@
             {savedate.documentType == 'DT00001' &&
               <Row gutter={16} >
                 <Col className="gutter-row" >
-                  <Upload disabled={disabled} {...props}>
-                    <Button>
+                  <Upload {...props}>
+                    <Button disabled={disabled}>
                       <Icon type="upload" />上传文件</Button>
                   </Upload>
                 </Col>
@@ -250,9 +263,9 @@
                 </Col>
               </Row>
             }
-            <Row gutter={16} style={{ marginTop: '12px' }}>
-              <Col span={2} className="gutter-row" ><Button disabled={disabled} style={{ marginRight: '15px', width: '100px' }} type="primary" loading={this.state.iconLoading} onClick={this.submit}>发布</Button></Col>
-              <Col span={2} className="gutter-row" ><Button style={{ marginLeft: '15px', width: '100px' }} onClick={this.cancle}>返回</Button></Col>
+            <Row type="flex" gutter={20} style={{ marginTop: '12px' }}>
+              <Col className="gutter-row" ><Button onClick={this.cancle}>返回</Button></Col>
+              <Col className="gutter-row" ><Button disabled={disabled} type="primary" loading={this.state.iconLoading} onClick={this.submit}>发布</Button></Col>
             </Row>
           </Card>
         </Spin>

--
Gitblit v1.8.0