qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release/2.16.1.2410.01

This commit is contained in:
lys 2024-10-17 11:17:55 +08:00
parent 1a0f594753
commit 4b125994f7
14 changed files with 129 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/pages/calculate/index.less
View File

@ -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) {

6
pc4mobx/hrmSalary/pages/declare/index.less
View File

@ -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 {

2
pc4mobx/hrmSalary/pages/fieldManagement/components/fieldTable.js
View File

@ -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)" }}
/>
);
}

39
pc4mobx/hrmSalary/pages/fieldManagement/index.js
View File

@ -99,7 +99,7 @@ class FieldManagement extends Component {
];
return (
<WeaTop
title="字段管理" icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
title="字段管理" icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D" className="fieldManageWrapper"
buttons={(showSalaryItemBtn || showOperateBtn) ? btns : btns.slice(-1)}
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
@ -109,26 +109,23 @@ class FieldManagement extends Component {
}
]}
>
<div className="fieldManageWrapper">
<FieldTable name={searchVal} doSearch={doSearch} onEditLedger={this.handleEditField}
onDeleteLedger={(record) => this.handleDeleteField([record.id])}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
/>
<FieldSlide
{...slideparams}
onChangeRecord={(record) => this.setState({
slideparams: {
...slideparams,
record: { ...slideparams.record, ...record }
}
})}
onCancel={this.handleResetField}
onRefreshList={() => this.setState({ doSearch: !doSearch })}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salarcfield" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
</div>
<FieldTable name={searchVal} doSearch={doSearch} onEditLedger={this.handleEditField}
onDeleteLedger={(record) => this.handleDeleteField([record.id])}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
<FieldSlide
{...slideparams}
onChangeRecord={(record) => this.setState({
slideparams: {
...slideparams,
record: { ...slideparams.record, ...record }
}
})}
onCancel={this.handleResetField}
onRefreshList={() => this.setState({ doSearch: !doSearch })}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="salarcfield" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
</WeaTop>
);
}

12
pc4mobx/hrmSalary/pages/fieldManagement/index.less
View File

@ -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;

4
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
View File

@ -232,11 +232,11 @@ const TitleNormalComp = (props) => {
<i className="icon-coms-Delete" title="删除" onClick={() => onDeleteCategory(uuid)}/>
}
{
sortedIndex !== 0 && showOperateBtn &&
name !== getLabel(111, "未分类") && sortedIndex !== 0 && showOperateBtn &&
<i className="icon-coms-Reverse" title="向上移动" onClick={() => onUpgo(sortedIndex)}/>
}
{
sortedIndex !== dataSourceLen - 1 && showOperateBtn &&
name !== getLabel(111, "未分类") && sortedIndex !== dataSourceLen - 2 && showOperateBtn &&
<i className="icon-coms-positive-sequence" title="向下移动" onClick={() => onDowngo(sortedIndex)}/>
}
</div>

38
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
View File

@ -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: (
<WeaFormItem label={`${fields.label}`} labelCol={{ span: `${fields.labelcol}` }}
wrapperCol={{ span: `${fields.fieldcol}` }} error={form.getError(fields)}
tipPosition="bottom"
>
<WeaSwitch fieldConfig={fields} form={form} formParams={formParams}/>
</WeaFormItem>),
colSpan: 2
com: (<WeaFormItem label={`${fields.label}`} labelCol={{ span: `${fields.labelcol}` }}
wrapperCol={{ span: `${fields.fieldcol}` }} error={form.getError(fields)}
tipPosition="bottom">
<WeaSwitch fieldConfig={fields} form={form} formParams={formParams}
onChange={_.debounce(this.props.onSearch, 500)}/>
</WeaFormItem>), colSpan: 2
});
});
group.push(
<WeaSearchGroup col={2} needTigger={true} title={c.title} showGroup={c.defaultshow} center={false}
items={items}/>);
group.push(<WeaSearchGroup col={2} needTigger={true} title={c.title} showGroup={c.defaultshow} center={false}
items={items}/>);
});
return group;
};
@ -82,12 +75,7 @@ class LedgerSearchComp extends Component {
render() {
const { conditions } = this.state;
const { ledgerStore: { searchForm } } = this.props;
return (
<div className="ledgerSearch-Wrapper">
{this.formRender(searchForm, conditions)}
<Button type="primary" onClick={this.props.onSearch}>{getLabel(388113, "搜索")}</Button>
</div>
);
return (<div className="ledgerSearch-Wrapper">{this.formRender(searchForm, conditions)}</div>);
}
}

4
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
View File

@ -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;

7
pc4mobx/hrmSalary/pages/ledgerPage/index.js
View File

