From 9476ffb62a8b377d16c5919b56d8f0b78e03bdce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 29 Apr 2024 16:44:46 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.12.1.2404.02-=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E8=B4=A6=E5=A5=97=E9=85=8D=E7=BD=AE=E6=B5=81=E7=A8=8B=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/salaryCalcPersonConfirm/index.js | 15 +++++++++------
pc4mobx/hrmSalary/pages/calculate/doCalc/index.js | 12 +++++++-----
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js
index 68b7245f..7e1bece3 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryCalcPersonConfirm/index.js
@@ -78,6 +78,7 @@ class Index extends Component {
renderTabBtns = () => {
const { selectedKey, selectedRowKeys } = this.state;
+ const { calcDetail } = this.props;
let tabBtns = [];
switch (selectedKey) {
case "range":
@@ -92,6 +93,7 @@ class Index extends Component {
,
];
+ calcDetail && tabBtns.splice(0, 2);
break;
case "add":
case "sub":
@@ -182,7 +184,7 @@ class Index extends Component {
};
render() {
- const { calculateStore: { PCSearchForm } } = this.props;
+ const { calculateStore: { PCSearchForm }, calcDetail } = this.props;
const {
selectedKey, showSearchAd, searchConditions, pageInfo, loading, selectedRowKeys,
columns, dataSource
@@ -252,8 +254,8 @@ class Index extends Component {
onAdReset={() => PCSearchForm.resetForm()} autoCalculateWidth
/>
{
let width = "";
const { dataIndex } = item;
@@ -272,9 +274,10 @@ class Index extends Component {
dataIndex: "operate",
title: getLabel(30585, "操作"),
width: 120,
- render: (_, record) => (
- this.handleDeletePCitem([record.id])}>{getLabel(535052, "删除")}
+ render: (_, record) => (
+ {calcDetail ? null : this.handleDeletePCitem([record.id])}>{getLabel(535052, "删除")}}
+
)
}
]}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index c1a24fa8..1455b6a8 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -144,7 +144,7 @@ class Index extends Component {
renderReqBtns = () => {
const { routeParams: { salaryAcctRecordId } } = this.props;
const { selectedKey, accountExceptInfo, approvalInfo } = this.state;
- const { isOpenApproval, approvalWorkflowUrl } = approvalInfo;
+ const { isOpenApproval, approvalWorkflowUrl, canEdit } = approvalInfo;
let reqBtns = [];
switch (selectedKey) {
case "calc":
@@ -155,7 +155,7 @@ class Index extends Component {
);
const moreMenu = (