qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线

This commit is contained in:
lys 2025-04-23 17:41:18 +08:00
parent cafe21b3fe 9a50947d8a
commit 4ca0a4b756
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js
View File

@ -17,7 +17,7 @@ class Index extends Component {
return ( return (
<div className="salary-btn-flex"> <div className="salary-btn-flex">
<div className="mounth-range"> <div className="mounth-range">
<span className="label">{getLabel(543549, "薪资所属月：")}</span> <span className="label">{getLabel(111, "税款所属期：")}</span>
<MonthRangePicker dateRange={dateRange} viewAttr={2} <MonthRangePicker dateRange={dateRange} viewAttr={2}
onChange={v => this.props.onChange({ dateRange: v })}/> onChange={v => this.props.onChange({ dateRange: v })}/>
</div> </div>

15
pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
View File

@ -8,7 +8,7 @@ import React, { Component } from "react";
import { WeaLocaleProvider, WeaTable } from "ecCom"; import { WeaLocaleProvider, WeaTable } from "ecCom";
import { Dropdown, Menu, message, Modal } from "antd"; import { Dropdown, Menu, message, Modal } from "antd";
import { getDeclareList, withDrawTaxDeclaration } from "../../../../apis/declare"; import { getDeclareList, withDrawTaxDeclaration } from "../../../../apis/declare";
import { sysConfCodeRule } from "../../../../apis/ruleconfig"; import { sysConfCodeRule, sysinfo } from "../../../../apis/ruleconfig";
const getLabel = WeaLocaleProvider.getLabel; const getLabel = WeaLocaleProvider.getLabel;
@ -35,18 +35,19 @@ class Index extends Component {
if (status && data === "1") this.setState({ showWithDrawBtn: data === "1" }); if (status && data === "1") this.setState({ showWithDrawBtn: data === "1" });
}); });
}; };
getDeclareList = (props) => { getDeclareList = async (props) => {
const { pageInfo } = this.state; const { data: sysData } = await sysinfo();
const { queryParams } = props; const { pageInfo } = this.state, { queryParams } = props;
const { dateRange, ...extra } = queryParams; const { dateRange, ...extra } = queryParams;
const [fromSalaryMonthStr, endSalaryMonthStr] = dateRange || []; const [fromSalaryMonth, endSalaryMonth] = dateRange || [];
const params = { fromSalaryMonthStr, endSalaryMonthStr, ...extra }; const params = { fromSalaryMonth: fromSalaryMonth + "-01", endSalaryMonth: endSalaryMonth + "-01", ...extra };
const payload = { ...pageInfo, ...params }; const payload = { ...pageInfo, ...params };
this.setState({ loading: true }); this.setState({ loading: true });
getDeclareList(payload).then(({ status, data }) => { getDeclareList(payload).then(({ status, data }) => {
this.setState({ loading: false }); this.setState({ loading: false });
if (status) { if (status) {
const { columns, list: dataSource, pageNum, pageSize, total } = data; let { columns, list: dataSource, pageNum, pageSize, total } = data;
sysData["TAX_DECLARATION_DATE_TYPE"] === "1" && (columns = _.filter(columns, o => o.dataIndex !== "salaryMonth"));
this.setState({ this.setState({
dataSource, pageInfo: { ...pageInfo, pageNum, pageSize, total }, dataSource, pageInfo: { ...pageInfo, pageNum, pageSize, total },
columns: _.map(columns, o => { columns: _.map(columns, o => {