From 57da206fcb3532e3ba6a9f973f1fa1e00f1cd0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 2 Mar 2023 19:13:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9Fbug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index 68dad7a7..a90c108b 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -216,7 +216,7 @@ export default class PayrollGrant extends React.Component {
 
   getColumns = () => {
     const { payrollStore } = this.props;
-    const { salaryGrantTableStore: columns,salarySendDetailBaseInfo } = payrollStore;
+    const { salaryGrantTableStore: columns, salarySendDetailBaseInfo } = payrollStore;
     const notShowGrantOrWithdraw = salarySendDetailBaseInfo.haveBackCalc === 1 && salarySendDetailBaseInfo.salaryAcctType === "0";
     return [
       ...toJS(columns),
@@ -234,7 +234,7 @@ export default class PayrollGrant extends React.Component {
                 撤回
               </a>
             );
-          } else if(!notShowGrantOrWithdraw) {
+          } else if (!notShowGrantOrWithdraw) {
             return (
               <a
                 href="javascript:void(0);"
@@ -289,7 +289,7 @@ export default class PayrollGrant extends React.Component {
         />,
         ...btnDom
       ];
-    } else if(selectedKey === "1" && !notShowGrantOrWithdraw) {
+    } else if (selectedKey === "1" && !notShowGrantOrWithdraw) {
       btnDom = [
         <ButtonSelect
           datas={[
@@ -453,10 +453,7 @@ export default class PayrollGrant extends React.Component {
         <div className="titleBar">
           <div className="titleBarLeft">
             <span>
-              薪资所属月：{salarySendDetailBaseInfo.salaryMonth &&
-              salarySendDetailBaseInfo.salaryMonth
-                .year}-{salarySendDetailBaseInfo.salaryMonth &&
-              salarySendDetailBaseInfo.salaryMonth.monthValue}
+              薪资所属月：{salarySendDetailBaseInfo.salaryMonth}
             </span>
             <WeaHelpfulTip
               style={{ marginLeft: "1rem", marginRight: "1rem" }}