diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js index 1978860a..93a3d919 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js @@ -37,7 +37,7 @@ export default class MobilePayroll extends React.Component { initMobile = () => { const { mySalaryStore: { setInitEmVerify } } = this.props; - if (window.em) { + // if (window.em) { API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }).then(({ status, isNeedSecondAuth }) => { if (status && isNeedSecondAuth) { this.setState({ visible: true }); @@ -45,9 +45,9 @@ export default class MobilePayroll extends React.Component { setInitEmVerify(); } }); - } else { - setInitEmVerify(); - } + // } else { + // setInitEmVerify(); + // } }; doSecondAuth = () => { const { mySalaryStore: { setInitEmVerify } } = this.props; diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js index 607d2d42..ed72829a 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js @@ -33,7 +33,8 @@ export default class PhoneTemplate extends React.Component { } componentDidMount() { - if (this.props.isMsgPreview && this.props.salaryItemSet && window.em) { + // && window.em + if (this.props.isMsgPreview && this.props.salaryItemSet) { this.setState({ salaryItemSet: JSON.parse(this.props.salaryItemSet), salaryTemplateShowSet: JSON.parse(this.props.salaryTemplateShowSet) diff --git a/pc4mobx/hrmSalary/stores/taxAgent.js b/pc4mobx/hrmSalary/stores/taxAgent.js index d197db2e..38fa966d 100644 --- a/pc4mobx/hrmSalary/stores/taxAgent.js +++ b/pc4mobx/hrmSalary/stores/taxAgent.js @@ -147,7 +147,7 @@ export class TaxAgentStore { this.setSalaryItemBtn((isOpenDevolution && (isChief || isAdminEnable))); //薪酬统计报表权限 this.setStatisticsReportBtn(!isOpenDevolution ? true : !!(isAdminEnable || isChief)); - this.setPayrollPermission(isAdminEnable && isOpenDevolution); + this.setPayrollPermission(isAdminEnable && isOpenDevolution || !isOpenDevolution); resolve({ status, data }); } else { reject();