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

Merge branch 'release/2.9.42311.01' into release/2.9.42311.01-个税

This commit is contained in:
黎永顺 2023-11-10 13:35:41 +08:00
parent c194711c78 7908f925ea
commit 3ec45fc1ba
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pc4mobx/hrmSalary/pages/reportView/index.js
View File

@ -10,9 +10,10 @@ import { WeaLeftRightLayout, WeaLocaleProvider, WeaSelect, WeaTop } from "ecCom"
import { message, Modal } from "antd"; import { message, Modal } from "antd";
import LeftTab from "./components/leftTab"; import LeftTab from "./components/leftTab";
import ReportContent from "./components/reportContent"; import ReportContent from "./components/reportContent";
import StatisticalMicroSettingsSlide from "./components/statisticalMicroSettingsSlide"; import StatisticalMicroSettingsSlide, { getSalaryMonthValue } from "./components/statisticalMicroSettingsSlide";
import TopBtns from "./components/topBtns";
import { reportGetForm, reportStatisticsReportSave } from "../../apis/ruleconfig"; import { reportGetForm, reportStatisticsReportSave } from "../../apis/ruleconfig";
import { convertToUrlString } from "../../util/url";
import TopBtns from "./components/topBtns";
import "./index.less"; import "./index.less";
@ -92,8 +93,13 @@ class Index extends Component {
*/ */
exportData = () => { exportData = () => {
const { report } = this.state; const { report } = this.state;
const { id, dimensionId, isShare } = report; const { id, dimensionId, isShare, timeType, salaryEndMonth: end, salaryStartMonth: start } = report;
window.open(`${window.location.origin}/api/bs/hrmsalary/report/statistics/report/exportData?id=${id}&dimensionId=${dimensionId}&isShare=${isShare}`, "_blank"); const [salaryStartMonth, salaryEndMonth] = getSalaryMonthValue(timeType);
const payload = {
id, dimensionId, isShare,
salaryStartMonth: (salaryStartMonth || start) + "-01", salaryEndMonth: (salaryEndMonth || end) + "-01"
};
window.open(`${window.location.origin}/api/bs/hrmsalary/report/statistics/report/exportData?${convertToUrlString(payload)}`, "_blank");
}; };
render() { render() {