@ -71,10 +71,9 @@ class Index extends Component {
const { taxAgentStore } = this.props;
const { showOperateBtn } = taxAgentStore;
const btns = [
<Button
type="primary"
onClick={() => this.setState({ slideparams: { ...slideparams, visible: true } })}
>新建</Button>,
<Button type="primary" onClick={() => this.setState({ slideparams: { ...slideparams, visible: true } })}>
{getLabel(111, "新建")}
</Button>,
<LedgerSearchComp onSearch={() => this.setState({ doSearch: !doSearch })}/>
];
return (

8
pc4mobx/hrmSalary/pages/ledgerPage/index.less
View File

@ -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 {

4
pc4mobx/hrmSalary/pages/mySalaryBenefits/index.less
View File

@ -1,4 +1,8 @@
.mySalary_wrapper {
.wea-new-top-req-content {
padding: 8px 16px;
}
.wea-transfer-list-wrapper {
border: none;
}

49
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
View File

@ -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: (
<WeaFormItem label={`${fields.label}`} labelCol={{ span: `${fields.labelcol}` }}
wrapperCol={{ span: `${fields.fieldcol}` }} error={form.getError(fields)} tipPosition="bottom"
>
<WeaSwitch fieldConfig={fields} form={form} formParams={formParams}
onChange={this.getWelfareRecordList}/>
</WeaFormItem>)
com: (<WeaFormItem label={`${fields.label}`} labelCol={{ span: `${fields.labelcol}` }}
wrapperCol={{ span: `${fields.fieldcol}` }} error={form.getError(fields)}
tipPosition="bottom">
<WeaSwitch fieldConfig={fields} form={form} formParams={formParams} onChange={this.getWelfareRecordList}/>
</WeaFormItem>)
});
});
group.push(
<WeaSearchGroup col={3} needTigger showGroup={c.defaultshow}
items={[
{
com: (<WeaFormItem label={getLabel(542443, "账单月份")} labelCol={{ span: 4 }}
wrapperCol={{ span: 16 }}>
<MonthRangePicker dateRange={dateRange} viewAttr={2}
onChange={v => this.setState({ dateRange: v }, () => this.getWelfareRecordList())}/>
</WeaFormItem>)
},
...items
]}
/>);
group.push(<WeaSearchGroup col={3} needTigger showGroup={c.defaultshow}
items={[{
com: (<WeaFormItem label={getLabel(542443, "账单月份")} labelCol={{ span: 4 }}
wrapperCol={{ span: 16 }}>
<MonthRangePicker dateRange={dateRange} viewAttr={2}
onChange={v => this.setState({ dateRange: v }, () => this.getWelfareRecordList())}/>
</WeaFormItem>)
}, ...items]}
/>);
});
return group;
};
@ -101,9 +90,7 @@ class WelfareRecordQuery extends Component {
render() {
const { standingBookStore: { welfareRQForm } } = this.props;
const { conditions } = this.state;
return (
<div className="salary-welfare-record-query">{this.renderForm(welfareRQForm, conditions)}</div>
);
return (<div className="salary-welfare-record-query">{this.renderForm(welfareRQForm, conditions)}</div>);
}
}

12
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less
View File

@ -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%;

81
pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
View File

@ -123,50 +123,45 @@ class StandingBook extends Component {
const rightBtns = [<Button type="primary" onClick={() => this.setState({
accountDialog: { ...accountDialog, visible: true, title: getLabel(538780, "核算") }
})}>{getLabel(538780, "核算")}</Button>];
return (
<div className="salary-welfare-record">
<WeaTop title={getLabel(538002, "社保福利台账")} icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []}
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}
>
<div className="salary-welfare-record-content">
<WelfareRecordQuery
onSearch={(payload) => {
this.setState({
queryForm: { ...queryForm, ...payload }
}, () => this.wfListRef.wrappedInstance.getWelfareRecordList());
}}
onPutAccountOptions={options => this.setState({ accountDialog: { ...accountDialog, options } })}
/>
<WelfareRecordList ref={dom => this.wfListRef = dom} queryForm={queryForm}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
</div>
<Accountdialog {...accountDialog}
onCancel={() => this.setState({
accountDialog: { ...accountDialog, visible: false, title: "", loading: false }
})} onOk={this.handleAccount}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="siAccount" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
{/*核算进度条*/}
{
this.state.progressVisible &&
<ProgressModal visible={this.state.progressVisible} progress={this.state.progress}
onCancel={() => {
this.setState({ progressVisible: false, progress: 0 }, () => clearInterval(this.timer));
}}
/>
}
</WeaTop>
return (<WeaTop title={getLabel(538002, "社保福利台账")} icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []} className="salary-welfare-record"
showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={[
{
key: "log", icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")
}
]}>
<div className="salary-welfare-record-content">
<WelfareRecordQuery
onSearch={(payload) => {
this.setState({
queryForm: { ...queryForm, ...payload }
}, () => this.wfListRef.wrappedInstance.getWelfareRecordList());
}}
onPutAccountOptions={options => this.setState({ accountDialog: { ...accountDialog, options } })}
/>
<WelfareRecordList ref={dom => this.wfListRef = dom} queryForm={queryForm}
onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
</div>
);
<Accountdialog {...accountDialog}
onCancel={() => this.setState({
accountDialog: { ...accountDialog, visible: false, title: "", loading: false }
})} onOk={this.handleAccount}
/>
{/*操作日志*/}
<LogDialog visible={logDialogVisible} logFunction="siAccount" filterConditions={filterConditions}
onCancel={() => this.setState({ logDialogVisible: false })}/>
{/*核算进度条*/}
{
this.state.progressVisible &&
<ProgressModal visible={this.state.progressVisible} progress={this.state.progress}
onCancel={() => {
this.setState({ progressVisible: false, progress: 0 }, () => clearInterval(this.timer));
}}
/>
}
</WeaTop>);
}
}