diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
index f38f45a4..ce530850 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
@@ -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 })
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/index.js b/pc4mobx/hrmSalary/pages/variableSalary/index.js
index ff883269..4210d4c1 100644
--- a/pc4mobx/hrmSalary/pages/variableSalary/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/index.js
@@ -72,7 +72,7 @@ class Index extends Component {
{
title: getLabel(111, "薪资档案"), key: "salaryFile",
buttons: showOperateBtn ? [
- // ,
+ ,
,
,