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

Merge branch 'release/2.12.1.2403.02' into release/2.12.1.2403.02-个税

This commit is contained in:
黎永顺 2024-04-12 17:36:54 +08:00
parent f837ac1101 f8e78a97ac
commit 35ea7c7fe3
27 changed files with 602 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pc4mobx/hrmSalary/apis/calculate.js
View File

@ -250,3 +250,20 @@ export const customCacheExportField = (params) => {
export const salaryacctBatchUpdate = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/batchUpdate", params);
};
//薪资核算-自定义导出模板保存新建
export const saveExportTemplate = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/saveExportTemplate", params);
};
//薪资核算-获取自定义导出模板列表
export const getExportTemplateList = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/exportTemplateList", params);
};
//薪资核算-删除自定义导出模板列表
export const deleteExportTemplate = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/deleteExportTemplate", params);
};
//薪资核算-获取导出模板详细信息
export const getExportTemplateForm = (params) => {
return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/getExportTemplateForm", params);
};

77
pc4mobx/hrmSalary/common/columns.js
View File

@ -1,77 +0,0 @@
export const logColumns = [
{
title: "操作时间",
dataIndex: 'title',
key: 'title',
},
{
title: "操作人",
dataIndex: 'title',
key: 'title',
},
{
title: "操作类型",
dataIndex: 'title',
key: 'title',
},
{
title: "模块",
dataIndex: 'title',
key: 'title',
},
{
title: "对象",
dataIndex: 'title',
key: 'title',
},
{
title: "修改详情",
dataIndex: 'title',
key: 'title',
},
{
title: "客户端IP",
dataIndex: 'title',
key: 'title',
}
]
export const testColumns = [
{
title: "姓名",
dataIndex: 'title',
key: 'title',
},
{
title: "个税扣缴义务人",
dataIndex: 'title',
key: 'title',
},
{
title: "部门",
dataIndex: 'title',
key: 'title',
},
{
title: "手机号",
dataIndex: 'title',
key: 'title',
},
{
title: "工号",
dataIndex: 'title',
key: 'title',
},
{
title: "证件号码",
dataIndex: 'title',
key: 'title',
},
{
title: "入职日期",
dataIndex: 'title',
key: 'title',
},
]
export const dataSource = [];

24
pc4mobx/hrmSalary/common/conditions.js Normal file
View File

@ -0,0 +1,24 @@
import React from "react";
import { WeaLocaleProvider } from "ecCom";
const getLabel = WeaLocaleProvider.getLabel;
//薪资核算-自定义导出-模板设置
export const tempConditions = [
{
items: [
{
colSpan: 1,
conditionType: "INPUT",
domkey: ["templateName"],
fieldcol: 16,
label: getLabel(111, "导出模板名称"),
labelcol: 8,
value: "",
rules: "required|string",
viewAttr: 3
}
],
defaultshow: true,
title: ""
}
];

2
pc4mobx/hrmSalary/components/pcTemplate/index.js
View File

