diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
index bb692a36..fc764d11 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
@@ -48,7 +48,7 @@ class Index extends Component {
declareEditDialog: { visible: false, id: "", title: "" },
declareStatusList: [], employmentStatusList: [],
employmentTypeList: [], adConditons: [],
- selectedRowKeys: [], exportPaylaod: {}
+ selectedRowKeys: [], exportPayload: {}
};
this.baseInfoRef = null;
this.timer = null;
@@ -110,7 +110,7 @@ class Index extends Component {
};
componentWillUnmount() {
- this.setState({ exportPaylaod: {} });
+ this.setState({ exportPayload: {} });
window.removeEventListener("message", this.handleReceive, false);
}
@@ -169,7 +169,7 @@ class Index extends Component {
departmentIds: departmentIds ? departmentIds.split(",") : [],
positionIds: positionIds ? positionIds.split(",") : []
};
- this.setState({ exportPaylaod: payload, loading: { ...this.state.loading, query: true } });
+ this.setState({ exportPayload: payload, loading: { ...this.state.loading, query: true } });
API[selectedKey](payload).then(({ status, data }) => {
this.setState({ loading: { ...this.state.loading, query: false } });
if (status) {
@@ -386,9 +386,17 @@ class Index extends Component {
break;
}
};
- handleEmployeedeclareExport = async () => {
+ handleEmployeedeclareExport = async ({ key }) => {
+ const { selectedRowKeys, exportPayload } = this.state;
+ if (key === "selected" && _.isEmpty(selectedRowKeys)) {
+ message.warning(getLabel(111, "请先选择需要导出的人员!"));
+ return;
+ }
this.setState({ loading: { ...this.state.loading, exportLoading: true } });
- const promise = await employeedeclareExport(_.omit(this.state.exportPaylaod, ["current", "total", "pageSize"]));
+ const promise = await employeedeclareExport(_.omit({
+ ...exportPayload,
+ ids: selectedRowKeys
+ }, ["current", "total", "pageSize"]));
this.setState({ loading: { ...this.state.loading, exportLoading: false } });
};
@@ -431,16 +439,26 @@ class Index extends Component {
{ title: getLabel(111, "本月信息变动"), viewcondition: "list4Update" }
];
const tabBtns = [
+ ,
+ //
+ // {/*{getLabel(32935, "导入")}*/}
+ //
+ // }
+ // type="primary">{getLabel(1421, "新增")},
this.handleEmployeedeclareExport({ key: "all" })}
+ loading={loading.exportLoading}
overlay={
- ,
- ,
+ type="primary">{getLabel(17416, "导出全部")},
+ // ,