From 4b125994f7398b5c63136959086d53c5ec8ca8b1 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 17 Oct 2024 11:17:55 +0800 Subject: [PATCH] release/2.16.1.2410.01 --- pc4mobx/hrmSalary/pages/calculate/index.less | 4 +- pc4mobx/hrmSalary/pages/declare/index.less | 6 +- .../fieldManagement/components/fieldTable.js | 2 +- .../hrmSalary/pages/fieldManagement/index.js | 39 +++++---- .../pages/fieldManagement/index.less | 12 +++ .../components/ledgerSalaryItemNormal.js | 4 +- .../ledgerPage/components/ledgerSearchComp.js | 38 +++------ .../ledgerPage/components/ledgerSlide.js | 4 +- pc4mobx/hrmSalary/pages/ledgerPage/index.js | 7 +- pc4mobx/hrmSalary/pages/ledgerPage/index.less | 8 +- .../pages/mySalaryBenefits/index.less | 4 + .../components/welfareRecordQuery.js | 49 +++++------ .../standingBook/index.less | 12 ++- .../standingBook/standingBook.js | 81 +++++++++---------- 14 files changed, 129 insertions(+), 141 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less index bc3f7755..045f4b8c 100644 --- a/pc4mobx/hrmSalary/pages/calculate/index.less +++ b/pc4mobx/hrmSalary/pages/calculate/index.less @@ -76,6 +76,8 @@ height: 100%; width: 100%; overflow-y: auto; + padding: 8px 16px 0 16px; + background: #F6F6F6; .wea-new-table { background: #fff; @@ -83,7 +85,7 @@ .ant-table-tbody { .ant-table-row-indent { - display: none!important; + display: none !important; } td:not(.ant-table-selection-column) { diff --git a/pc4mobx/hrmSalary/pages/declare/index.less b/pc4mobx/hrmSalary/pages/declare/index.less index 52564e0a..9e4ced1a 100644 --- a/pc4mobx/hrmSalary/pages/declare/index.less +++ b/pc4mobx/hrmSalary/pages/declare/index.less @@ -1,7 +1,8 @@ .generateDeclarationDetail { - .tabWrapper{ + .tabWrapper { padding-left: 10px } + .tableWrapper { height: calc(100vh - 48px); overflow: auto; @@ -34,7 +35,8 @@ .declare-body { height: 100%; width: 100%; - padding: 16px; + padding: 8px 16px 0 16px; + background: #F6F6F6; overflow-y: auto; .wea-new-table { diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js index ad3cd14a..f966e4c3 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js @@ -127,7 +127,7 @@ class FieldTable extends Component { pagination={pagination} loading={loading} columns={this.getColumns()} - scroll={{ y: "calc(100vh - 152px)" }} + scroll={{ y: "calc(100vh - 160px)" }} /> ); } diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.js b/pc4mobx/hrmSalary/pages/fieldManagement/index.js index 65da711e..b0d483c9 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/index.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.js @@ -99,7 +99,7 @@ class FieldManagement extends Component { ]; return ( } iconBgcolor="#F14A2D" + title="字段管理" icon={} iconBgcolor="#F14A2D" className="fieldManageWrapper" buttons={(showSalaryItemBtn || showOperateBtn) ? btns : btns.slice(-1)} showDropIcon onDropMenuClick={this.onDropMenuClick} dropMenuDatas={[ @@ -109,26 +109,23 @@ class FieldManagement extends Component { } ]} > -
- this.handleDeleteField([record.id])} - onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)} - /> - this.setState({ - slideparams: { - ...slideparams, - record: { ...slideparams.record, ...record } - } - })} - onCancel={this.handleResetField} - onRefreshList={() => this.setState({ doSearch: !doSearch })} - /> - {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> -
+ this.handleDeleteField([record.id])} + onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/> + this.setState({ + slideparams: { + ...slideparams, + record: { ...slideparams.record, ...record } + } + })} + onCancel={this.handleResetField} + onRefreshList={() => this.setState({ doSearch: !doSearch })} + /> + {/*操作日志*/} + this.setState({ logDialogVisible: false })}/>
); } diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.less b/pc4mobx/hrmSalary/pages/fieldManagement/index.less index 4053721e..3fefa7cc 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/index.less +++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.less @@ -1,3 +1,15 @@ + +.fieldManageWrapper { + .wea-new-top-content { + background: #F6F6F6; + padding: 8px 16px 0 16px; + } + + .wea-new-table { + background: #FFF; + } +} + .slideOuterWrapper { .wea-form-item-group { margin: 16px; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js index 2e48ba54..1c176f06 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js @@ -232,11 +232,11 @@ const TitleNormalComp = (props) => { onDeleteCategory(uuid)}/> } { - sortedIndex !== 0 && showOperateBtn && + name !== getLabel(111, "未分类") && sortedIndex !== 0 && showOperateBtn && onUpgo(sortedIndex)}/> } { - sortedIndex !== dataSourceLen - 1 && showOperateBtn && + name !== getLabel(111, "未分类") && sortedIndex !== dataSourceLen - 2 && showOperateBtn && onDowngo(sortedIndex)}/> } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js index a95d9048..821ba416 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js @@ -15,8 +15,7 @@ import { getTaxAgentSelectList } from "../../../apis/taxAgent"; const getKey = WeaTools.getKey; const getLabel = WeaLocaleProvider.getLabel; -@inject("ledgerStore") -@observer +@inject("ledgerStore") @observer class LedgerSearchComp extends Component { constructor(props) { super(props); @@ -36,14 +35,11 @@ class LedgerSearchComp extends Component { this.setState({ conditions: _.map(searchConditions, o => { return { - ...o, - items: _.map(o.items, j => { + ...o, items: _.map(o.items, j => { if (getKey(j) === "taxAgentId") { return { - ...j, - options: [{ key: "", showname: getLabel(332, "全部") }, ..._.map(data, g => ({ - key: g.id, - showname: g.content + ...j, options: [{ key: "", showname: getLabel(332, "全部") }, ..._.map(data, g => ({ + key: g.id, showname: g.content }))] }; } @@ -62,19 +58,16 @@ class LedgerSearchComp extends Component { let items = []; c.items.map(fields => { items.push({ - com: ( - - - ), - colSpan: 2 + com: ( + + ), colSpan: 2 }); }); - group.push( - ); + group.push(); }); return group; }; @@ -82,12 +75,7 @@ class LedgerSearchComp extends Component { render() { const { conditions } = this.state; const { ledgerStore: { searchForm } } = this.props; - return ( -
- {this.formRender(searchForm, conditions)} - -
- ); + return (
{this.formRender(searchForm, conditions)}
); } } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js index ab4af5ba..0150b1e0 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js @@ -106,9 +106,9 @@ class LedgerSlide extends Component { if (!it.salarySobId) delete it.id; return { ...it }; }), - itemGroups: _.map(_.filter(itemGroups, it => it.name !== "未分类"), item => { + itemGroups: _.map(_.filter(itemGroups, it => it.name !== "未分类"), (item, index) => { return { - ...item, + ...item, sortedIndex: index, items: _.map(item.items, it => { delete it.originFormulaContent; delete it.originSqlContent; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.js b/pc4mobx/hrmSalary/pages/ledgerPage/index.js index d053ae3b..ebd64818 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/index.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.js @@ -71,10 +71,9 @@ class Index extends Component { const { taxAgentStore } = this.props; const { showOperateBtn } = taxAgentStore; const btns = [ - , + , this.setState({ doSearch: !doSearch })}/> ]; return ( diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/index.less index 182042bf..6ad92082 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/index.less +++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.less @@ -1,5 +1,11 @@ .ledgerWrapper { height: 100%; + padding: 8px 16px 0 16px; + background: #F6F6F6; + + .wea-new-table { + background: #FFF; + } .tdEllipsis { display: inline-block; @@ -12,8 +18,6 @@ .ledgerSearch-Wrapper { min-width: 350px; - margin-top: 5px; - margin-right: 70px; position: relative; & > button { diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.less b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.less index 52e92374..721202f8 100644 --- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.less +++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.less @@ -1,4 +1,8 @@ .mySalary_wrapper { + .wea-new-top-req-content { + padding: 8px 16px; + } + .wea-transfer-list-wrapper { border: none; } diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js index 16dd0855..4a702b64 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js @@ -16,17 +16,13 @@ import moment from "moment"; const getLabel = WeaLocaleProvider.getLabel; const getKey = WeaTools.getKey; -@inject("standingBookStore") -@observer +@inject("standingBookStore") @observer class WelfareRecordQuery extends Component { constructor(props) { super(props); this.state = { conditions: [], - dateRange: [ - moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"), - moment(new Date()).endOf("year").format("YYYY-MM") - ] + dateRange: [moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"), moment(new Date()).endOf("year").format("YYYY-MM")] }; } @@ -36,8 +32,7 @@ class WelfareRecordQuery extends Component { this.setState({ conditions: _.map(welfareRQConditions, item => { return { - ...item, - items: _.map(item.items, o => { + ...item, items: _.map(item.items, o => { if (getKey(o) === "taxAgents") { return { ...o, options: _.map(data, g => ({ key: g.id.toString(), showname: g.name })) }; } @@ -63,28 +58,22 @@ class WelfareRecordQuery extends Component { let items = []; c.items.map(fields => { items.push({ - com: ( - - - ) + com: ( + + ) }); }); - group.push( - - this.setState({ dateRange: v }, () => this.getWelfareRecordList())}/> - ) - }, - ...items - ]} - />); + group.push( + this.setState({ dateRange: v }, () => this.getWelfareRecordList())}/> + ) + }, ...items]} + />); }); return group; }; @@ -101,9 +90,7 @@ class WelfareRecordQuery extends Component { render() { const { standingBookStore: { welfareRQForm } } = this.props; const { conditions } = this.state; - return ( -
{this.renderForm(welfareRQForm, conditions)}
- ); + return (
{this.renderForm(welfareRQForm, conditions)}
); } } diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less index 38dae0ed..8da302a1 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less @@ -57,24 +57,22 @@ //社保福利台账页面重构 .salary-welfare-record { - min-width: 1000px; - overflow: auto; - width: 100%; - height: 100%; - background: #f6f6f6; - .salary-welfare-record-content { width: 100%; height: 100%; - padding: 8px 16px; + padding: 8px 16px 0 16px; + background: #F6F6F6; display: flex; flex-direction: column; .salary-welfare-record-query { width: 100%; + padding: 0 8px; + margin-bottom: 8px; height: 46px; display: flex; align-items: center; + background: #FFF; .wea-search-group { width: 100%; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js index f4089c44..80083d56 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js @@ -123,50 +123,45 @@ class StandingBook extends Component { const rightBtns = []; - return ( -
- } - iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []} - showDropIcon onDropMenuClick={this.onDropMenuClick} - dropMenuDatas={[ - { - key: "log", icon: , - content: getLabel(545781, "操作日志") - } - ]} - > -
- { - this.setState({ - queryForm: { ...queryForm, ...payload } - }, () => this.wfListRef.wrappedInstance.getWelfareRecordList()); - }} - onPutAccountOptions={options => this.setState({ accountDialog: { ...accountDialog, options } })} - /> - this.wfListRef = dom} queryForm={queryForm} - onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/> -
- this.setState({ - accountDialog: { ...accountDialog, visible: false, title: "", loading: false } - })} onOk={this.handleAccount} - /> - {/*操作日志*/} - this.setState({ logDialogVisible: false })}/> - {/*核算进度条*/} - { - this.state.progressVisible && - { - this.setState({ progressVisible: false, progress: 0 }, () => clearInterval(this.timer)); - }} - /> - } -
+ return (} + iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []} className="salary-welfare-record" + showDropIcon onDropMenuClick={this.onDropMenuClick} + dropMenuDatas={[ + { + key: "log", icon: , + content: getLabel(545781, "操作日志") + } + ]}> +
+ { + this.setState({ + queryForm: { ...queryForm, ...payload } + }, () => this.wfListRef.wrappedInstance.getWelfareRecordList()); + }} + onPutAccountOptions={options => this.setState({ accountDialog: { ...accountDialog, options } })} + /> + this.wfListRef = dom} queryForm={queryForm} + onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
- ); + this.setState({ + accountDialog: { ...accountDialog, visible: false, title: "", loading: false } + })} onOk={this.handleAccount} + /> + {/*操作日志*/} + this.setState({ logDialogVisible: false })}/> + {/*核算进度条*/} + { + this.state.progressVisible && + { + this.setState({ progressVisible: false, progress: 0 }, () => clearInterval(this.timer)); + }} + /> + } +
); } }