From 9e26192aa2efcb0e5580e9c1eeebd1380d0abb3d Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 9 May 2025 19:14:38 +0800
Subject: [PATCH 1/3] release/2.19.1.2501.01

---
 pc4mobx/hrmSalary/pages/mobilePayroll/index.js   | 2 +-
 pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index a1756ede..49974e92 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -119,7 +119,7 @@ export default class MobilePayroll extends React.Component {
   handleGoFeedback = () => {
     Modal.confirm({
       title: getLabel(131329, "信息确认"),
-      content: getLabel(111, "请确认薪资信息是有误，进行反馈并发起反馈流程。"),
+      content: getLabel(111, "确认是否发起反馈流程？"),
       onOk: () => {
         const { salaryBillToken } = this.state;
         feedBackSalaryBill({ salaryInfoId: getQueryString("id"), header: salaryBillToken })
diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
index 56e1f2f4..5a334965 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
@@ -59,7 +59,7 @@ class MySalaryView extends Component {
   handleGoFeedback = () => {
     Modal.confirm({
       title: getLabel(131329, "信息确认"),
-      content: getLabel(544271, "请确认薪资信息是有误，进行反馈并发起反馈流程。"),
+      content: getLabel(544271, "确认是否发起反馈流程？"),
       onOk: () => {
         const { params: { salaryInfoId }, mySalaryStore: { getMySalaryBill } } = this.props;
         feedBackSalaryBill({ salaryInfoId }).then(({ status, errorMsg }) => {

From a4c08b937b6a2b902f99519a4aa8b6d26877003a Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 13 May 2025 13:53:35 +0800
Subject: [PATCH 2/3] release/2.19.1.2501.01

---
 pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
index a955b423..4a5bf0a4 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
@@ -31,6 +31,7 @@ class Index extends Component {
   }
 
   async componentDidMount() {
+    this.setState({ store: { ...this.state.store, loading: true } });
     const { data: sysinfo } = await API.sysinfo();
     const { adjustShowStatus, salaryShowStatus } = sysinfo;
     let tabs = [
@@ -39,7 +40,7 @@ class Index extends Component {
     ];
     salaryShowStatus === "0" && (tabs = _.filter(tabs, o => o.key !== "1"));
     adjustShowStatus === "0" && (tabs = _.filter(tabs, o => o.key !== "2"));
-    this.setState({ sysinfo, tabs }, () => {
+    this.setState({ sysinfo, tabs, store: { ...this.state.store, loading: false } }, () => {
       const { tabs, store } = this.state;
       this.setState({
         selectedKey: !_.isEmpty(tabs) ? _.head(tabs).key : "0",

From 07c40750da196f2646ffc60626435ec22662631b Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 19 May 2025 16:04:11 +0800
Subject: [PATCH 3/3] release/2.19.1.2501.01

---
 .../pages/calculate/doCalc/components/salaryEditCalc/index.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index ff3ef53f..75d2f103 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -239,6 +239,8 @@
           position: relative;
           margin-top: 10px;
           transition: margin-top .3s;
+          max-height: 80vh;
+          overflow: auto;
 
           .anchor-list-ink {
             position: absolute;