diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less index 669f1ba1..f9611c7f 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less @@ -244,6 +244,8 @@ position: relative; margin-top: 10px; transition: margin-top .3s; + max-height: 80vh; + overflow: auto; .anchor-list-ink { position: absolute; 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",