diff --git a/pc4mobx/organization/components/postionrank/JobGrade.js b/pc4mobx/organization/components/postionrank/JobGrade.js index e695d49..996009c 100644 --- a/pc4mobx/organization/components/postionrank/JobGrade.js +++ b/pc4mobx/organization/components/postionrank/JobGrade.js @@ -140,7 +140,7 @@ export default class JobGrade extends React.Component { tableStore } = jobGrade; - let keys = toJS(tableStore.selectedRowKeys).toString(); + let keys = toJS(tableStore.selectedRowKeysAllPages).toString(); jobGrade.setIds(keys); this.showConfirm('batchDel'); } diff --git a/pc4mobx/organization/components/postionrank/JobLevel.js b/pc4mobx/organization/components/postionrank/JobLevel.js index baf0c35..bfaa1e0 100644 --- a/pc4mobx/organization/components/postionrank/JobLevel.js +++ b/pc4mobx/organization/components/postionrank/JobLevel.js @@ -125,7 +125,7 @@ export default class JobLevel extends React.Component { tableStore } = jobLevel; - let keys = toJS(tableStore.selectedRowKeys).toString(); + let keys = toJS(tableStore.selectedRowKeysAllPages).toString(); jobLevel.setIds(keys); this.showConfirm('batchDel'); } diff --git a/pc4mobx/organization/components/postionrank/RankScheme.js b/pc4mobx/organization/components/postionrank/RankScheme.js index 2c13a40..88f4a2c 100644 --- a/pc4mobx/organization/components/postionrank/RankScheme.js +++ b/pc4mobx/organization/components/postionrank/RankScheme.js @@ -129,7 +129,7 @@ export default class RankScheme extends React.Component { tableStore } = rankScheme; - let keys = toJS(tableStore.selectedRowKeys).toString(); + let keys = toJS(tableStore.selectedRowKeysAllPages).toString(); rankScheme.setIds(keys); this.showConfirm('batchDel'); } diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js index e20dff3..2b49705 100644 --- a/pc4mobx/organization/components/resource/resource.js +++ b/pc4mobx/organization/components/resource/resource.js @@ -174,7 +174,7 @@ export default class Resource extends React.Component { if (item.menuFun !== 'batchDelete') { btns.push(); } else { - btns.push(); + btns.push(); } }); @@ -192,13 +192,14 @@ export default class Resource extends React.Component { datas={datas} btnOnClick={key => { if (key == "1") { + tableStore.selectedRowKeysAllPages = []; resource.export(); } if (key == "2") { - tableStore.selectedRowKeys.length > 0 ? resource.export() : message.error("请选择需要导出的数据") + tableStore.selectedRowKeysAllPages.length > 0 ? resource.export() : message.error("请选择需要导出的数据") } }} - menuOnClick={(key, e) => key == '1' ? tableStore.selectedRowKeys = [] : ''} + menuOnClick={(key, e) => key == '1' ? tableStore.selectedRowKeysAllPages = [] : ''} />) return btns; diff --git a/pc4mobx/organization/components/sequence/Sequence.js b/pc4mobx/organization/components/sequence/Sequence.js index 1c9ced1..567e52a 100644 --- a/pc4mobx/organization/components/sequence/Sequence.js +++ b/pc4mobx/organization/components/sequence/Sequence.js @@ -126,7 +126,7 @@ export default class Sequence extends React.Component { tableStore } = sequence; - let keys = toJS(tableStore.selectedRowKeys).toString(); + let keys = toJS(tableStore.selectedRowKeysAllPages).toString(); sequence.setIds(keys); this.showConfirm('batchDel'); } diff --git a/pc4mobx/organization/components/staff/Staff.js b/pc4mobx/organization/components/staff/Staff.js index 5988595..ee8c9d3 100644 --- a/pc4mobx/organization/components/staff/Staff.js +++ b/pc4mobx/organization/components/staff/Staff.js @@ -145,7 +145,7 @@ export default class Staff extends React.Component { tableStore } = staff; - let keys = toJS(tableStore.selectedRowKeys).toString(); + let keys = toJS(tableStore.selectedRowKeysAllPages).toString(); staff.setIds(keys); this.showConfirm('batchDel'); } diff --git a/pc4mobx/organization/components/staff/StaffScheme.js b/pc4mobx/organization/components/staff/StaffScheme.js index ab931b8..33c1e04 100644 --- a/pc4mobx/organization/components/staff/StaffScheme.js +++ b/pc4mobx/organization/components/staff/StaffScheme.js @@ -124,7 +124,7 @@ export default class StaffScheme extends React.Component { tableStore } = staffScheme; - let keys = toJS(tableStore.selectedRowKeys).toString(); + let keys = toJS(tableStore.selectedRowKeysAllPages).toString(); staffScheme.setIds(keys); this.showConfirm('batchDel'); } diff --git a/pc4mobx/organization/stores/resource.js b/pc4mobx/organization/stores/resource.js index 93ed693..918f73c 100644 --- a/pc4mobx/organization/stores/resource.js +++ b/pc4mobx/organization/stores/resource.js @@ -252,7 +252,7 @@ export class ResourceStore { ...this.form.getFormParams() } this.exSpinning = true; - await Api.exportResource(toJS(this.tableStore.selectedRowKeys).toString()); + await Api.exportResource(toJS(this.tableStore.selectedRowKeysAllPages).toString()); this.exSpinning = false; this.tableStore.selectedRowKeys = [];