From 8f922ce716d3b90a9c46e06643319c4b1675aead 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, 9 Jun 2023 14:53:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=90=88=E5=B9=B6=E7=B3=BB?=
=?UTF-8?q?=E7=BB=9F=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js | 3 +--
pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js | 6 +++---
.../pages/reportView/components/povitpivotChartModal.js | 2 +-
pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js | 6 +++---
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
index 55ccc872..413ec515 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
@@ -11,7 +11,6 @@ import PayrollPartTable from "./payrollPartTable";
import { getPayrollIssuanceProgressBar } from "../../../apis/payroll";
import ProgressModal from "../../../components/progressModal";
-const getLabel = WeaLocaleProvider.getLabel;
const { ButtonSelect } = WeaDropdown;
const getLabel = WeaLocaleProvider.getLabel;
@inject("payrollStore")
@@ -334,7 +333,7 @@ export default class PayrollGrant extends React.Component {
return {
...item,
render: (text, record) => {
- return {record.sendStatus === "0" ? getLabel(111, "未发放") : record.sendStatus === "1" ? getLabel(111, "已发放") : getLabel(111, "已撤回")};
+ return {record.sendStatus === "0" ? getLabel(542695, "未发放") : record.sendStatus === "1" ? getLabel(542605, "已发放") : getLabel(32412, "已撤回")};
}
};
}
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
index 69ebf94e..9f62ccec 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
@@ -154,13 +154,13 @@ export default class BaseInformForm extends React.Component {
/>
-
-
+
this.hanldeChange({ msgStatus: value === "1" })}/>
-
+
this.hanldeChange({ emailStatus: value === "1" })}/>
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
index 4af04328..47eae6e1 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
@@ -111,7 +111,7 @@ class PovitpivotChartModal extends Component {
const { payrollFilesStore: { pivotTableStore } } = this.props;
return (
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js
index ba12bf48..853f7cb3 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js
@@ -43,14 +43,14 @@ export default class SystemSalaryItemModal extends React.Component {
handleAdd = () => {
const { selectedRowKeys } = this.state;
if (_.isEmpty(selectedRowKeys)) {
- message.info(getLabel(111, "未选择任何条目"));
+ message.info(getLabel(543184, "未选择任何条目"));
return;
}
this.setState({ saveLoading: true });
saveSysItem(selectedRowKeys).then(({ status, errormsg }) => {
this.setState({ saveLoading: false });
if (status) {
- message.success(getLabel(111, "添加成功"));
+ message.success(getLabel(26712, "添加成功"));
this.setState({ selectedRowKeys: [] }, () => {
this.getSysItemList();
this.props.onCancel();
@@ -67,7 +67,7 @@ export default class SystemSalaryItemModal extends React.Component {
current: pageInfo.current,
pageSize: pageInfo.pageSize,
total: pageInfo.total,
- showTotal: total => `${getLabel(111, "共")} ${total} ${getLabel(111, "条")}`,
+ showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
showQuickJumper: true,
showSizeChanger: true,
pageSizeOptions: ["10", "20", "50", "100"],