qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.9.9.2312.01'

This commit is contained in:
黎永顺 2023-12-12 17:18:30 +08:00
parent a0771be0b9 4acefa765c
commit be8aceedaa
4 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pc4mobx/hrmSalary/components/importDialog/index.js
View File

@ -19,7 +19,7 @@ class Index extends Component {
constructor(props) {
super(props);
this.state = {
current: 0
current: 0, fileid: ""
};
}
@ -29,7 +29,10 @@ class Index extends Component {
current: this.state.current + 1
});
}
if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({ current: 0 });
if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
current: 0,
fileid: ""
}, () => this.props.onResetImportResult());
}
renderChildren = () => {
@ -76,25 +79,36 @@ class Index extends Component {
* Date: 2023/8/11
*/
handleNext = () => {
const { params, importResult } = this.props;
const { params, importResult, excludeKey } = this.props;
const { current } = this.state;
if (_.isEmpty(importResult)) {
const { fileList } = this.step1Ref.state;
if (!_.isEmpty(params)) {
if (!Object.values(params).every(o => !!o)) {
Modal.warning({
title: getLabel(131329, "信息确认"),
content: getLabel(518702, "必要信息不完整，红色*为必填项！")
});
if (current === 0) {
const { fileList } = this.step1Ref.state;
if (!_.isEmpty(params)) {
if (!Object.values(params).every(o => !!o)) {
Modal.warning({
title: getLabel(131329, "信息确认"),
content: getLabel(518702, "必要信息不完整，红色*为必填项！")
});
return;
}
}
if (_.isEmpty(fileList)) {
message.warning(getLabel(111, "请先上传EXCEL文件"));
return;
}
const [file] = fileList;
const { response } = file;
this.setState({
current: this.state.current + 1,
fileid: response.data.fileid
}, () => {
!excludeKey && this.props.nextCallback && this.props.nextCallback(this.state.fileid);
excludeKey && this.props.nextUplaodCallback && this.props.nextUplaodCallback(this.state.fileid);
});
} else {
this.props.nextUplaodCallback && this.props.nextUplaodCallback(this.state.fileid);
}
if (_.isEmpty(fileList)) {
message.warning(getLabel(111, "请先上传EXCEL文件"));
return;
}
const [file] = fileList;
const { response } = file;
this.props.nextCallback(response.data.fileid);
} else {
this.setState({ current: this.state.current + 1 });
}

3
pc4mobx/hrmSalary/pages/calculate/calcOc/components/salaryCalcOcImport.js
View File

@ -62,7 +62,8 @@ class SalaryCalcOcImport extends Component {
onResetImportResult={() => this.setState(({
importDialog: { ...importDialog, importResult: {}, imageId: "" }
}))}
nextCallback={imageId => this.handleImport({ imageId })}
nextCallback={imageId => this.setState({ importDialog: { ...importDialog, imageId } })}
nextUplaodCallback={imageId => this.handleImport({ imageId })}
/>
);
}

3
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
View File

@ -141,7 +141,8 @@ class Index extends Component {
}}
/>
}
nextCallback={imageId => this.handleImport({ imageId })}
nextCallback={imageId => this.setState({ importDialog: { ...importDialog, imageId } })}
nextUplaodCallback={imageId => this.handleImport({ imageId })}
/>
<AddHeaderFieldsModal
{...headerFieldsDialog}

3
pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
View File

@ -971,7 +971,8 @@ export default class Archives extends React.Component {
}}
/>
}
nextCallback={imageId => this.handleImport({ imageId })}
nextCallback={imageId => this.setState({ importDialog: { ...importDialog, imageId } })}
nextUplaodCallback={imageId => this.handleImport({ imageId })}
/>
{
this.state.importVisible && <ImportModal