From 83f77d4e16e3efba6c154d7aeda7224f55b1840f 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, 30 Nov 2023 16:42:46 +0800 Subject: [PATCH] =?UTF-8?q?feature/V2-dev=E5=90=88=E5=B9=B6=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/salaryItem/columns.js | 4 ++-- pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js index 28406497..fc71db75 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js @@ -91,7 +91,7 @@ export const salaryItemFields = [ type: "SWITCH", viewAttr: 2, tip: getLabel(544275, "提示:开启后,在薪资账套中添加该项目时,默认勾选隐藏且在核算时隐藏该薪资项目,可在具体薪资账套中设置是否隐藏"), - lanId: 544275, + lanId: 544274, tipLanId: 543298 }, { @@ -135,7 +135,7 @@ export const salaryItemFields = [ { key: "formulaContent", label: getLabel(18125, "公式"), - type: "INPUT", + type: "INPUT", isLan: false, viewAttr: 2, tip: "", lanId: 18125 }, diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js index d5472256..d3e14e8b 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js @@ -140,13 +140,17 @@ class SalaryItemForm extends Component { { _.map(salaryItemFieldsList, item => { - const { key, label, type, viewAttr, tip, tipLanId, options, display = true, multiple = false } = item; + const { + key, label, type, viewAttr, tip, tipLanId, options, + display = true, multiple = false, isLan = true + } = item; const value = !_.isNil(request[key]) ? request[key].toString() : ""; return { (type === "INPUT" && display) ? (key === "originSqlContent" || key === "originFormulaContent") && onShowFormal(request["name"])} onChange={v => this.handleChangeSalaryFiledItems(key, v)}/> : (type === "SWITCH" && display) ? @@ -179,7 +183,7 @@ class SalaryItemForm extends Component { : (type === "TEXTAREA" && display) ? - this.handleChangeSalaryFiledItems(key, v)}/> : (type === "INPUTNUMBER" && display) ?