From 4b11f39155725679c2137104cef94eaa2aaa2ac6 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Wed, 16 Oct 2024 11:18:10 +0800 Subject: [PATCH] =?UTF-8?q?feature/2.15.2.2409.01=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../variableSalary/components/salaryFileList/index.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js index f924adff..6634dbd8 100644 --- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js +++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js @@ -17,6 +17,7 @@ import { getSearchs } from "../../../../util"; import { extraConditions } from "../../conditions"; import AdvanceInputBtn from "../advanceInputBtn"; import SearchPannel from "../searchPannel"; +import { postFetch } from "../../../../util/request"; import { toJS } from "mobx"; import cs from "classnames"; @@ -36,7 +37,7 @@ class Index extends Component { } async componentDidMount() { - const { data: taxAgentOption } = await API.getAdminTaxAgentList(); + const { data: taxAgentOption } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" }); this.setState({ condtions: _.map(extraConditions, item => { return { @@ -44,7 +45,7 @@ class Index extends Component { if (getKey(child) === "taxAgentIds") { return { ...child, label: getLabel(child.lanId, child.label), - options: _.map(taxAgentOption, o => ({ key: o.id, showname: o.content })) + options: _.map(taxAgentOption, o => ({ key: String(o.id), showname: o.name })) }; } return { ...child, label: getLabel(child.lanId, child.label) }; @@ -100,7 +101,8 @@ class Index extends Component { getVariableSalaryList = () => { const { baseTableStore: { VSalryForm, VExtraSalryForm, getVariableSalaryList } } = this.props; const { pageInfo } = this.state; - const { taxAgentIds } = VExtraSalryForm.getFormParams(), { departmentIds } = VSalryForm.getFormParams();this.setState({ loading: true }); + const { taxAgentIds } = VExtraSalryForm.getFormParams(), { departmentIds } = VSalryForm.getFormParams(); + this.setState({ loading: true }); getVariableSalaryList({ ...pageInfo, ...VSalryForm.getFormParams(), ...VExtraSalryForm.getFormParams(), departmentIds: !_.isEmpty(departmentIds) ? departmentIds.split(",") : [],