diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js index 481813b4..df9575ef 100644 --- a/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js +++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep3.js @@ -31,7 +31,7 @@ class ImpStep3 extends Component { } { - !_.isEmpty(importResult.errorData) && + (!_.isEmpty(importResult.errorNotice) || !_.isEmpty(importResult.errorData)) && } diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js index 1eb1a76d..2cc7f785 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js @@ -152,7 +152,7 @@ class Index extends Component { }}>{getLabel(543310, "发起调薪")} } { - runStatuses === "fixed" && showOperateBtn && + (runStatuses === "fixed" || runStatuses === "ext") && showOperateBtn &&