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) }; }) }; })