diff --git a/pc4mobx/hrmSalary/pages/custom-pages/luwei/index.less b/pc4mobx/hrmSalary/pages/custom-pages/luwei/index.less index 3ebbb18d..f7ee4200 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/luwei/index.less +++ b/pc4mobx/hrmSalary/pages/custom-pages/luwei/index.less @@ -16,6 +16,7 @@ .ant-table-bordered .ant-table-tbody > tr > td, .ant-table-bordered .ant-table-thead > tr > th { border-right: 1px solid #e9e9e9 !important; + border-bottom: 1px solid #e9e9e9 !important; text-align: center; } } diff --git a/pc4mobx/hrmSalary/pages/custom-pages/luwei/report.js b/pc4mobx/hrmSalary/pages/custom-pages/luwei/report.js index dbb428e7..7c9c9f59 100644 --- a/pc4mobx/hrmSalary/pages/custom-pages/luwei/report.js +++ b/pc4mobx/hrmSalary/pages/custom-pages/luwei/report.js @@ -58,14 +58,17 @@ class Report extends Component { const payload = { ...pageInfo, ...form.getFormParams(), taxAgentIds: taxAgentIds ? taxAgentIds.split(",") : [] }; + this.setState({ loading: true, payload }); reportData[reportType].list(payload).then(({ status, data }) => { + this.setState({ loading: false }); if (status) { const { columns, pageInfo: result } = data; const { list: dataSource, pageNum: current, pageSize, total } = result; this.setState({ - dataSource, pageInfo: { current, pageSize, total }, payload, - columns: this.traverseColumns(columns) + dataSource, pageInfo: { current, pageSize, total }, columns: this.traverseColumns(columns) }); + } else { + this.setState({ dataSource: [], pageInfo: { current: 1, pageSize: 10, total: 0 } }); } }); };