diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js index 47c46604..372ede86 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js @@ -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 }) 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 }) => { 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",