diff --git a/pc4mobx/hrmSalary/pages/custom-pages/huitong/dataDetail/index.less b/pc4mobx/hrmSalary/pages/custom-pages/huitong/dataDetail/index.less index ee43e908..168299fc 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/huitong/dataDetail/index.less +++ b/pc4mobx/hrmSalary/pages/custom-pages/huitong/dataDetail/index.less @@ -3,8 +3,6 @@ height: 100%; padding: 8px 16px 0 16px; background: #F6F6F6; - display: flex; - flex-direction: column; .ht_query { display: flex; @@ -27,7 +25,6 @@ } .custom_huitong_list { - flex: 1; .ant-spin-nested-loading, .ant-spin-container { height: 100%; diff --git a/pc4mobx/hrmSalary/pages/custom-pages/huitong/socialSecurityReport/index.js b/pc4mobx/hrmSalary/pages/custom-pages/huitong/socialSecurityReport/index.js index 4aafbbcf..92eea359 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/huitong/socialSecurityReport/index.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/huitong/socialSecurityReport/index.js @@ -97,7 +97,7 @@ class Index extends Component {
{ - getSearchs(queryForm, conditions, 2, false, () => { + getSearchs(queryForm, conditions, 1, false, () => { if (!this.handleDebounce) { this.handleDebounce = _.debounce(() => { this.setState({ pageInfo: { ...pageInfo, current: 1 } }, () => this.getHTCommonListReport());