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

release/2.10.1.2401.01 

薪资档案-非系统人员调薪修改
This commit is contained in:
黎永顺 2024-01-25 16:11:00 +08:00
parent e86e4871d8
commit 4242856f0e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js
View File

@ -152,7 +152,7 @@ class Index extends Component {
}}>{getLabel(543310, "发起调薪")}</Button>
}
{
runStatuses === "fixed" && showOperateBtn &&
(runStatuses === "fixed" || runStatuses === "ext") && showOperateBtn &&
<Button type="ghost" onClick={() => {
this.setState({
adjLogRecordDialog: {

2
pc4mobx/hrmSalary/pages/salaryFile/salaryItemChangeList.js
View File

@ -83,7 +83,7 @@ export default class SalaryItemChangeList extends React.Component {
}
return { ...o, width, render: text => (<span title={text}>{text}</span>) };
});
if (showOperateBtn && selectedKey === "fixed") {
if (showOperateBtn && (selectedKey === "fixed" || selectedKey === "ext")) {
columns = [...columns, {
dataIndex: "operate", fixed: "right", width: 120, title: "操作",
render: (text, record) => {