release/2.19.1.2501.01-个税

This commit is contained in:
lys 2025-01-06 18:07:39 +08:00
parent 23d32f627b
commit 44dde8cf51
3 changed files with 16 additions and 9 deletions

View File

@ -298,14 +298,14 @@ class Index extends Component {
items: _.map(it.items, o => ({ items: _.map(it.items, o => ({
...o, label: getLabel(o.lanId, o.label), ...o, label: getLabel(o.lanId, o.label),
extraDom: !_.isEmpty(editId) && extraDom: !_.isEmpty(editId) &&
<a href="javascript:void(0);" className="extra_tax" title={getLabel(111, "添加明细")} <a href="javascript:void(0);" className="extra_tax" title={getLabel(111, "添加附表")}
onClick={() => this.setState({ onClick={() => this.setState({
taxSetDialog: { taxSetDialog: {
visible: true, dataType: o.dataType, id: editId.id, visible: true, dataType: o.dataType, id: editId.id,
label: getLabel(o.lanId, o.label) label: getLabel(o.lanId, o.label)
} }
})}> })}>
<i className="icon-coms-mulujibenxinxi"/> <i className="icon-coms02-Preview-1"/>
</a> </a>
})) }))
}; };

View File

@ -104,7 +104,7 @@ class TaxSetDialog extends Component {
selectedRowKeys, onChange: (selectedRowKeys) => this.setState({ selectedRowKeys }) selectedRowKeys, onChange: (selectedRowKeys) => this.setState({ selectedRowKeys })
}; };
return (<WeaDialog {...this.props} initLoadCss className="sys-salary-wrapper" ref={dom => this.taxSetRef = dom} return (<WeaDialog {...this.props} initLoadCss className="sys-salary-wrapper" ref={dom => this.taxSetRef = dom}
title={`${getLabel(111, "数据采集明细")}${this.props.label}`} title={`${getLabel(111, "附表明细")}${this.props.label}`}
style={{ style={{
width: "60vw", height: 600, minHeight: 200, minWidth: 380, maxHeight: "90%", width: "60vw", height: 600, minHeight: 200, minWidth: 380, maxHeight: "90%",
maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)" maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"

View File

@ -5,7 +5,7 @@
* Date: 2023/12/28 * Date: 2023/12/28
*/ */
import React, { Component } from "react"; import React, { Component } from "react";
import { WeaLocaleProvider } from "ecCom"; import { WeaCheckbox, WeaLocaleProvider } from "ecCom";
import { message } from "antd"; import { message } from "antd";
import ImportDialog from "../../../components/importDialog"; import ImportDialog from "../../../components/importDialog";
import * as API from "../../../apis/declare"; import * as API from "../../../apis/declare";
@ -17,7 +17,7 @@ class TaxDeclareDetailImportDialog extends Component {
super(props); super(props);
this.state = { this.state = {
importDialog: { importDialog: {
visible: false, title: "", nextloading: false, visible: false, title: "", nextloading: false, hasData: "0",
link: null, importResult: {}, imageId: "", taxDeclarationId: "", link: null, importResult: {}, imageId: "", taxDeclarationId: "",
previewUrl: "/api/bs/hrmsalary/taxdeclaration/preview", previewUrl: "/api/bs/hrmsalary/taxdeclaration/preview",
extraPreview: { taxDeclarationId: "" } extraPreview: { taxDeclarationId: "" }
@ -49,16 +49,16 @@ class TaxDeclareDetailImportDialog extends Component {
}).catch(() => this.setState({ importDialog: { ...importDialog, nextloading: false } })); }).catch(() => this.setState({ importDialog: { ...importDialog, nextloading: false } }));
}; };
handleExportTemp = () => { handleExportTemp = () => {
const { importDialog: { taxDeclarationId } } = this.state; const { importDialog: { taxDeclarationId, hasData } } = this.state;
message.destroy(); message.destroy();
message.loading(getLabel(111, "下载中"), 0); message.loading(getLabel(111, "下载中"), 0);
const promise = API.taxdeclarationExportTemplate({ taxDeclarationId }); const promise = API.taxdeclarationExportTemplate({ taxDeclarationId, hasData: hasData === "1" });
message.destroy(); message.destroy();
}; };
handleCancel = () => { handleCancel = () => {
this.setState({ this.setState({
importDialog: { importDialog: {
visible: false, title: "", nextloading: false, visible: false, title: "", nextloading: false, hasData: "0",
link: null, importResult: {}, imageId: "", taxDeclarationId: "", link: null, importResult: {}, imageId: "", taxDeclarationId: "",
previewUrl: "/api/bs/hrmsalary/taxdeclaration/preview" previewUrl: "/api/bs/hrmsalary/taxdeclaration/preview"
} }
@ -71,10 +71,17 @@ class TaxDeclareDetailImportDialog extends Component {
<ImportDialog <ImportDialog
{...importDialog} onCancel={this.handleCancel} {...importDialog} onCancel={this.handleCancel}
onResetImportResult={() => this.setState(({ onResetImportResult={() => this.setState(({
importDialog: { ...importDialog, importResult: {}, imageId: "" } importDialog: { ...importDialog, importResult: {}, imageId: "", hasData: "0" }
}))} }))}
nextCallback={imageId => this.setState({ importDialog: { ...importDialog, imageId } })} nextCallback={imageId => this.setState({ importDialog: { ...importDialog, imageId } })}
nextUplaodCallback={imageId => this.handleImport({ imageId })} nextUplaodCallback={imageId => this.handleImport({ imageId })}
exportDataDom={
<WeaCheckbox
content={getLabel(543208, "导出现有数据")} value={importDialog.hasData}
helpfulTip={getLabel(111, "提示:建议先导出现有最新数据,修改后再导入")}
onChange={val => this.setState({ importDialog: { ...importDialog, hasData: val } })}
/>
}
/> />
); );
} }