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

feature/2.15.1.2407.01-浮动薪酬

This commit is contained in:
黎永顺 2024-08-12 09:56:58 +08:00
parent 8c038c8d74
commit 4a5f5b6e7a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
View File

@ -46,7 +46,7 @@ class Index extends Component {
..._.map(salaryFileConditions, item => ({
...item,
items: _.map(item.items, o => ({
...o, viewAttr: !_.isEmpty(detail) ? 1 : 2, label: getLabel(o.lanId, o.label),
...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
value: detail[getKey(o)] || ""
}))
})),
@ -83,7 +83,7 @@ class Index extends Component {
if (!_.isNaN(parseInt(cur))) {
return { ...pre, itemValueList: [{ variableItemId: cur, itemValue: payload[cur] }] };
}
return { ...pre, [cur]: payload[cur] };
return { ...pre, [cur]: payload[cur], itemValueList: [...pre.itemValueList] };
}, {});
};
save = () => {
@ -91,7 +91,7 @@ class Index extends Component {
VSSalaryFileForm.validateForm().then(f => {
if (f.isValid) {
const payload = VSSalaryFileForm.getFormParams();
console.log(payload);
console.log(payload, this.convertPayload(payload));
return;
this.setState({ loading: true });
API.createVariableSalary({ ...payload, id })

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

@ -72,7 +72,7 @@ class Index extends Component {
{
title: getLabel(111, "薪资档案"), key: "salaryFile",
buttons: showOperateBtn ? [
// <Button type="primary" onClick={() => this.handleOperate("create")}>{getLabel(111, "新建")}</Button>,
<Button type="primary" onClick={() => this.handleOperate("create")}>{getLabel(111, "新建")}</Button>,
<Button type="ghost" onClick={() => this.handleOperate("import")}>{getLabel(111, "导入")}</Button>,
<Button type="primary" onClick={() => this.handleOperate("export")}>{getLabel(111, "导出")}</Button>,
<WeaDatePicker format="YYYY-MM" value={salaryMonth}