From 783fba8034fdde6651bc6932852a04072813fd67 Mon Sep 17 00:00:00 2001 From: liuwh <hugeinfo123> Date: Mon, 06 Apr 2020 19:06:41 +0800 Subject: [PATCH] 2 --- src/components/page/DocumentEditPage/index.jsx | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/components/page/DocumentEditPage/index.jsx b/src/components/page/DocumentEditPage/index.jsx index 051c78e..d650694 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('通知内容不能为空') @@ -111,7 +112,14 @@ } 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() { @@ -189,7 +197,7 @@ } <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> @@ -220,8 +228,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> -- Gitblit v1.8.0