feature/2.15.2.2409.01合并业务线测试

This commit is contained in:
lys 2024-10-16 11:18:10 +08:00
parent 73de6b8417
commit 4b11f39155
1 changed files with 5 additions and 3 deletions

View File

@ -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(",") : [],