From 1a6007a8da4310bb21e5479764b14199116f2051 Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Mon, 20 Jun 2022 16:22:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=80=E6=9C=9F=E7=B4=AF=E8=AE=A1?= =?UTF-8?q?=E6=8A=BD=E5=B1=89=E6=95=B0=E6=8D=AE=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/dataAcquisition/cumSituation/editSlideContent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js index 863f5cdc..0ce1c0a4 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js @@ -213,7 +213,7 @@ export default class EditSlideContent extends React.Component { dataSource={slideTableDataSource} pagination={pagination} loading={slideLoading} - scroll={{ x: 900 }} + scroll={{ x: newColumns ? newColumns.length * 150 : 900}} /> From a91ce27139da23c7c80cb4655d9d801e7c090ffa Mon Sep 17 00:00:00 2001 From: liyongshun <971387674@qq.com> Date: Tue, 21 Jun 2022 09:41:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=9B=BA=E5=AE=9A=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js | 2 +- pc4mobx/hrmSalary/pages/taxAgent/index.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js index a7b1a74f..f401680f 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js @@ -78,7 +78,7 @@ export default class SalaryDetail extends React.Component { } if(result.dataIndex === "taxAgentName" || result.dataIndex === "username" || result.dataIndex === "departmentName") { - result.fixed = "left" + // result.fixed = "left" } return result; diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js index c74f1a73..85012f8e 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/index.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js @@ -374,7 +374,6 @@ export default class TaxAgent extends React.Component { icon={} // 左侧图标 iconBgcolor="#F14A2D" // 左侧图标背景色 showDropIcon={true}> - {" "}// 是否显示下拉按钮 From 314ffff8ec53e3ae5c3d0e4f5039d553289a3137 Mon Sep 17 00:00:00 2001 From: liyongshun <971387674@qq.com> Date: Tue, 21 Jun 2022 11:57:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmSalary/components/customTable/index.js | 34 +++++++++---------- .../pages/calculateDetail/salaryDetail.js | 3 +- .../pages/calculateDetail/userSure.js | 2 ++ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/pc4mobx/hrmSalary/components/customTable/index.js b/pc4mobx/hrmSalary/components/customTable/index.js index cef3295f..9efade1b 100644 --- a/pc4mobx/hrmSalary/components/customTable/index.js +++ b/pc4mobx/hrmSalary/components/customTable/index.js @@ -1,20 +1,20 @@ -import React from 'react' -import { WeaTable } from 'ecCom' -import { Spin } from 'antd' +import React from "react"; +import { WeaTable } from "ecCom"; +import { Spin, Table } from "antd"; 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/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js index f401680f..858e2d90 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js @@ -78,7 +78,7 @@ export default class SalaryDetail extends React.Component { } if(result.dataIndex === "taxAgentName" || result.dataIndex === "username" || result.dataIndex === "departmentName") { - // result.fixed = "left" + result.fixed = "left" } return result; @@ -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 && Date: Tue, 21 Jun 2022 15:54:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/components/customTable/index.js | 14 +++++++++++++- .../hrmSalary/components/customTable/index.less | 11 +++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pc4mobx/hrmSalary/components/customTable/index.less diff --git a/pc4mobx/hrmSalary/components/customTable/index.js b/pc4mobx/hrmSalary/components/customTable/index.js index 9efade1b..c40122dd 100644 --- a/pc4mobx/hrmSalary/components/customTable/index.js +++ b/pc4mobx/hrmSalary/components/customTable/index.js @@ -1,6 +1,13 @@ +/* + * 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() { @@ -13,7 +20,12 @@ export default class CustomTable extends React.Component { : 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; + } + } + } +}