diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js index 901f0ea0..960a04d9 100644 --- a/pc4mobx/hrmSalary/pages/calculate/calculate.js +++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js @@ -46,7 +46,7 @@ class Calculate extends Component { const { queryParams } = this.state; return ( } iconBgcolor="#F14A2D" - buttons={this.renderCalculateOpts()} + buttons={this.renderCalculateOpts()} className="calculate-main-layout" >
diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js index 00cd202d..4c2a4337 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js @@ -24,7 +24,6 @@ class Index extends Component { this.props.onChange({ name: v })} - onSearch={this.props.onSearch} />
); diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js index 2848af2e..da32f150 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js @@ -5,7 +5,8 @@ * Date: 2023/10/9 */ import React, { Component } from "react"; -import { WeaLocaleProvider, WeaTable } from "ecCom"; +import { WeaHelpfulTip, WeaLocaleProvider, WeaTable } from "ecCom"; +import { Dropdown, Menu, Tag } from "antd"; import { getSalaryAcctList } from "../../../../apis/calculate"; const getLabel = WeaLocaleProvider.getLabel; @@ -20,25 +21,19 @@ class Index extends Component { } componentDidMount() { - const { queryParams } = this.props; - const { dateRange, ...extra } = queryParams; - const [startMonthStr, endMonthStr] = dateRange || []; - const params = { startMonthStr, endMonthStr, ...extra }; - this.getSalaryAcctList(params); + this.getSalaryAcctList(this.props); } componentWillReceiveProps(nextProps, nextContext) { - if (nextProps.queryParams !== this.props.queryParams) { - const { queryParams } = nextProps; - const { dateRange, ...extra } = queryParams; - const [startMonthStr, endMonthStr] = dateRange || []; - const params = { startMonthStr, endMonthStr, ...extra }; - this.getSalaryAcctList(params); - } + if (nextProps.queryParams !== this.props.queryParams) this.getSalaryAcctList(nextProps); } - getSalaryAcctList = (params) => { + getSalaryAcctList = (props) => { const { pageInfo } = this.state; + const { queryParams } = props; + const { dateRange, ...extra } = queryParams; + const [startMonthStr, endMonthStr] = dateRange || []; + const params = { startMonthStr, endMonthStr, ...extra }; const payload = { ...pageInfo, ...params }; this.setState({ loading: true }); getSalaryAcctList(payload).then(({ status, data }) => { @@ -59,7 +54,6 @@ class Index extends Component { case "salarySobName": width = "20%"; break; - case "taxCycle": case "description": width = "15%"; break; @@ -68,6 +62,56 @@ class Index extends Component { break; } if (dataIndex === "operate") { + return { + ...o, width: 170, + title: + {getLabel(30585, "操作")} + + , + render: (__, record) => { + const { operate = [] } = record; + return + { + _.map(operate.slice(0, 2), f => ( + {f.text} + )) + } + { + !_.isEmpty(operate.slice(2)) && + + { + _.map(operate.slice(2), g => ({g.text})) + } + + } + > + + + } + ; + } + }; + } else if (dataIndex === "salarySobName") { + return { + ...o, width, + render: (text, record) => { + const { acctTimes, backCalcStatus } = record; + return
+ {text} +
+ { + backCalcStatus === 1 && + + } + {`${getLabel(15323, "第")}${acctTimes}${getLabel(18929, "次")}`} +
+
; + } + }; } return { ...o, width }; }) @@ -87,14 +131,12 @@ class Index extends Component { onShowSizeChange: (current, pageSize) => { this.setState({ pageInfo: { ...pageInfo, current, pageSize } - }, () => { - }); + }, () => this.getSalaryAcctList(this.props)); }, onChange: current => { this.setState({ pageInfo: { ...pageInfo, current } - }, () => { - }); + }, () => this.getSalaryAcctList(this.props)); } }; return ( diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less index 03f4218d..332729cf 100644 --- a/pc4mobx/hrmSalary/pages/calculate/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/index.less @@ -30,6 +30,9 @@ & > span { flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .salarySobNameTagWrapper { @@ -64,18 +67,29 @@ } } -.calculate-body { - background: #f6f6f6; - height: 100%; - width: 100%; - padding: 16px; +.calculate-main-layout { + .wea-new-top-content { + overflow-y: hidden; + } - .ant-table-tbody { - td { - width: 100%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + .calculate-body { + height: 100%; + width: 100%; + padding: 16px; + overflow-y: auto; + + .wea-new-table { + background: #fff; } + + .ant-table-tbody { + td { + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + } }