From 823788e53164cfc806867ac04e6113c54315edcf 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, 19 Jun 2024 11:24:59 +0800 Subject: [PATCH] hotfix/2.14.2.2406.02 --- pc4mobx/hrmSalary/pages/salaryItem/columns.js | 1 + pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js index 281fa6ec..b2cae4bd 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js @@ -133,6 +133,7 @@ export const salaryItemFields = [ label: "默认值", type: "INPUT", viewAttr: 2, + precision: 2, tip: "" }, { diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js index 19913c32..98a869e3 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js @@ -122,6 +122,8 @@ class SalaryItemForm extends Component { return { ...item, type: v === "number" ? "INPUTNUMBER" : "INPUT" }; } else if (key === "valueType" && item.key === "defaultValue") { return { ...item, display: v === "1" }; + } else if (key === "pattern" && item.key === "defaultValue") { + return { ...item, precision: parseInt(v) }; } else if (key === "valueType" && (item.key === "originSqlContent" || item.key === "originFormulaContent")) { return { ...item, @@ -148,7 +150,7 @@ class SalaryItemForm extends Component { { _.map(salaryItemFieldsList, item => { - const { key, label, type, viewAttr, tip, options, display = true, multiple = false } = item; + const { key, label, type, viewAttr, tip, options, display = true, multiple = false, precision = 0 } = item; const value = !_.isNil(request[key]) ? request[key].toString() : ""; return { @@ -181,7 +183,7 @@ class SalaryItemForm extends Component { (type === "INPUTNUMBER" && display) ? - this.handleChangeSalaryFiledItems(key, v)}/> {key === "width" && display &&