From 19e2958a561df8bc91b384f54dc6edff17964494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 13 Jun 2023 09:18:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/stores/taxAgent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From fca33c32c1684d6701999fdc0c7ec6ae51a449f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 16 Jun 2023 17:23:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E5=8D=95=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=9F=A5=E7=9C=8B=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=8C=E6=AC=A1=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/mobilePayroll/index.js            | 8 ++++----
 .../pages/payroll/templatePreview/phoneTemplate/index.js  | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

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)