From 55bdfa2c457e35473b802ed28301a6e0dfc6775d 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:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84=E5=8D=95?=
=?UTF-8?q?=E5=8F=91=E6=94=BE=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E7=9A=84?=
=?UTF-8?q?=E8=AF=A6=E7=BB=86=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/payroll/SalarySendList.js | 4 ++--
pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js b/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js
index 79752acc..2b98919b 100644
--- a/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js
+++ b/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js
@@ -92,7 +92,7 @@ export default class SalarySendList extends React.Component {
title: "操作",
key: "operate",
render: (text, record) => {
- const { sendNum, sendTotal, salaryAcctType, haveBackCalc } = record;
+ const { sendNum, sendTotal, salaryAcctType, haveBackCalc, canSeeDetail } = record;
//显示发放
const showGrant = haveBackCalc === 1 && salaryAcctType === 0;
return (
@@ -100,7 +100,7 @@ export default class SalarySendList extends React.Component {
this.handleGrant(record)}
style={{ marginRight: 10 }}>发放
{
- !showGrant &&
+ canSeeDetail &&
this.handleShowDetail(record)}
style={{ marginRight: 10 }}>查看详情
}
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index aae01241..0be427d5 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -310,7 +310,7 @@ export default class PayrollGrant extends React.Component {
dataIndex: "",
display: true,
render: (text, record) => {
- if (record.sendStatus === "1" && !notShowGrantOrWithdraw) {
+ if (record.sendStatus === "1" && salarySendDetailBaseInfo.canSend) {
return (
);
- } else if (!notShowGrantOrWithdraw) {
+ } else if (salarySendDetailBaseInfo.canSend) {
return (
];
- if (selectedKey === "0" && !notShowGrantOrWithdraw) {
+ if (selectedKey === "0" && salarySendDetailBaseInfo.canSend) {
btnDom = [
,
...btnDom
];
- } else if (selectedKey === "1" && !notShowGrantOrWithdraw) {
+ } else if (selectedKey === "1" && salarySendDetailBaseInfo.canSend) {
btnDom = [