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

Merge branch 'release-2023-06-08' into hotfix/V2-20230605

This commit is contained in:
黎永顺 2023-06-20 11:43:25 +08:00
parent 403a44a49a fca33c32c1
commit d3bba3eab4
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pc4mobx/hrmSalary/pages/mobilePayroll/index.js
View File

@ -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;

3
pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
View File

@ -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)

2
pc4mobx/hrmSalary/stores/taxAgent.js
View File

@ -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();