From 272e45d3e5e734e1867cca77272cba43042ccaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 20 Mar 2024 09:10:06 +0800 Subject: [PATCH] =?UTF-8?q?hotfix/2.12.1.2403.02=20=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E8=B0=83=E8=96=AA=EF=BC=8C=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BD=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/salaryFile/salaryArchiveEditAdjLogRecord.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 {