diff --git a/klp-ui/src/api/wms/attendance.js b/klp-ui/src/api/wms/attendance.js index d1d4090c9..402a8d202 100644 --- a/klp-ui/src/api/wms/attendance.js +++ b/klp-ui/src/api/wms/attendance.js @@ -63,6 +63,19 @@ export function exportAttendanceReport(params) { url: '/wms/attendanceRecords/exportReport', method: 'post', params: params, - responseType: 'blob' + responseType: 'blob', + // enames 是数组,需要特殊序列化避免逗号被二次编码 + paramsSerializer: params => { + const searchParams = new URLSearchParams(); + Object.keys(params).forEach(key => { + const val = params[key]; + if (Array.isArray(val)) { + searchParams.append(key, val.join(',')); + } else if (val !== undefined && val !== null && val !== '') { + searchParams.append(key, val); + } + }); + return searchParams.toString(); + } }) } diff --git a/klp-ui/src/api/wms/employeeInfo.js b/klp-ui/src/api/wms/employeeInfo.js index ba694c670..0e6d4124a 100644 --- a/klp-ui/src/api/wms/employeeInfo.js +++ b/klp-ui/src/api/wms/employeeInfo.js @@ -42,3 +42,20 @@ export function delEmployeeInfo(infoId) { method: 'delete' }) } + +// 获取所有不重复的部门名称 +export function getDepts() { + return request({ + url: '/wms/employeeInfo/depts', + method: 'get' + }) +} + +// 根据部门查询在职员工 +export function getEmployeesByDept(dept) { + return request({ + url: '/wms/employeeInfo/employeesByDept', + method: 'get', + params: { dept } + }) +} diff --git a/klp-ui/src/views/wms/hrm/attendance/sync.vue b/klp-ui/src/views/wms/hrm/attendance/sync.vue index 6253c0caf..821b4a853 100644 --- a/klp-ui/src/views/wms/hrm/attendance/sync.vue +++ b/klp-ui/src/views/wms/hrm/attendance/sync.vue @@ -211,7 +211,14 @@ - + + + + + + + +