@ -24,7 +24,7 @@ export const dealTemplate = (itemTypeList, type) => {
const { items, groupName, groupId } = group;
if (items.length !== 0) {
items.forEach((item) => {
item.salaryItemValue = !_.isNil(item.salaryItemValue) ? item.salaryItemValue : "100";
item.salaryItemValue = !_.isNil(item.salaryItemValue) ? item.salaryItemValue : "";
});
if (items.length % 2 && type === "pc") items.push({});
// 未分类不展示标题

2
pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
View File

@ -331,7 +331,7 @@ class Index extends Component {
const tabs = [
{ key: "statistics", title: getLabel(111, "统计表") },
{ key: "detail", title: getLabel(111, "员工明细") },
// { key: "salaryDetail", title: getLabel(111, "薪资明细") }
{ key: "salaryDetail", title: getLabel(111, "薪资明细") }
];
return (
<WeaReqTop

93
pc4mobx/hrmSalary/pages/calculate/doCalc/components/customCalcExportDialog/index.js
View File

@ -8,10 +8,17 @@
import React, { Component } from "react";
import { Button, Col, message, Row } from "antd";
import { inject, observer } from "mobx-react";
import { WeaCheckbox, WeaDialog, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
import { customCacheExportField } from "../../../../../apis/calculate";
import { WeaCheckbox, WeaDialog, WeaLocaleProvider, WeaSearchGroup, WeaSelect } from "ecCom";
import ExpTempManagementDialog from "../expTempManagementDialog";
import {
customCacheExportField,
getExportField,
getExportTemplateForm,
getExportTemplateList
} from "../../../../../apis/calculate";
import { convertToUrlString } from "../../../../../util/url";
import "./index.less";
import TempDialog from "../expFieldsSetDialog/tempDialog";
const { getLabel } = WeaLocaleProvider;
@ -21,19 +28,44 @@ class Index extends Component {
constructor(props) {
super(props);
this.state = {
itemsCheckeds: [],
showOnlyChecked: false
itemsCheckeds: [], showOnlyChecked: false, tempMangeDialog: { visible: false, salaryAcctRecordId: "" },
tempDialog: { visible: false, salaryAcctRecordId: "", id: "", salaryItemIds: [] },
tempOptions: [
{ key: "NULL", showname: "" },
{ key: "system", selected: true, showname: getLabel(111, "系统模板") }
]
};
}
componentWillReceiveProps(nextProps, nextContext) {
async componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) {
this.setState({
itemsCheckeds: !_.isEmpty(nextProps.checkItems) ? nextProps.checkItems : []
}, () => this.getExportTemplateList(nextProps));
} else {
this.setState({
tempOptions: [
{ key: "NULL", showname: "" },
{ key: "system", selected: true, showname: getLabel(111, "系统模板") }
]
});
}
}
getExportTemplateList = (props) => {
const { salaryAcctRecordId } = props;
getExportTemplateList({ salaryAcctRecordId }).then(({ status, data }) => {
if (status) {
const { pageInfo: { list } } = data;
this.setState({
tempOptions: [
...this.state.tempOptions, ..._.map(list, o => ({ key: String(o.id), showname: o.templateName }))
]
});
}
});
};
customExportClick = () => {
const { calculateStore: { ECSearchForm }, salaryAcctRecordId } = this.props;
const { itemsCheckeds } = this.state;
@ -67,10 +99,26 @@ class Index extends Component {
}
});
};
handleChangeExpTemp = async (id) => {
switch (id) {
case "system":
const { salaryAcctRecordId } = this.props;
const { data: { checkItems: checkeds } } = await getExportField({ salaryAcctRecordId });
this.setState({ itemsCheckeds: checkeds });
break;
case "NULL":
this.setState({ itemsCheckeds: [] });
break;
default:
const { data: { checkItems } } = await getExportTemplateForm({ id });
this.setState({ itemsCheckeds: _.map(checkItems, o => parseInt(o)) });
break;
}
};
render() {
const { showOnlyChecked, itemsCheckeds } = this.state;
const { itemsByGroup } = this.props;
const { showOnlyChecked, itemsCheckeds, tempMangeDialog, tempDialog, tempOptions } = this.state;
const { itemsByGroup, salaryAcctRecordId } = this.props;
let dataSource = _.map(itemsByGroup, item => {
return {
...item,
@ -84,10 +132,15 @@ class Index extends Component {
return { ...item, salaryItems: _.filter(item.salaryItems, it => !!it.checked) };
});
}
const titleComp = <div className="setHeaderWrapper">
<span>{getLabel(111, "选择字段")}</span>
<WeaSelect options={tempOptions} style={{ width: 200 }}
onChange={this.handleChangeExpTemp}/>
</div>;
return (
<WeaDialog
{...this.props} hasScroll initLoadCss className="customEpDialogLayout"
scalable title={getLabel(111, "选择字段")}
scalable title={titleComp}
style={{
width: 700,
height: 606.6,
@ -100,6 +153,21 @@ class Index extends Component {
}}
buttons={[
<Button type="primary" onClick={this.customExportClick}>{getLabel(17416, "导出")}</Button>,
<Button type="primary" onClick={() => this.setState({
tempDialog: { visible: true, salaryAcctRecordId, id: "", salaryItemIds: itemsCheckeds },
tempOptions: [
{ key: "NULL", showname: "" },
{ key: "system", selected: true, showname: getLabel(111, "系统模板") }
]
})}>{getLabel(111, "存为模板")}</Button>,
<Button type="primary"
onClick={() => this.setState({
tempMangeDialog: { visible: true, salaryAcctRecordId },
tempOptions: [
{ key: "NULL", showname: "" },
{ key: "system", selected: true, showname: getLabel(111, "系统模板") }
]
})}>{getLabel(111, "模板管理")}</Button>,
<Button type="ghost" onClick={this.props.onCancel}>{getLabel(31129, "取消")}</Button>
]}
bottomLeft={<WeaCheckbox content={getLabel(543378, "只显示已选中字段")}
@ -131,6 +199,15 @@ class Index extends Component {
</WeaSearchGroup>;
})
}
<ExpTempManagementDialog {...tempMangeDialog}
onCancel={() => this.setState({
tempMangeDialog: { ...tempMangeDialog, visible: false }
}, () => this.getExportTemplateList(this.props))}
/>
{/*模板保存*/}
<TempDialog {...tempDialog} onCancel={() => this.setState({
tempDialog: { ...tempDialog, visible: false }
}, () => this.getExportTemplateList(this.props))}/>
</WeaDialog>
);
}

11
pc4mobx/hrmSalary/pages/calculate/doCalc/components/customCalcExportDialog/index.less
View File

@ -1,4 +1,15 @@
.customEpDialogLayout {
.text-elli {
padding-right: 16px;
}
.setHeaderWrapper {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
}
.wea-search-group {
.wea-title {
padding-left: 0 !important;

134
pc4mobx/hrmSalary/pages/calculate/doCalc/components/expFieldsSetDialog/index.js Normal file
View File

@ -0,0 +1,134 @@
/*
* Author: 黎永顺
* name:自定义导出-导出字段设置
* Description:
* Date: 2024/3/28
*/
import React, { Component } from "react";
import { WeaCheckbox, WeaDialog, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
import { Button, Col, message, Row } from "antd";
import * as API from "../../../../../apis/calculate";
import TempDialog from "./tempDialog";
const getLabel = WeaLocaleProvider.getLabel;
class Index extends Component {
constructor(props) {
super(props);
this.state = {
itemsCheckeds: [], itemsByGroup: [],
tempDialog: { visible: false, salaryAcctRecordId: "", id: "", salaryItemIds: [] }
};
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) this.getExportField(nextProps);
if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
itemsCheckeds: [], itemsByGroup: []
});
}
getExportField = (props) => {
const { salaryAcctRecordId, checkItems } = props;
API.getExportField({ salaryAcctRecordId }).then(({ status, data }) => {
if (status) {
const { itemsByGroup } = data;
this.setState({ itemsByGroup, itemsCheckeds: checkItems });
}
});
};
handleSelectGroupAll = (groupId, checked) => {
const { itemsCheckeds, itemsByGroup } = this.state;
_.map(itemsByGroup, item => {
if (item.salarySobItemGroupId === groupId) {
if (!!Number(checked)) {
this.setState({
itemsCheckeds: [...itemsCheckeds, ..._.map(item.salaryItems, child => String(child.salaryItemId))]
});
} else {
this.setState({
itemsCheckeds: _.differenceWith(itemsCheckeds, _.map(item.salaryItems, child => String(child.salaryItemId)), _.isEqual)
});
}
}
});
};
save = () => {
const { itemsCheckeds } = this.state;
const { salaryAcctRecordId, tempId: id, templateName } = this.props;
if (!id) {
this.setState({
tempDialog: {
visible: true, salaryAcctRecordId, id, salaryItemIds: itemsCheckeds
}
});
} else {
API.saveExportTemplate({ templateName, salaryAcctRecordId, id, salaryItemIds: itemsCheckeds })
.then(({ status, errormsg }) => {
this.setState({ loading: false });
if (status) {
message.success(getLabel(111, "操作成功！"));
this.props.onCancel(true);
} else {
message.error(errormsg);
}
}).catch(() => this.setState({ loading: false }));
}
};
render() {
const { itemsCheckeds, itemsByGroup, tempDialog } = this.state;
let dataSource = _.map(itemsByGroup, item => {
return {
...item, salaryItems: _.map(item.salaryItems, child => {
return { ...child, checked: itemsCheckeds.includes(String(child.salaryItemId)) };
})
};
});
return (
<WeaDialog
{...this.props} hasScroll scalable title={getLabel(111, "导出字段设置")}
initLoadCss className="customEpDialogLayout"
style={{
width: 700, height: 606.6, minHeight: 200, minWidth: 380, maxHeight: "70%",
maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
}}
buttons={[<Button type="primary" onClick={this.save}>{getLabel(111, "保存")}</Button>]}
>
{
_.map(dataSource, item => {
const { salarySobItemGroupName, salaryItems, salarySobItemGroupId } = item;
const value = _.every(salaryItems, it => !!it.checked) ? "1" : "0";
return <WeaSearchGroup showGroup needTigger
title={<WeaCheckbox content={salarySobItemGroupName} value={value}
onChange={(val) => this.handleSelectGroupAll(salarySobItemGroupId, val)}
/>}>
<Row gutter={16}>
{
!_.isEmpty(salaryItems) ?
_.map(salaryItems, it => {
const { salaryItemId, salaryItemName, checked } = it;
return <Col span={8} style={{ marginBottom: 16 }}>
<WeaCheckbox content={salaryItemName} value={checked ? "1" : "0"}
onChange={() => this.setState({ itemsCheckeds: _.xorWith(itemsCheckeds, [String(salaryItemId)], _.isEqual) })}
/>
</Col>;
}) : <Col span={24} style={{
minHeight: 20,
padding: "5%",
textAlign: "center"
}}>{getLabel(83553, "暂无数据")}</Col>
}
</Row>
</WeaSearchGroup>;
})
}
<TempDialog {...tempDialog} onCancel={(isRefresh) => this.setState({
tempDialog: { ...tempDialog, visible: false }
}, () => isRefresh && this.props.onCancel(true))}/>
</WeaDialog>
);
}
}
export default Index;

73
pc4mobx/hrmSalary/pages/calculate/doCalc/components/expFieldsSetDialog/tempDialog.js Normal file
View File

@ -0,0 +1,73 @@
/*
* Author: 黎永顺
* name: 导出模板保存框
* Description:
* Date: 2024/3/29
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { WeaDialog, WeaLocaleProvider } from "ecCom";
import { Button, message } from "antd";
import { getSearchs } from "../../../../../util";
import { tempConditions } from "../../../../../common/conditions";
import * as API from "../../../../../apis/calculate";
const getLabel = WeaLocaleProvider.getLabel;
@inject("calculateStore")
@observer
class TempDialog extends Component {
constructor(props) {
super(props);
this.state = {
loading: false
};
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) {
nextProps.calculateStore.tempForm.initFormFields(tempConditions);
} else {
nextProps.calculateStore.initTempForm();
}
}
save = () => {
const { calculateStore: { tempForm }, salaryAcctRecordId, id, salaryItemIds } = this.props;
tempForm.validateForm().then(f => {
if (f.isValid) {
const payload = tempForm.getFormParams();
this.setState({ loading: true });
API.saveExportTemplate({ ...payload, salaryAcctRecordId, id, salaryItemIds })
.then(({ status, errormsg }) => {
this.setState({ loading: false });
if (status) {
message.success(getLabel(111, "操作成功！"));
this.props.onCancel(true);
} else {
message.error(errormsg);
}
}).catch(() => this.setState({ loading: false }));
} else {
f.showErrors();
}
});
};
render() {
const { loading } = this.state;
const { calculateStore: { tempForm } } = this.props;
return (
<WeaDialog
{...this.props} style={{ width: 400, height: 80 }} initLoadCss title={getLabel(111, "存为模板")}
buttons={[
<Button type="primary" loading={loading} onClick={this.save}>{getLabel(111, "保存")}</Button>
]}
>
<div className="form-dialog-layout">{getSearchs(tempForm, tempConditions, 1, false)}</div>
</WeaDialog>
);
}
}
export default TempDialog;

154
pc4mobx/hrmSalary/pages/calculate/doCalc/components/expTempManagementDialog/index.js Normal file
View File

@ -0,0 +1,154 @@
/*
* Author: 黎永顺
* name: 自定义导出-导出模板管理
* Description:
* Date: 2024/3/28
*/
import React, { Component } from "react";
import { WeaButtonIcon, WeaDialog, WeaInputSearch, WeaLocaleProvider, WeaTab, WeaTable } from "ecCom";
import { message, Modal } from "antd";
import ExpFieldsSetDialog from "../expFieldsSetDialog";
import * as API from "../../../../../apis/calculate";
const getLabel = WeaLocaleProvider.getLabel;
class Index extends Component {
constructor(props) {
super(props);
this.state = {
pageInfo: { current: 1, pageSize: 10, total: 0 }, dataSource: [], columns: [], loading: false,
fieldsSetDialog: { visible: false, salaryAcctRecordId: "", tempId: "", templateName: "", checkItems: [] },
query: { templateName: "" }, selectedRowKeys: []
};
this.dialogRef = null;
}
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) this.getExportTemplateList(nextProps);
if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({ selectedRowKeys: [] });
}
getExportTemplateList = (props) => {
const { pageInfo, query } = this.state;
const { salaryAcctRecordId } = props;
const payload = { ...pageInfo, ...query, salaryAcctRecordId };
this.setState({ loading: true });
API.getExportTemplateList(payload).then(({ status, data }) => {
this.setState({ loading: false });
if (status) {
const { pageInfo: { columns, list: dataSource, pageNum: current, pageSize, total } } = data;
this.setState({
dataSource, pageInfo: { ...pageInfo, current, pageSize, total },
columns: [...columns, {
dataIndex: "operate", title: getLabel(111, "操作"), width: 120,
render: (__, record) => (<React.Fragment>
<a href="javascript:void(0);"
onClick={() => this.getExportTemplateForm(record)}>{getLabel(111, "编辑")}</a>
<a href="javascript:void(0);" style={{ marginLeft: 10 }}
onClick={() => this.deleteExportTemplate([record.id])}>{getLabel(111, "删除")}</a>
</React.Fragment>)
}]
});
}
}).catch(() => this.setState({ loading: false }));
};
getExportTemplateForm = (record) => {
const { id, templateName } = record;
const { fieldsSetDialog } = this.state;
const { salaryAcctRecordId } = this.props;
API.getExportTemplateForm({ id }).then(({ status, data }) => {
if (status) {
const { checkItems } = data;
this.setState({
fieldsSetDialog: {
...fieldsSetDialog, tempId: id, templateName, visible: true, salaryAcctRecordId, checkItems
}
});
} else {
this.setState({
fieldsSetDialog: {
...fieldsSetDialog, tempId: id, templateName, visible: true, salaryAcctRecordId, checkItems: []
}
});
}
});
};
deleteExportTemplate = (ids) => {
Modal.confirm({
title: getLabel(131329, "信息确认"),
content: getLabel(111, "确定要删除吗？"),
onOk: () => {
API.deleteExportTemplate({ ids }).then(({ status, errormsg }) => {
if (status) {
message.success(getLabel(111, "操作成功！"));
this.setState({ selectedRowKeys: [] }, () => this.getExportTemplateList(this.props));
} else {
message.error(errormsg);
}
});
}
});
};
render() {
const { fieldsSetDialog, query, pageInfo, selectedRowKeys, dataSource, columns } = this.state;
const { salaryAcctRecordId } = this.props;
const dialogBodyHeight = this.dialogRef ? this.dialogRef.state.height : 600;
const pagination = {
...pageInfo,
showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
showQuickJumper: true,
showSizeChanger: true,
pageSizeOptions: ["10", "20", "50", "100"],
onShowSizeChange: (current, pageSize) => {
this.setState({
pageInfo: { ...pageInfo, current, pageSize }
}, () => this.getExportTemplateList(this.props));
},
onChange: current => {
this.setState({
pageInfo: { ...pageInfo, current }
}, () => this.getExportTemplateList(this.props));
}
};
const rowSelection = {
selectedRowKeys, onChange: selectedRowKeys => this.setState({ selectedRowKeys })
};
return (
<WeaDialog
{...this.props} hasScroll scalable title={getLabel(111, "导出模板管理")}
ref={dom => this.dialogRef = dom} initLoadCss className="tempManageDialogLayout"
style={{
width: 700, height: 606.6, minHeight: 200, minWidth: 380, maxHeight: "70%",
maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
}}
>
<WeaTab datas={[]} buttons={[
<WeaButtonIcon buttonType="add" type="primary" title={getLabel(111, "添加")}
onClick={() => this.setState({
fieldsSetDialog: {
...fieldsSetDialog, visible: true, tempId: "", templateName: "",
salaryAcctRecordId, checkItems: []
}
})}/>,
<WeaButtonIcon buttonType="del" type="primary" title={getLabel(111, "删除")}
disabled={_.isEmpty(selectedRowKeys)}
onClick={() => this.deleteExportTemplate(selectedRowKeys)}/>,
<WeaInputSearch value={query.templateName}
onChange={val => this.setState({ query: { ...query, templateName: val } })}
onSearch={() => this.setState({
pageInfo: { ...pageInfo, current: 1 }
}, () => this.getExportTemplateList(this.props))}/>
]}/>
<WeaTable dataSource={dataSource} columns={columns} pagination={pagination} rowSelection={rowSelection}
scroll={{ y: `calc(${dialogBodyHeight}px - 148px)` }}/>
<ExpFieldsSetDialog {...fieldsSetDialog}
onCancel={(isRefresh) => this.setState({
fieldsSetDialog: { ...fieldsSetDialog, visible: false, checkItems: [] }
}, () => isRefresh && this.getExportTemplateList(this.props))}/>
</WeaDialog>
);
}
}
export default Index;

8
pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js
View File

@ -398,10 +398,10 @@ export default class PayrollGrant extends React.Component {
<Menu onClick={handleMenuClick}>
<Menu.Item key="3">全部导出</Menu.Item>
<Menu.Item key="4">导出选中</Menu.Item>
{
selectedKey === "1" && salarySendDetailBaseInfo.showPdfBtn &&
<Menu.Item key="5">{getLabel(111, "导出PDF")}</Menu.Item>
}
{/*{*/}
{/* selectedKey === "1" && salarySendDetailBaseInfo.showPdfBtn &&*/}
{/* <Menu.Item key="5">{getLabel(111, "导出PDF")}</Menu.Item>*/}
{/*}*/}
</Menu>
);
let btnDom = [

5
pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js
View File

@ -62,7 +62,8 @@ class Index extends Component {
conditions: _.map(salaryFilesConditions, o => {
if (o.salaryFile) {
return {
...o, items: _.map(adjustSalaryItems, g => {
...o, title: getLabel(o.lanId, o.title), titleHelpful: getLabel(o.titleHelpfulLanId, o.titleHelpful),
items: _.map(adjustSalaryItems, g => {
const otherParams = g.dataType === "number" ? { precision: g.pattern } : {};
return {
colSpan: 3, fieldcol: 14, label: g.name, labelcol: 10, ...otherParams,
@ -73,7 +74,7 @@ class Index extends Component {
};
}
return {
...o, items: _.map(o.items, g => {
...o, title: getLabel(o.lanId, o.title), items: _.map(o.items, g => {
if (getKey(g) === "payStartDate") {
return {
...g, label: getLabel(g.lanId, g.label),

17
pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
View File

@ -43,11 +43,11 @@ export const tabCondition = [
}
];
export const tabList = [
{ viewcondition: "pending", title: getLabel(542689, "待定薪"), showcount: true, groupid: "PENDING" },
{ viewcondition: "fixed", title: getLabel(544638, "发薪员工"), showcount: true, groupid: "FIXED" },
{ viewcondition: "suspend", title: getLabel(542691, "待停薪"), showcount: true, groupid: "SUSPEND" },
{ viewcondition: "stop", title: getLabel(544637, "停薪员工"), showcount: true, groupid: "STOP" },
{ viewcondition: "ext", title: getLabel(542679, "非系统人员"), showcount: true, groupid: "EXT" }
{ viewcondition: "pending", title: "待定薪", lanId: 542689, showcount: true, groupid: "PENDING" },
{ viewcondition: "fixed", title: "发薪员工", lanId: 544638, showcount: true, groupid: "FIXED" },
{ viewcondition: "suspend", title: "待停薪", lanId: 542691, showcount: true, groupid: "SUSPEND" },
{ viewcondition: "stop", title: "停薪员工", lanId: 544637, showcount: true, groupid: "STOP" },
{ viewcondition: "ext", title: "非系统人员", lanId: 542679, showcount: true, groupid: "EXT" }
];
export const renderReqBtns = (selectedKey, salaryImportTypes, onSalaryOpts, showOperateBtn) => {
let reqBtns = [
@ -367,7 +367,7 @@ export const salaryFileSearchConditions = [
export const salaryFilesConditions = [
{
defaultshow: true, title: getLabel(1361, "基本信息"),
col: 3,
col: 3, lanId: 1361,
items: [
{
colSpan: 3,
@ -439,7 +439,7 @@ export const salaryFilesConditions = [
},
{
defaultshow: true, title: getLabel(543329, "发薪设置"),
col: 1,
col: 1,lanId: 543329,
items: [
{
colSpan: 1,
@ -469,7 +469,8 @@ export const salaryFilesConditions = [
{
defaultshow: true, title: getLabel(538004, "薪资档案"),
titleHelpful: getLabel(543330, "提示：显示已生效的最新数据"),
col: 2, salaryFile: true,
titleHelpfulLanId: 543330,
col: 2, salaryFile: true,lanId: 538004,
items: []
}
];

3
pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js
View File

@ -242,6 +242,7 @@ class SalaryFiles extends Component {
salaryFileImpDialog, salaryImportTypes, logDialogVisible, filterConditions
} = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props;
const tabs = _.map(tabList, o => ({ ...o, title: getLabel(o.lanId, o.title) }));
return (
<div className="salary-files-wrapper">
<WeaReqTop
@ -251,7 +252,7 @@ class SalaryFiles extends Component {
buttons={renderReqBtns(selectedKey, salaryImportTypes, this.handleReqBtnsCLick, showOperateBtn)}
replaceTab={
<WeaTab
datas={!showExtEmpsWitch ? _.dropRight(tabList) : tabList} autoCalculateWidth
datas={!showExtEmpsWitch ? _.dropRight(tabs) : tabs} autoCalculateWidth
keyParam="viewcondition" selectedKey={selectedKey} counts={topTabCount} countParam="groupid"
onChange={key => this.setState({ selectedKey: key })}
/>

1
pc4mobx/hrmSalary/pages/reportView/components/index.less
View File

@ -106,6 +106,7 @@
.wea-select .wdb {
word-break: break-all !important;
word-wrap: break-word !important;
white-space: nowrap !important;
}
.wea-select .wea-select-input {

1
pc4mobx/hrmSalary/pages/salaryItem/index.less
View File

@ -139,6 +139,7 @@
.wea-select .wdb {
word-break: break-all !important;
word-wrap: break-word !important;
white-space: nowrap !important;
}
.wea-select .wea-select-input {

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

@ -104,6 +104,7 @@
.wea-select .wdb {
word-break: break-all !important;
word-wrap: break-word !important;
white-space: nowrap !important;
}
.wea-select .wea-select-input {

12
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
View File

@ -54,11 +54,11 @@ export const optTypeEnum = [
}
];
export const tabList = [
{ viewcondition: "1", title: getLabel(542711, "待增员"), showcount: true, groupid: "stayAdd" },
{ viewcondition: "2,3", title: getLabel(542504, "在缴员工"), showcount: true, groupid: "paying" },
{ viewcondition: "3", title: getLabel(542713, "待减员"), showcount: true, groupid: "stayDel" },
{ viewcondition: "4,5", title: getLabel(542505, "停缴员工"), showcount: true, groupid: "stopPay" },
{ viewcondition: "ext", title: getLabel(542679, "非系统人员"), showcount: true, groupid: "ext" }
{ viewcondition: "1", title: "待增员", lanId: 542711, showcount: true, groupid: "stayAdd" },
{ viewcondition: "2,3", title: "在缴员工", lanId: 542504, showcount: true, groupid: "paying" },
{ viewcondition: "3", title: "待减员", lanId: 542713, showcount: true, groupid: "stayDel" },
{ viewcondition: "4,5", title: "停缴员工", lanId: 542505, showcount: true, groupid: "stopPay" },
{ viewcondition: "ext", title: "非系统人员", lanId: 542679, showcount: true, groupid: "ext" }
];
export const welfareTipList = [
{
@ -143,7 +143,7 @@ export const renderDropMenuDatas = (selectedKey, getLabel, showOperateBtn) => {
key: "record",
icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(111, "基数调整记录")
},{
}, {
key: "log",
icon: <i className="iconfont icon-caozuorizhi32"/>,
content: getLabel(545781, "操作日志")

3
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
View File

@ -147,6 +147,7 @@ class Index extends Component {
} = this.state;
const { taxAgentStore: { showOperateBtn } } = this.props;
const tipList = _.find(welfareTipList, o => o.viewcondition === selectedKey).list;
const tabs = _.map(tabList, o => ({ ...o, title: getLabel(o.lanId, o.title) }));
return (
<div className="salary-welfare-archive">
<WeaReqTop
@ -156,7 +157,7 @@ class Index extends Component {
buttons={renderReqBtns(selectedKey, getLabel, this.handleOpenAdvanceSearch, this.handleAdvanceSearch, this.onDropMenuClick, showOperateBtn)}
replaceTab={
<WeaTab
datas={!showExtEmpsWitch ? _.dropRight(tabList) : tabList} autoCalculateWidth
datas={!showExtEmpsWitch ? _.dropRight(tabs) : tabs} autoCalculateWidth
keyParam="viewcondition" selectedKey={selectedKey} counts={topTabCount} countParam="groupid"
onChange={key => this.setState({ selectedKey: key })}
/>

18
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanAdvanceSearchPannel/index.js
View File

@ -5,12 +5,13 @@
* Date: 2024/2/2
*/
import React, { Component } from "react";
import { WeaLocaleProvider } from "ecCom";
import { WeaLocaleProvider, WeaTools } from "ecCom";
import { Button } from "antd";
import { inject, observer } from "mobx-react";
import { getSearchs } from "../../../../../util";
import { searchConditons } from "../../config";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
@inject("programmeStore")
@ -27,7 +28,20 @@ class WelfarePlanAdvanceSearchPannel extends Component {
return (
<React.Fragment>
<div className="wea-advanced-searchsAd">
{getSearchs(planSearchForm, searchConditons, 2, false)}
{getSearchs(planSearchForm, _.map(searchConditons, item => ({
...item, title: getLabel(item.lanId, item.title),
items: _.map(item.items, o => {
if (getKey(o) === "paymentTypeEnum") {
return {
...o, label: getLabel(o.lanId, o.label),
options: _.map(o.options, k => ({ ...k, showname: getLabel(k.lanId, k.showname) }))
};
}
return {
...o, label: getLabel(o.lanId, o.label)
};
})
})), 2, false)}
</div>
<div className="wea-search-buttons">
<div style={{ textAlign: "center" }}>

2
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCopyDialog/index.js
View File

@ -54,7 +54,7 @@ class Index extends Component {
const { programmeStore: { planCopyForm }, conditions } = this.props;
return (
<WeaDialog
{...this.props} style={{ width: 480, height: 46 }} initLoadCss
{...this.props} style={{ width: 480, height: 80 }} initLoadCss
buttons={[
<Button type="primary" onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>
]}

13
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js
View File

@ -48,15 +48,22 @@ class Index extends Component {
this.setState({
planDatas: schemeDetailList,
conditions: _.map(planConditons, item => ({
...item, items: _.map(item.items, o => {
...item, title: getLabel(item.lanId, item.title),
items: _.map(item.items, o => {
if (getKey(o) === "taxAgentIds") {
return {
...o, hide: schemeBatch["sharedType"] === "0" || _.isNil(schemeBatch["sharedType"]),
viewAttr: (schemeBatch["sharedType"] === "1" && showOperateBtn) ? 3 : showOperateBtn ? o.viewAttr : 1,
options: _.map(result, k => ({ key: k.id, showname: k.content }))
options: _.map(result, k => ({ key: k.id, showname: k.content })),
label: getLabel(o.lanId, o.label)
};
} else if (getKey(o) === "paymentType" || getKey(o) === "sharedType") {
return {
...o, label: getLabel(o.lanId, o.label),
options: _.map(o.options, k => ({ ...k, showname: getLabel(k.lanId, k.showname) }))
};
}
return { ...o, viewAttr: showOperateBtn ? o.viewAttr : 1 };
return { ...o, viewAttr: showOperateBtn ? o.viewAttr : 1, label: getLabel(o.lanId, o.label) };
})
}))
}, () => {

14
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js
View File

@ -178,12 +178,18 @@ class Index extends Component {
this.setState({
copyDialog: {
visible: true, copyId: id, copyName: `${schemeName}-${getLabel(77, "复制")}`,
title: `${getLabel(77, "复制")}-${_.find(tabWelfarePlanList, o => o.key === selectedKey).title}`,
title: `${getLabel(77, "复制")}-${
getLabel(_.find(tabWelfarePlanList, o => o.key === selectedKey).lanId, _.find(tabWelfarePlanList, o => o.key === selectedKey).title)
}`,
conditions: welfarePlanCopyConditions[selectedKey]
}
}, () => {
const { copyDialog: { conditions, copyName } } = this.state;
planCopyForm.initFormFields(conditions);
planCopyForm.initFormFields(_.map(conditions, item => ({
...item, items: _.map(item.items, o => {
return { ...o, label: getLabel(o.lanId, o.label) };
})
})));
planCopyForm.updateFields({ [`${selectedKey}_schemeName`]: { value: copyName } });
});
break;
@ -311,7 +317,9 @@ class Index extends Component {
</div>
{
selectedKey === "CUSTOM" &&
<div className="adapt-right"><TipLabel tipList={welfarePlanCustomTipList}/></div>
<div className="adapt-right">
<TipLabel tipList={_.map(welfarePlanCustomTipList, o => getLabel(o.lanId, o.title))}/>
</div>
}
{/*复制方案*/}
<WelfarePlanCopyDialog {...copyDialog} selectedKey={selectedKey}

43
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/config.js
View File

@ -7,15 +7,18 @@ const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
export const tabWelfarePlanList = [
{ key: "SOCIAL_SECURITY", title: getLabel(538967, "社保") },
{ key: "ACCUMULATION_FUND", title: getLabel(538969, "公积金") },
{ key: "OTHER", title: getLabel(542717, "企业年金及其他福利") },
{ key: "CUSTOM", title: getLabel(543151, "自定义福利") }
{ key: "SOCIAL_SECURITY", title: "社保", lanId: 538967 },
{ key: "ACCUMULATION_FUND", title: "公积金", lanId: 538969 },
{ key: "OTHER", title: "企业年金及其他福利", lanId: 542717 },
{ key: "CUSTOM", title: "自定义福利", lanId: 543151 }
];
export const welfarePlanCustomTipList = [
getLabel(544345, "1、可以为社保、公积金、企业年金及其他福利新增自定义的福利项，如：残疾保险等"),
getLabel(544346, "2、新增自定义福利默认启用，社保福利方案中的自定义福利项均未开启缴纳，当前页面的自定义福利项才可以停用；停用后再新增方案时没有该福利项"),
getLabel(544347, "3、自定义福利若要缴纳，需要在方案里填写缴纳相关数据")
{ lanId: 544345, title: "1、可以为社保、公积金、企业年金及其他福利新增自定义的福利项，如：残疾保险等" },
{
lanId: 544346,
title: "2、新增自定义福利默认启用，社保福利方案中的自定义福利项均未开启缴纳，当前页面的自定义福利项才可以停用；停用后再新增方案时没有该福利项"
},
{ lanId: 544347, title: "3、自定义福利若要缴纳，需要在方案里填写缴纳相关数据" }
];
/*
* Author: 黎永顺
@ -40,7 +43,7 @@ export const renderReqBtns = (selectedKey, onSalaryOpts, showOperateBtn, customQ
reqBtns[reqBtns.length - 1] = <WeaSelect style={{ width: 220 }} onChange={v => onSalaryOpts("SEARCH", v)}
value={customQuery}
options={[
{ key: "", showname: getLabel(111, "全部"), selected: true },
{ key: "", showname: getLabel(332, "全部"), selected: true },
{ key: "SOCIAL_SECURITY", showname: getLabel(538967, "社保") },
{ key: "ACCUMULATION_FUND", showname: getLabel(538969, "公积金") },
{ key: "OTHER", showname: getLabel(542717, "企业年金及其他福利") }
@ -63,6 +66,7 @@ export const searchConditons = [
fieldcol: 16,
isQuickSearch: true,
label: getLabel(33162, "方案名称"),
lanId: 33162,
labelcol: 8,
value: "",
viewAttr: 2
@ -74,16 +78,18 @@ export const searchConditons = [
fieldcol: 16,
isQuickSearch: true,
label: getLabel(543163, "缴纳类型"),
lanId: 543163,
labelcol: 8,
value: "",
options: [
{ key: "SCHEME_TOWN", showname: getLabel(19702, "城镇") },
{ key: "SCHEME_VILLAGE", showname: getLabel(19703, "农村") }
{ key: "SCHEME_TOWN", showname: getLabel(19702, "城镇"), lanId: 19702 },
{ key: "SCHEME_VILLAGE", showname: getLabel(19703, "农村"), lanId: 19703 }
],
viewAttr: 2
}
],
title: getLabel(82743, "基础信息"),
lanId: 82743,
defaultshow: true
}
];
@ -96,6 +102,7 @@ export const welfarePlanCopyConditions = {
domkey: ["SOCIAL_SECURITY_schemeName"],
fieldcol: 16,
label: getLabel(111, "社保名称"),
lanId: 111,
labelcol: 8,
value: "",
rules: "required|string",
@ -115,6 +122,7 @@ export const welfarePlanCopyConditions = {
domkey: ["ACCUMULATION_FUND_schemeName"],
fieldcol: 16,
label: getLabel(111, "公积金名称"),
lanId: 111,
labelcol: 8,
value: "",
rules: "required|string",
@ -134,6 +142,7 @@ export const welfarePlanCopyConditions = {
domkey: ["OTHER_schemeName"],
fieldcol: 16,
label: getLabel(111, "企业年金及其他福利名称"),
lanId: 111,
labelcol: 8,
value: "",
rules: "required|string",
@ -154,10 +163,11 @@ export const planConditons = [
domkey: ["paymentType"],
fieldcol: 14,
label: getLabel(543163, "缴纳类型"),
lanId: 543163,
labelcol: 6,
options: [
{ key: "SCHEME_TOWN", showname: getLabel(19702, "城镇") },
{ key: "SCHEME_VILLAGE", showname: getLabel(19703, "农村") }
{ key: "SCHEME_TOWN", showname: getLabel(19702, "城镇"), lanId: 19702 },
{ key: "SCHEME_VILLAGE", showname: getLabel(19703, "农村"), lanId: 19703 }
],
value: "SCHEME_TOWN",
rules: "required|string",
@ -168,6 +178,7 @@ export const planConditons = [
domkey: ["schemeName"],
fieldcol: 14,
label: getLabel(33162, "方案名称"),
lanId: 33162,
labelcol: 6,
value: "",
rules: "required|string",
@ -178,10 +189,11 @@ export const planConditons = [
domkey: ["sharedType"],
fieldcol: 14,
label: getLabel(543164, "可见性"),
lanId: 543164,
labelcol: 6,
options: [
{ key: "0", showname: getLabel(111, "公共") },
{ key: "1", showname: getLabel(111, "私有") }
{ key: "0", showname: getLabel(111, "公共"), lanId: 111 },
{ key: "1", showname: getLabel(111, "私有"), lanId: 111 }
],
value: "0",
rules: "required|string",
@ -192,6 +204,7 @@ export const planConditons = [
domkey: ["taxAgentIds"],
fieldcol: 14,
label: getLabel(543165, "可见性范围"),
lanId: 543165,
labelcol: 6,
multiple: true,
options: [],
@ -204,12 +217,14 @@ export const planConditons = [
domkey: ["remarks"],
fieldcol: 14,
label: getLabel(536726, "备注"),
lanId: 536726,
labelcol: 6,
value: "",
viewAttr: 2
}
],
title: getLabel(82743, "基础信息"),
lanId: 82743,
defaultshow: true
}
];

4
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js
View File

@ -13,6 +13,7 @@ import WelfarePlanList from "./components/welfarePlanList";
import LogDialog from "../../../components/logViewModal";
import cs from "classnames";
import "./index.less";
import { tabList } from "../welfareArchive/config";
const getLabel = WeaLocaleProvider.getLabel;
@ -64,12 +65,13 @@ class Index extends Component {
render() {
const { taxAgentStore: { showOperateBtn } } = this.props;
const { logDialogVisible, filterConditions, selectedKey, showSearchAd, isQuery, customQuery } = this.state;
const tabs = _.map(tabWelfarePlanList, o => ({ ...o, title: getLabel(o.lanId, o.title) }));
return (
<div className="salary-welfare-plan-wrapper">
<WeaReqTop
title={getLabel(538000, "社保福利方案")} buttonSpace={10} icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D" showDropIcon dropMenuDatas={renderDropMenuDatas(selectedKey, showOperateBtn)}
onDropMenuClick={this.onDropMenuClick} tabDatas={tabWelfarePlanList} selectedKey={selectedKey}
onDropMenuClick={this.onDropMenuClick} tabDatas={tabs} selectedKey={selectedKey}
onChange={selectedKey => this.setState({ selectedKey, showSearchAd: false, customQuery: "" })}
buttons={renderReqBtns(selectedKey, this.handleReqBtnsCLick, showOperateBtn, customQuery)}
>

1
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less
View File

@ -210,6 +210,7 @@
.wea-select .wdb {
word-break: break-all !important;
word-wrap: break-word !important;
white-space: nowrap !important;
}
.wea-select .wea-select-input {

2
pc4mobx/hrmSalary/stores/calculate.js
View File

@ -14,6 +14,8 @@ export class calculateStore {
@observable calculateForm = new WeaForm(); //薪资核算重构-核算form
@observable batchUpdateForm = new WeaForm(); //批量更新薪资项目-批量更新form
@action initBatchUpdateForm = () => this.batchUpdateForm = new WeaForm();
@observable tempForm = new WeaForm(); //导出模板设置-模板form
@action initTempForm = () => this.tempForm = new WeaForm();
@observable tableStore = new TableStore(); // new table
@observable form = new WeaForm(); // nrew 一个form