diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js index 210df203..bceb4585 100644 --- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js +++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js @@ -105,7 +105,7 @@ class Index extends Component { }; return ( + pagination={pagination} scroll={{ y: `calc(100vh - 170px)` }}/> ); } } diff --git a/pc4mobx/hrmSalary/pages/variableSalary/index.js b/pc4mobx/hrmSalary/pages/variableSalary/index.js index 115aa93e..76e364e4 100644 --- a/pc4mobx/hrmSalary/pages/variableSalary/index.js +++ b/pc4mobx/hrmSalary/pages/variableSalary/index.js @@ -97,7 +97,7 @@ class Index extends Component { const { taxAgentStore: { showOperateBtn }, baseTableStore: { VSSalaryItemForm } } = this.props; const tabs = [ { - title: getLabel(111, "薪资档案"), key: "salaryFile", showDropIcon: true, + title: getLabel(111, "浮动数据"), key: "salaryFile", showDropIcon: true, dropMenuDatas: showOperateBtn ? [ { key: "export", icon: , content: getLabel(111, "导出") }, { key: "custom_cols", icon: , content: getLabel(32535, "显示列定制") } @@ -125,7 +125,7 @@ class Index extends Component { onViewSalaryFile={(data) => this.handleOperate("create", data)}/> }, { - title: getLabel(111, "薪资项目"), key: "salaryItem", showDropIcon: false, dropMenuDatas: [], + title: getLabel(111, "字段管理"), key: "salaryItem", showDropIcon: false, dropMenuDatas: [], buttons: showOperateBtn ? [