薪资核算以及社保福利台账详情页面修改
This commit is contained in:
parent
c22e326fd7
commit
bb649ce6e3
|
|
@ -48,6 +48,7 @@ export default class PlaceOnFileDetail extends React.Component {
|
|||
const payload = {
|
||||
type: "PR",
|
||||
listType: "",
|
||||
hasOperate: false,
|
||||
url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
|
||||
queryParams: {
|
||||
salaryAcctRecordId,
|
||||
|
|
@ -78,6 +79,7 @@ export default class PlaceOnFileDetail extends React.Component {
|
|||
const payload = {
|
||||
type: "PR",
|
||||
listType: "",
|
||||
hasOperate: false,
|
||||
url: "/api/bs/hrmsalary/salaryacct/acctresult/list",
|
||||
queryParams: {
|
||||
salaryAcctRecordId,
|
||||
|
|
|
|||
|
|
@ -450,9 +450,9 @@ export default class NormalIndex extends Component {
|
|||
};
|
||||
|
||||
render() {
|
||||
const { remarks, billMonth, selectedKey, paymentOrganization } = this.props;
|
||||
const { remarks, billMonth, selectedKey, paymentOrganization, standingBookStore } = this.props;
|
||||
const { selectedRowKeys, addProps, adjustSlide, importParams, returnEditPersonSlide } = this.state;
|
||||
const { loading, form, condition, saveLoading } = this.props.standingBookStore;
|
||||
const { loading } = standingBookStore;
|
||||
let { list, columns, total } = this.state.tableData;
|
||||
const rowSelection = {
|
||||
selectedRowKeys,
|
||||
|
|
@ -510,7 +510,7 @@ export default class NormalIndex extends Component {
|
|||
}
|
||||
};
|
||||
});
|
||||
columns = [
|
||||
!getQueryString("type") && (columns = [
|
||||
...columns,
|
||||
{
|
||||
title: "操作",
|
||||
|
|
@ -529,7 +529,7 @@ export default class NormalIndex extends Component {
|
|||
);
|
||||
}
|
||||
}
|
||||
];
|
||||
]);
|
||||
return (
|
||||
<div className="normalWapper">
|
||||
{
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ class RegList extends Component {
|
|||
return (
|
||||
<WeaTable
|
||||
rowKey="id"
|
||||
columns={[
|
||||
columns={!getQueryString("type") ? [
|
||||
...columns,
|
||||
{
|
||||
title: "操作",
|
||||
|
|
@ -160,7 +160,7 @@ class RegList extends Component {
|
|||
);
|
||||
}
|
||||
}
|
||||
]}
|
||||
] : [...columns]}
|
||||
dataSource={dataSource}
|
||||
loading={loading.query}
|
||||
pagination={pagination}
|
||||
|
|
|
|||
Loading…
Reference in New Issue