diff --git a/pc4mobx/hrmSalary/components/customTable/index.js b/pc4mobx/hrmSalary/components/customTable/index.js index cef3295f..c40122dd 100644 --- a/pc4mobx/hrmSalary/components/customTable/index.js +++ b/pc4mobx/hrmSalary/components/customTable/index.js @@ -1,20 +1,32 @@ -import React from 'react' -import { WeaTable } from 'ecCom' -import { Spin } from 'antd' +/* + * Author: 黎永顺 + * Description: + * Date: 2022-06-21 14:27:29 + * LastEditTime: 2022-06-21 15:05:12 + */ +import React from "react"; +import { WeaTable } from "ecCom"; +import { Spin, Table } from "antd"; +import "./index.less"; export default class CustomTable extends React.Component { - render() { - return ( -
- { - this.props.loading ? -
- -
- : - - } + render() { + const { loading, isWeaTable = true } = this.props; + return ( +
+ {loading + ?
+
- ) - } -} \ No newline at end of file + : isWeaTable + ? + : } + + ); + } +} diff --git a/pc4mobx/hrmSalary/components/customTable/index.less b/pc4mobx/hrmSalary/components/customTable/index.less new file mode 100644 index 00000000..02565090 --- /dev/null +++ b/pc4mobx/hrmSalary/components/customTable/index.less @@ -0,0 +1,11 @@ +.antd-wrap { + .ant-table-tbody { + tr { + td { + white-space: nowrap; + height: 41px !important; + border-bottom: 1px solid #e2e2e2 !important; + } + } + } +} diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js index a7b1a74f..858e2d90 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js @@ -162,6 +162,7 @@ export default class SalaryDetail extends React.Component { this.pageInfo.current = value this.handleDataPageChange(value) }} + isWeaTable={false} onShowSizeChange={(current, pageSize) => { this.pageInfo = {current, pageSize} this.handleShowSizeChange(this.pageInfo) diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js index a9bb78b0..4812ed30 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js @@ -449,6 +449,7 @@ export default class UserSure extends React.Component { this.pageInfo.current = value; this.handleUserListPageChange(value); }} + isWeaTable={false} onShowSizeChange={(current, pageSize) => { this.pageInfo = { current, pageSize }; this.handleShowSizeChange(this.pageInfo); @@ -456,6 +457,7 @@ export default class UserSure extends React.Component { />} {this.state.selectedKey == 1 &&