diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less index fafbff7c..b8713b71 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.less @@ -4,7 +4,15 @@ flex-direction: column; .wea-form-item { - padding: 8px 16px 0 16px; + height: 46px; + line-height: 46px; + background: #FFF; + margin: 8px 16px 0 16px; + + .wea-form-item-label { + line-height: 46px !important; + padding-left: 8px !important; + } .to { padding: 0 10px @@ -15,7 +23,7 @@ flex: 1; overflow: hidden; background: #FFF; - margin: 16px; + margin: 8px 16px; } .linkWapper { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/components/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/components/index.less index 4d16b78a..94ab3cad 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/components/index.less +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/components/index.less @@ -1,13 +1,41 @@ .tableRecordWrapper { + padding: 0 16px; + + .form-dialog-layout { + padding: 0 !important; + + .wea-search-group { + padding: 16px 0 !important; + } + } + + .wea-form-cell-wrapper { + & > div:first-child { + height: 47px !important; + line-height: 47px; + } + + & > div:last-child { + + .wea-form-item-wrapper { + display: flex !important; + align-items: center; + + .to { + padding: 0 10px; + } + } + } + } + .accumulated { .wea-form-cell-wrapper { & > div:first-child { - height: 46px !important; - line-height: 46px; + height: 47px !important; + line-height: 47px; } & > div:nth-child(2) { - //width: 40% !important; .wea-form-item-wrapper { display: flex !important; @@ -18,10 +46,6 @@ } } } - - & > div:last-child { - //width: 40% !important; - } } } } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js index 9db08fac..4bba03cd 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js @@ -5,8 +5,7 @@ * Date: 2023/2/20 */ import React, { Component } from "react"; -import { WeaSearchGroup } from "ecCom"; -import UnifiedTable from "../../../components/UnifiedTable"; +import { WeaSearchGroup, WeaTable } from "ecCom"; import { getTableRecordDate } from "../../../apis/cumDeduct"; import { DataCollectionDateRangePick, DataCollectionSelect, Input } from "../cumDeduct"; import "./index.less"; @@ -87,9 +86,22 @@ class TableRecord extends Component { if (status) { const { columns, list: dataSource, pageNum: current, pageSize, total } = data; this.setState({ - pageInfo: { ...pageInfo, current, pageSize, total }, - dataSource, - columns + pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, + columns: _.map(columns, (o, i) => { + let col = { + ...o, width: 110, + render: text => ({text}) + }; + switch (o.dataIndex) { + case "taxAgentName": + col = { ...col, width: 180 }; + break; + default: + col = { ...col }; + break; + } + return i === 0 ? { ...col, fixed: "left" } : col; + }) }); } }).catch(() => this.setState({ loading: { ...loading, query: false } })); @@ -161,14 +173,6 @@ class TableRecord extends Component { { com: Input({ value: record.username }) }, - { - com: DataCollectionDateRangePick({ - label: "税款所属期", - range: recordPayload[screenParams[screenParams.length - 1]] || [], - onChange: this.handleTablerecordScreen, - key: screenParams[screenParams.length - 1] - }) - }, { com: DataCollectionSelect({ label: "个税扣缴义务人", @@ -177,28 +181,26 @@ class TableRecord extends Component { onChange: this.handleTablerecordScreen, key: "taxAgentId" }) + }, + { + com: DataCollectionDateRangePick({ + label: "税款所属期", + range: recordPayload[screenParams[screenParams.length - 1]] || [], + onChange: this.handleTablerecordScreen, + key: screenParams[screenParams.length - 1] + }) } ]; return (
{ !_.isEmpty(screenParams) && - 1280 ? 3 : 2}/> +
+ +
} - ({ - ...item, - render: (text) => { - return {text} ; - } - }))} - dataSource={dataSource} - pagination={pagination} - loading={loading.query} - xWidth={columns.length * 180} - /> +
); } diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 9f1e481f..e1c8e21b 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -332,7 +332,7 @@ class Index extends Component { ...slidePayload, visible: false, title: "", - chidren: null, + children: null, data: {} } }); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index dd32ab7c..7a0e0ea4 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -379,7 +379,7 @@ class Index extends Component { ...slidePayload, visible: false, title: "", - chidren: null, + children: null, data: {} } }); diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js index bd4c25ca..dc5d395d 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js @@ -74,7 +74,7 @@ class DataTables extends Component { this.setState({ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, columns }, () => this.postMessageToChild({ - dataSource: this.state.dataSource, scrollHeight: 95, selectedRowKeys, isSpecial, + dataSource: this.state.dataSource, scrollHeight: 103, selectedRowKeys, isSpecial, pageInfo: this.state.pageInfo, unitTableType: "dataAcquisition", columns: this.state.columns })); @@ -100,14 +100,18 @@ class DataTables extends Component { render() { const { dataSource, loading } = this.state; + const dom = document.querySelector(".dataContent"); let height = 280; - if (dataSource.length > 0) height = dataSource.length <= 10 ? dataSource.length * 46 + 124 : 500; + if (dataSource.length > 0 && dom) { + const tableHeight = dataSource.length * 46 + 124; + height = dom.offsetHeight > tableHeight ? tableHeight : dom.offsetHeight; + } return (