薪资账套的编辑bug修复,以及薪资档案模块上传下载模板添加个参数

This commit is contained in:
liyongshun 2022-06-09 18:34:24 +08:00
parent 47af2543b0
commit 8dcf736db6
4 changed files with 23 additions and 10 deletions

View File

@ -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 {
</div>
<div style={{ lineHeight: "30px" }}>
<p>1. 第一步请选择导出的Excel文件或
<p>1. 第一步请选择导出的Excel文件或
{
(typeof this.props.templateLink) == "string" ?
<a href={this.props.templateLink}>点击这里下载模板</a>
<a href={`${this.props.templateLink}&hasData=${hasData === '1' ? true : false}`}>点击这里下载模板</a>
:
<a onClick={() => {this.props.templateLink()}}>点击这里下载模板</a>
}
{this.props.headerSetCompoent && this.props.headerSetCompoent }
{this.props.headerSetCompoent && this.props.headerSetCompoent };
<WeaCheckbox
value={hasData}
content="导出现有数据"
helpfulTip="提示:建议先导出现有最新数据,修改后再导入"
style={{ marginLeft: 10 }}
onChange={(hasData)=> this.setState({hasData})}
/>
</p>
<p>2. 第二步请一定要确定Excel文档中的格式是模板中的格式没有被修改掉</p>
<p>3. 第三步选择填写好的Excel文档点击下一步按钮进行数据预览</p>

View File

@ -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 <div className="slideTitleWrapper">

View File

@ -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={
<SlideModalTitle
subtitle={"编辑账套"}
subtitle={`编辑账套${canEdit}`}
tabs={[
{ title: "基础设置", key: 0 },
{ title: "关联人员", key: 1 },

View File

@ -2,7 +2,7 @@
* Author: 黎永顺
* Description: 表单渲染condition
* Date: 2022-05-30 22:39:03
* LastEditTime: 2022-05-31 20:34:07
* LastEditTime: 2022-06-09 14:00:30
*/
export const editConditions = [
{