diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js index d4eaf520..9e7b184d 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js @@ -85,6 +85,8 @@ class Index extends Component { viewAttr: (runStatuses === "stop" || !showOperateBtn) ? 1 : (runStatuses === "suspend" && showOperateBtn) ? 3 : g.viewAttr, rules: (runStatuses === "suspend" && showOperateBtn) ? "required|string" : "" }; + } else if (getKey(g) === "firstPayDate" || getKey(g) === "lastPayDate") { + return { ...g, label: getLabel(g.lanId, g.label), viewAttr: runStatuses === "stop" ? 1 : 2 }; } return { ...g, label: getLabel(g.lanId, g.label) @@ -110,11 +112,11 @@ class Index extends Component { } = this.props; const [salaryForm] = await Promise.all([salaryFileForm.validateForm()]); if (salaryForm.isValid) { - const { payStartDate, payEndDate, ...extraParams } = salaryForm.getFormParams(); + const { payStartDate, payEndDate, firstPayDate, lastPayDate, ...extraParams } = salaryForm.getFormParams(); const payload = { //status-非系统人员保存与定薪人员一样 salaryArchiveId, status: _.toUpper(runStatuses === "ext" ? "fixed" : runStatuses), - payStartDate, payEndDate, + payStartDate, payEndDate, firstPayDate, lastPayDate, salaryArchiveItems: _.map(salaryArchiveItems, o => ({ salaryItemId: o.salaryItemId, adjustValue: (o.dataType === "number" && (extraParams[o.salaryItemId] || extraParams[o.salaryItemId] === 0)) ? toDecimal_n(extraParams[o.salaryItemId], o.pattern || 2) : extraParams[o.salaryItemId] diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js index a8b4dc15..98d86cda 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js @@ -444,6 +444,28 @@ export const salaryFilesConditions = [ labelcol: 8, value: "", viewAttr: 2 + }, + { + colSpan: 1, + conditionType: "DATEPICKER", + domkey: ["firstPayDate"], + fieldcol: 16, + label: "首次薪资发放日期", + lanId: 111, + labelcol: 8, + value: "", + viewAttr: 2 + }, + { + colSpan: 1, + conditionType: "DATEPICKER", + domkey: ["lastPayDate"], + fieldcol: 16, + label: "末次薪资发放日期", + lanId: 111, + labelcol: 8, + value: "", + viewAttr: 2 } ] },