diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js index 6a631ef..59bb4b7 100644 --- a/pc4mobx/organization/components/company/company.js +++ b/pc4mobx/organization/components/company/company.js @@ -326,7 +326,8 @@ export default class Company extends React.Component { company } = this.props; const { - isPanelShow, companyName, conditionNum, visible, condition, form, tableStore, dataSource, columns + isPanelShow, companyName, conditionNum, visible, condition, form, + tableStore, dataSource, columns,loading } = company; @@ -373,6 +374,7 @@ export default class Company extends React.Component { rowSelection={rowSelection} indentSize={15} defaultExpandedRowKeys={[1,2]} + loading={loading} /> diff --git a/pc4mobx/organization/stores/company.js b/pc4mobx/organization/stores/company.js index 67f8739..b560629 100644 --- a/pc4mobx/organization/stores/company.js +++ b/pc4mobx/organization/stores/company.js @@ -29,6 +29,7 @@ export class CompanyStore { @observable dataSource = []; @observable columns = []; @observable tableStore = new TableStore(); + @observable loading = true; @observable searchCondition = []; @observable isPanelShow = false; //高级搜索面板 @observable form = new WeaForm(); @@ -43,6 +44,7 @@ export class CompanyStore { @observable date = ''; + @action getTableInfo() { let params; @@ -62,6 +64,7 @@ export class CompanyStore { if (res.code === 200) { res.data.pageInfo.list && this.setDataSource(res.data.pageInfo.list); res.data.pageInfo.columns && this.setColumns(res.data.pageInfo.columns); + this.setLoading(false); } else { message.warning(res.msg); } @@ -228,4 +231,8 @@ export class CompanyStore { this.selectedRowKeys = selectedRowKeys; } + setLoading(bool) { + this.loading = bool; + } + } \ No newline at end of file