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

产品-工资单模板添加发放薪资项目名称修改的功能

This commit is contained in:
黎永顺 2023-07-20 18:26:34 +08:00
parent f7cd085c92
commit 8e399f979a
3 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pc4mobx/hrmSalary/pages/payroll/index.js
View File

@ -64,7 +64,12 @@ export default class Payroll extends React.Component {
getReplenishForm = (isEdit = false, params = {}) => {
const { payrollStore } = this.props;
const { templateBaseData, salaryTemplateShowSet, setReplenishSalaryTemplateSalaryItemSet, setSalaryBillItemNameSet } = payrollStore;
const {
templateBaseData,
salaryTemplateShowSet,
setReplenishSalaryTemplateSalaryItemSet,
setSalaryBillItemNameSet
} = payrollStore;
if (!salaryTemplateShowSet.theme && !isEdit) {
Modal.warning({
title: "信息确认",
@ -77,12 +82,12 @@ export default class Payroll extends React.Component {
if (!isEdit) {
this.setState({ currentStep: this.state.currentStep + 1 }, () => {
setReplenishSalaryTemplateSalaryItemSet(data.replenishSalaryTemplateSalaryItemSet);
setSalaryBillItemNameSet(data.salaryBillItemNameSet)
setSalaryBillItemNameSet(data.salaryBillItemNameSet);
window.localStorage.setItem("salary-showset", JSON.stringify(salaryTemplateShowSet));
});
} else {
setReplenishSalaryTemplateSalaryItemSet(data.replenishSalaryTemplateSalaryItemSet);
setSalaryBillItemNameSet(data.salaryBillItemNameSet)
setSalaryBillItemNameSet(data.salaryBillItemNameSet);
window.localStorage.setItem("salary-showset", JSON.stringify(salaryTemplateShowSet));
}
}
@ -263,7 +268,9 @@ export default class Payroll extends React.Component {
setTemplateTableSelectedRowKeys,
deletePayroll,
templateBaseData,
setTemplateTablePageInfo
setTemplateTablePageInfo,
setSalaryBillItemNameSetting,
salaryBillItemNameSetting
} = payrollStore;
const { currentStep, selectedTab, templateSearchValue, templateSelect, startDate, endDate } = this.state;
if (!hasRight && !loading) { // 无权限处理
@ -467,10 +474,16 @@ export default class Payroll extends React.Component {
customOperate={
currentStep === 0 ? [
<Button type="primary" onClick={() => {
setSalaryBillItemNameSetting(_.map(salaryBillItemNameSetting, it => {
return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
}));
nextStep();
}}>下一步</Button>
] : currentStep === 1 ? [
<Button type="default" onClick={() => {
setSalaryBillItemNameSetting(_.map(salaryBillItemNameSetting, it => {
return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
}));
prevStep();
}}>上一步</Button>,
<Button type="primary" onClick={() => this.getReplenishForm()}>下一步</Button>,
@ -479,6 +492,9 @@ export default class Payroll extends React.Component {
}}>预览</Button>
] : currentStep === 2 ? [
<Button type="default" onClick={() => {
setSalaryBillItemNameSetting(_.map(salaryBillItemNameSetting, it => {
return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
}));
prevStep();
}}>上一步</Button>,
<Button type="primary" onClick={this.handleSave}>保存</Button>
@ -541,6 +557,9 @@ export default class Payroll extends React.Component {
}
subItemChange={(selectedTab) => {
this.setState({ selectedTab: Number(selectedTab) }, () => {
setSalaryBillItemNameSetting(_.map(salaryBillItemNameSetting, it => {
return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
}));
if (this.state.selectedTab === 2) this.getReplenishForm(true, { id: this.state.templateCurrentId });
});
}}

28
pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
View File

@ -242,7 +242,7 @@ class SalaryItemSettings extends Component {
})
};
})
});
}, () => document.getElementById("salaryItemInput") && document.getElementById("salaryItemInput").focus());
};
handleChangeSalaryItemShowName = (item, field, name) => {
const { groupId } = item, { salaryItemId } = field, { dataList, itemShowNamesetting } = this.state;
@ -253,7 +253,7 @@ class SalaryItemSettings extends Component {
...item,
items: _.map(item.items, child => {
if (child.salaryItemId === salaryItemId) {
return { ...child, name };
return { ...child, salaryItemShowName: name, name };
}
return { ...child };
})
@ -306,23 +306,29 @@ class SalaryItemSettings extends Component {
return <div className="salaryItemList">
<div className="salaryItem"
title={
(item.groupId !== "111111111111111111" && (!_.isEmpty(salaryBillItemNameObj) || (filed.name !== filed.originName))) ?
`${salaryBillItemNameObj.salaryItemShowName || filed.name}(${filed.originName})` :
filed.name
(item.groupId !== "111111111111111111" && (!_.isEmpty(salaryBillItemNameObj) || (filed.salaryItemShowName !== filed.originName))) ?
`${filed.salaryItemShowName}(${filed.originName})` :
filed.salaryItemShowName
}
>
{
filed.viewAttr === 2 ?
<WeaInput value={filed.name}
onBlur={() => this.handleEditSalaryItemName(item, filed, 1)}
onChange={(val) => this.handleChangeSalaryItemShowName(item, filed, val)}
<WeaInput
value={
item.groupId !== "111111111111111111" ?
filed.salaryItemShowName :
filed.name
}
id="salaryItemInput"
onBlur={() => this.handleEditSalaryItemName(item, filed, 1)}
onChange={(val) => this.handleChangeSalaryItemShowName(item, filed, val)}
/> :
<div className="salaryItemName"
onClick={() => this.handleEditSalaryItemName(item, filed, 2)}>
{
(item.groupId !== "111111111111111111" && (!_.isEmpty(salaryBillItemNameObj) || (filed.name !== filed.originName))) ?
`${salaryBillItemNameObj.salaryItemShowName || filed.name}(${filed.originName})` :
filed.name
(item.groupId !== "111111111111111111" && (!_.isEmpty(salaryBillItemNameObj) || (filed.salaryItemShowName !== filed.originName))) ?
`${filed.salaryItemShowName}(${filed.originName})` :
filed.salaryItemShowName
}
</div>
}

3
pc4mobx/hrmSalary/stores/payroll.js
View File

@ -293,6 +293,9 @@ export class payrollStore {
if (res.status) {
message.success("保存成功");
this.getPayrollTemplateList();
this.setSalaryBillItemNameSetting(_.map(this.salaryBillItemNameSetting, it => {
return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
}));
resolve();
} else {
message.error(res.errormsg || "保存失败");