From 5009cd59557d52a2bd4e90f55e6c1cf395be14b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 15 Aug 2024 15:43:52 +0800 Subject: [PATCH] hotfix/2.15.1.2407.01 --- .../pages/salaryFile/salaryArchiveEditAdjLogRecord.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js b/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js index a46b7129..6975ee63 100644 --- a/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js +++ b/pc4mobx/hrmSalary/pages/salaryFile/salaryArchiveEditAdjLogRecord.js @@ -16,7 +16,7 @@ import { } from "../../apis/archive"; import { inject, observer } from "mobx-react"; import { adjCondition } from "./columns"; -import { getDomkes, getSearchs } from "../../util"; +import { getDomkes, getSearchs, toDecimal_n } from "../../util"; import moment from "moment"; const { getLabel } = WeaLocaleProvider; @@ -149,7 +149,10 @@ class SalaryArchiveEditAdjLogRecordDialog extends Component { let payload = { ...adjForm.getFormParams(), salaryArchiveId, effectiveTime: moment(new Date(adjForm.getFormParams().effectiveTime)).format("YYYY-MM-DD"), - salaryArchiveItems: _.map(list, o => ({ salaryItemId: o.salaryItem, adjustValue: o.adjustAfter })) + salaryArchiveItems: _.map(list, o => ({ + salaryItemId: o.salaryItem, + adjustValue: o.dataType === "number" ? toDecimal_n(o.adjustAfter, o.pattern) : o.adjustAfter + })) }; if (salaryArchiveItemId) { payload = { ...payload, canOperator, salaryArchiveItemId };