From b2ce11f50b7abb966e0d0fea5e39e3e9e3356a8b Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 12 Sep 2025 09:38:02 +0800 Subject: [PATCH] =?UTF-8?q?custom/=E4=B8=8A=E6=B5=B7=E6=B8=AF=E6=B9=BE?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/dataAcquisition/attendance/columns.js | 9 ++++++--- .../attendance/components/attendanceRefrenceDataModal.js | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js index 5617ce32..e417ed17 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js @@ -186,7 +186,8 @@ export const reFrenceConditions = [ domkey: ["salaryYearMonth"], fieldcol: 18, rules: "required|string", - label: getLabel(542604, "薪资所属月"), + label: "薪资所属月", + lanId: 542604, labelcol: 6, value: "", viewAttr: 3 @@ -197,7 +198,8 @@ export const reFrenceConditions = [ domkey: ["salarySobId"], fieldcol: 18, isQuickSearch: false, - label: getLabel(538010, "薪资账套"), + label: "薪资账套", + lanId: 538010, labelcol: 6, valueList: [], options: [], @@ -209,7 +211,8 @@ export const reFrenceConditions = [ conditionType: "INPUT", domkey: ["description"], fieldcol: 18, - label: getLabel(536726, "备注"), + label: "备注", + lanId: 536726, labelcol: 6, value: "", viewAttr: 2 diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js index c7f0f9eb..55fa486a 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js @@ -57,9 +57,9 @@ class AttendanceRefrenceDataModal extends Component { items: _.map(items, child => { const { domkey } = child; if (domkey[0] === "salarySobId") { - return { ...child, options: _.map(data, it => ({ key: it.id, showname: it.content })) }; + return { ...child, label:getLabel(child.lanId, child.label), options: _.map(data, it => ({ key: it.id, showname: it.content })) }; } - return { ...child }; + return { ...child, label:getLabel(child.lanId, child.label) }; }) }; })