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 = [