diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
index ba166f77..f3b0e52a 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
@@ -8,6 +8,7 @@
* @description:
*/
import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
import { WeaLocaleProvider } from "ecCom";
import { WeaTableNew } from "comsMobx";
import { message, Modal, Spin } from "antd";
@@ -17,6 +18,8 @@ import { toJS } from "mobx";
const WeaTableComx = WeaTableNew.WeaTable;
const getLabel = WeaLocaleProvider.getLabel;
+@inject("baseTableStore")
+@observer
class Index extends Component {
constructor(props) {
super(props);
@@ -149,12 +152,8 @@ class Index extends Component {
/>
-
+
);
}
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/index.js b/pc4mobx/hrmSalary/pages/variableSalary/index.js
index ad97078c..eb784c1e 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/index.js
@@ -74,6 +74,11 @@ class Index extends Component {
const payload = { salaryMonth, taxAgentIds, ...VSalryForm.getFormParams() };
window.open(`/api/bs/hrmsalary/variableSalary/export?${convertToUrlString(payload)}`, "_blank");
break;
+ case "custom_cols":
+ const { baseTableStore: { SFTableStore } } = this.props;
+ SFTableStore.setColSetVisible(true);
+ SFTableStore.tableColSet(true);
+ break;
default:
break;
}
@@ -86,10 +91,13 @@ class Index extends Component {
const { taxAgentStore: { showOperateBtn }, baseTableStore: { VSSalaryItemForm } } = this.props;
const tabs = [
{
- title: getLabel(111, "薪资档案"), key: "salaryFile", showDropIcon: showOperateBtn,
- dropMenuDatas: showOperateBtn ? [{
- key: "export", icon: , content: getLabel(111, "导出")
- }] : [],
+ title: getLabel(111, "薪资档案"), key: "salaryFile", showDropIcon: true,
+ dropMenuDatas: showOperateBtn ? [
+ { key: "export", icon: , content: getLabel(111, "导出") },
+ { key: "custom_cols", icon: , content: getLabel(32535, "显示列定制") }
+ ] : [
+ { key: "custom_cols", icon: , content: getLabel(32535, "显示列定制") }
+ ],
buttons: showOperateBtn ? [
,
,
@@ -100,7 +108,8 @@ class Index extends Component {
this.openAdvanceSearch()}
onAdvanceSearch={this.handleAdvanceSearch}/>
] : [
- this.setState({ salaryMonth: val })}/>,
+ this.setState({ salaryMonth: val }, () => this.handleAdvanceSearch())}/>,
this.setState({ taxAgentIds: val }, () => this.handleAdvanceSearch())}/>,
this.openAdvanceSearch()}