diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js index a091c42f..a46b7129 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js @@ -63,7 +63,8 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { salaryArchiveItemDetail: { ...salaryArchiveItemDetail, list: _.map(salaryArchiveItemDetail.list, o => ({ - ...o, dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === o.salaryItem).dataType + ...o, dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === o.salaryItem).dataType, + pattern: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === o.salaryItem).pattern })) }, conditions: _.map(adjCondition, item => { @@ -108,7 +109,8 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { if (o.salaryItem === salaryItemId) { return { ...o, salaryBefore: data, - dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === salaryItemId).dataType + dataType: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === salaryItemId).dataType, + pattern: _.find(salaryArchiveItemDetail.salaryItemList, g => g.id === salaryItemId).pattern }; } return { ...o }; @@ -238,7 +240,7 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { ...o, render: (__, record) => { if (record.dataType === "number") { return this.handleChangeAdjustAfter(record, v)} />; } else {