diff --git a/pc4mobx/hrmSalary/apis/ledger.js b/pc4mobx/hrmSalary/apis/ledger.js index 22231913..fc2e5f43 100644 --- a/pc4mobx/hrmSalary/apis/ledger.js +++ b/pc4mobx/hrmSalary/apis/ledger.js @@ -172,7 +172,7 @@ export const getLedgerItemGroupForm = params => { //保存薪资帐套薪资项目 export const saveLedgerItem = params => { - const { itemGroups, items, ...extra } = params; + const { itemGroups, items, ...extra } = params; const payload = { itemGroups: _.map(itemGroups, item => { return { @@ -330,9 +330,13 @@ export const getAggregate = params => { export const getBackitemForm = params => { return WeaTools.callApi("/api/bs/hrmsalary/salarysob/backitem/getForm", "GET", params); }; -//查询个税映射规则 -export const getMappingFields = params => { - return WeaTools.callApi("/api/bs/hrmsalary/salarysob/tax/getMappingFields", "GET", params); +//薪资账套下的个税申报表规则的详情 +export const taxreportruleGetForm = params => { + return WeaTools.callApi("/api/bs/hrmsalary/salarysob/taxreportrule/getForm", "GET", params); +}; +//保存薪资账套下的个税申报表规则 +export const taxreportruleSave = params => { + return postFetch("/api/bs/hrmsalary/salarysob/taxreportrule/save", params); }; //保存回算薪资项目详情 export const salarysobBackitemSave = params => { diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js index 1d828d94..e72d81db 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js @@ -5,8 +5,10 @@ * Date: 2023/2/16 */ import React, { Component } from "react"; -import { WeaSearchGroup } from "ecCom"; -import { getMappingFields } from "../../../apis/ledger"; +import { WeaLocaleProvider, WeaSearchGroup } from "ecCom"; +import { taxreportruleGetForm } from "../../../apis/ledger"; + +const { getLabel } = WeaLocaleProvider; class IncomeTaxFields extends Component { constructor(props) { @@ -15,13 +17,12 @@ class IncomeTaxFields extends Component { } componentDidMount() { - this.getMappingFields(); + this.taxreportruleGetForm(); } - getMappingFields = () => { - const { editId: salarySobId } = this.props; - const payload = { salarySobId }; - getMappingFields(payload).then(({ status, data }) => { + taxreportruleGetForm = () => { + const { editId, saveSalarySobId } = this.props; + taxreportruleGetForm({ id: saveSalarySobId || editId }).then(({ status, data }) => { if (status) { console.log(data); } @@ -30,7 +31,7 @@ class IncomeTaxFields extends Component { render() { return ( - + 个税申报字段对应} showGroup needTigger={false}> ); diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js index 60a2de02..8711b5b9 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js @@ -24,8 +24,9 @@ const tabs = [ { key: 1, title: "关联人员" }, { key: 2, title: "薪资项目" }, { key: 3, title: "回算薪资项目" }, - { key: 4, title: "个税申报字段对应" }, - { key: 5, title: "调薪计薪规则" } + { key: 4, title: "累计字段对应" }, + { key: 5, title: "个税申报字段对应" }, + { key: 6, title: "调薪计薪规则" } ]; @inject("taxAgentStore") @@ -186,9 +187,12 @@ class LedgerSlide extends Component { CurrentDom = ; break; case 4: - CurrentDom = ; + CurrentDom = null; break; case 5: + CurrentDom = ; + break; + case 6: CurrentDom = this.setState({ adjustRules })}/>; @@ -257,15 +261,33 @@ class LedgerSlide extends Component { loading={loading} onClick={() => { this.setState({ current: current + 1 }, () => { - console.log("个税申报") + console.log("累计字段对应"); }); }} >保存并进入下一步 ] : [ - + ]; break; case 5: + CurrentDom = !editId ? + [ + , + , + + ] : [ + + ]; + break; + case 6: CurrentDom = !editId ? [ , @@ -289,7 +311,7 @@ class LedgerSlide extends Component { className="slideOuterWrapper" visible={visible} top={0} - width={65} + width={100} height={100} direction="right" measure="%"