diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
index 3b72e070..413740e6 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
@@ -99,6 +99,7 @@ class ReportContent extends Component {
/>
+ {/*侧边栏*/}
);
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js b/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
index 30d2b1b7..d5144ee6 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/rightOptions.js
@@ -5,8 +5,11 @@
* Date: 2023/4/21
*/
import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
import "../index.less";
+const { getLabel } = WeaLocaleProvider;
+
class RightOptions extends Component {
constructor(props) {
super(props);
@@ -22,11 +25,11 @@ class RightOptions extends Component {
this.setState({ dataSource })}
+ onDrop={datas => this.setState({
+ dataSource: _.map(datas, (it, idx) => ({ ...it, indexValue: idx.toString() }))
+ })}
pagination={false}
rowSelection={rowSelection}
/>
diff --git a/pc4mobx/hrmSalary/pages/reportView/index.js b/pc4mobx/hrmSalary/pages/reportView/index.js
index de4f9f6d..e16680a2 100644
--- a/pc4mobx/hrmSalary/pages/reportView/index.js
+++ b/pc4mobx/hrmSalary/pages/reportView/index.js
@@ -84,6 +84,17 @@ class Index extends Component {
}
});
};
+ /*
+ * Author: 黎永顺
+ * Description: 导出报表数据
+ * Params:
+ * Date: 2023/4/24
+ */
+ exportData = () => {
+ const { report } = this.state;
+ const { id, dimensionId } = report;
+ window.open(`${window.location.origin}/api/bs/hrmsalary/report/statistics/report/exportData?id=${id}&dimensionId=${dimensionId}`, "_self");
+ };
render() {
const { report, dimensionList, statisticalPayload } = this.state;
@@ -123,10 +134,12 @@ class Index extends Component {
this.setState({
statisticalPayload: { visible: true, id: report.id, dimension: report.dimensionId }
})}
/>
+
{/*统计数据范围及规则设置弹框*/}