qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线

This commit is contained in:
lys 2025-05-20 16:50:29 +08:00
parent 2e832e3aa9 07c40750da
commit 693c436d4a
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
View File

@ -239,6 +239,8 @@
position: relative;
margin-top: 10px;
transition: margin-top .3s;
max-height: 80vh;
overflow: auto;
.anchor-list-ink {
position: absolute;

2
pc4mobx/hrmSalary/pages/mobilePayroll/index.js
View File

@ -116,7 +116,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 })

2
pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
View File

@ -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 }) => {

3
pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
View File

@ -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",