diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js index aa2c832e..b7785f38 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js @@ -298,14 +298,14 @@ class Index extends Component { items: _.map(it.items, o => ({ ...o, label: getLabel(o.lanId, o.label), extraDom: !_.isEmpty(editId) && - this.setState({ taxSetDialog: { visible: true, dataType: o.dataType, id: editId.id, label: getLabel(o.lanId, o.label) } })}> - + })) }; diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js index 3680b10a..97fbb38c 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/taxSetDialog.js @@ -104,7 +104,7 @@ class TaxSetDialog extends Component { selectedRowKeys, onChange: (selectedRowKeys) => this.setState({ selectedRowKeys }) }; return ( this.taxSetRef = dom} - title={`${getLabel(111, "数据采集明细")}(${this.props.label})`} + title={`${getLabel(111, "附表明细")}(${this.props.label})`} style={{ width: "60vw", height: 600, minHeight: 200, minWidth: 380, maxHeight: "90%", maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)" diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclareDetailImportDialog.js b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclareDetailImportDialog.js index bbda7660..6553f6e4 100644 --- a/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclareDetailImportDialog.js +++ b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclareDetailImportDialog.js @@ -5,7 +5,7 @@ * Date: 2023/12/28 */ import React, { Component } from "react"; -import { WeaLocaleProvider } from "ecCom"; +import { WeaCheckbox, WeaLocaleProvider } from "ecCom"; import { message } from "antd"; import ImportDialog from "../../../components/importDialog"; import * as API from "../../../apis/declare"; @@ -17,7 +17,7 @@ class TaxDeclareDetailImportDialog extends Component { super(props); this.state = { importDialog: { - visible: false, title: "", nextloading: false, + visible: false, title: "", nextloading: false, hasData: "0", link: null, importResult: {}, imageId: "", taxDeclarationId: "", previewUrl: "/api/bs/hrmsalary/taxdeclaration/preview", extraPreview: { taxDeclarationId: "" } @@ -49,16 +49,16 @@ class TaxDeclareDetailImportDialog extends Component { }).catch(() => this.setState({ importDialog: { ...importDialog, nextloading: false } })); }; handleExportTemp = () => { - const { importDialog: { taxDeclarationId } } = this.state; + const { importDialog: { taxDeclarationId, hasData } } = this.state; message.destroy(); message.loading(getLabel(111, "下载中"), 0); - const promise = API.taxdeclarationExportTemplate({ taxDeclarationId }); + const promise = API.taxdeclarationExportTemplate({ taxDeclarationId, hasData: hasData === "1" }); message.destroy(); }; handleCancel = () => { this.setState({ importDialog: { - visible: false, title: "", nextloading: false, + visible: false, title: "", nextloading: false, hasData: "0", link: null, importResult: {}, imageId: "", taxDeclarationId: "", previewUrl: "/api/bs/hrmsalary/taxdeclaration/preview" } @@ -71,10 +71,17 @@ class TaxDeclareDetailImportDialog extends Component { this.setState(({ - importDialog: { ...importDialog, importResult: {}, imageId: "" } + importDialog: { ...importDialog, importResult: {}, imageId: "", hasData: "0" } }))} nextCallback={imageId => this.setState({ importDialog: { ...importDialog, imageId } })} nextUplaodCallback={imageId => this.handleImport({ imageId })} + exportDataDom={ + this.setState({ importDialog: { ...importDialog, hasData: val } })} + /> + } /> ); }