diff --git a/pc4mobx/hrmSalary/components/importModal/modalStep1.js b/pc4mobx/hrmSalary/components/importModal/modalStep1.js index 47652105..c00fd1cd 100644 --- a/pc4mobx/hrmSalary/components/importModal/modalStep1.js +++ b/pc4mobx/hrmSalary/components/importModal/modalStep1.js @@ -1,5 +1,5 @@ import React from 'react' -import { WeaSteps, WeaDatePicker, WeaInput, WeaSelect, message } from 'ecCom'; +import { WeaSteps, WeaDatePicker, WeaInput, WeaSelect, message, WeaCheckbox } from 'ecCom'; import { inject, observer } from 'mobx-react'; import { Upload, Icon, Row, Col, Button } from "antd"; import uploadImg from './upload.svg' @@ -13,7 +13,8 @@ export default class ModalStep1 extends React.Component { super(props) this.state = { datetime: "", - taxAgentId: "" + taxAgentId: "", + hasData: "0" } } @@ -23,7 +24,7 @@ export default class ModalStep1 extends React.Component { } render() { - const { datetime, taxAgentId } = this.state + const { datetime, taxAgentId, hasData } = this.state const { taxAgentStore: {taxAgentOption} } = this.props; const dragger = { name: 'file', @@ -80,15 +81,22 @@ export default class ModalStep1 extends React.Component {
-

1. 第一步,请选择导出的Excel文件或 +

1. 第一步,请选择导出的Excel文件或 { (typeof this.props.templateLink) == "string" ? - 点击这里下载模板 + 点击这里下载模板 : {this.props.templateLink()}}>点击这里下载模板 } - {this.props.headerSetCompoent && this.props.headerSetCompoent } + {this.props.headerSetCompoent && this.props.headerSetCompoent }; + this.setState({hasData})} + />

2. 第二步,请一定要确定Excel文档中的格式是模板中的格式,没有被修改掉;

3. 第三步,选择填写好的Excel文档,点击“下一步”按钮进行数据预览;

diff --git a/pc4mobx/hrmSalary/components/slideModalTitle/index.js b/pc4mobx/hrmSalary/components/slideModalTitle/index.js index 056df410..946b61ec 100644 --- a/pc4mobx/hrmSalary/components/slideModalTitle/index.js +++ b/pc4mobx/hrmSalary/components/slideModalTitle/index.js @@ -5,8 +5,13 @@ import "./index.less" export default class SlideModalTitle extends React.Component { componentWillMount() { // 初始化渲染页面 this.state = { - editable: this.props.editable === undefined ? "true": this.props.editable + editable: "" } + } + componentWillReceiveProps(nextProps){ + this.setState({ + editable: nextProps.editable + }) } render() { return
diff --git a/pc4mobx/hrmSalary/pages/ledger/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js index c8684100..166773a2 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.js +++ b/pc4mobx/hrmSalary/pages/ledger/index.js @@ -231,7 +231,7 @@ export default class Ledger extends React.Component { setShowSearchAd, baseInfoRequest, } = ledgerStore; - const { canEdit = "true" } = baseInfoRequest; + const { canEdit } = baseInfoRequest; const { currentStep, selectedTab } = this.state; if (!hasRight && !loading) { // 无权限处理 @@ -570,7 +570,7 @@ export default class Ledger extends React.Component { measure={"%"} title={