diff --git a/klp-ui/src/api/wms/employeeInfo.js b/klp-ui/src/api/wms/employeeInfo.js new file mode 100644 index 00000000..ba694c67 --- /dev/null +++ b/klp-ui/src/api/wms/employeeInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询员工信息列表 +export function listEmployeeInfo(query) { + return request({ + url: '/wms/employeeInfo/list', + method: 'get', + params: query + }) +} + +// 查询员工信息详细 +export function getEmployeeInfo(infoId) { + return request({ + url: '/wms/employeeInfo/' + infoId, + method: 'get' + }) +} + +// 新增员工信息 +export function addEmployeeInfo(data) { + return request({ + url: '/wms/employeeInfo', + method: 'post', + data: data + }) +} + +// 修改员工信息 +export function updateEmployeeInfo(data) { + return request({ + url: '/wms/employeeInfo', + method: 'put', + data: data + }) +} + +// 删除员工信息 +export function delEmployeeInfo(infoId) { + return request({ + url: '/wms/employeeInfo/' + infoId, + method: 'delete' + }) +} diff --git a/klp-ui/src/components/EmployeeSelector/index.vue b/klp-ui/src/components/EmployeeSelector/index.vue new file mode 100644 index 00000000..6e80e7a4 --- /dev/null +++ b/klp-ui/src/components/EmployeeSelector/index.vue @@ -0,0 +1,362 @@ + + + + + + + {{ displayText }} + + + + + + + + + + + + + 已选员工 ({{ selectedEmployees.length }}) + + {{ employee.name }} ({{ employee.dept }}) + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/apply/goout.vue b/klp-ui/src/views/wms/hrm/apply/goout.vue index 6b295bcc..30923a47 100644 --- a/klp-ui/src/views/wms/hrm/apply/goout.vue +++ b/klp-ui/src/views/wms/hrm/apply/goout.vue @@ -21,8 +21,7 @@ - + - - - - - + @@ -129,15 +124,15 @@ import { getOutRequest, addOutRequest, updateOutRequest } from "@/api/wms/outReq import { listApproval, updateApproval } from "@/api/wms/approval" import { listDept } from "@/api/wms/dept" import FileUpload from '@/components/FileUpload' -import DictSelect from '@/components/DictSelect' +import EmployeeSelector from '@/components/EmployeeSelector' import OutLabelPrinter from '../components/outLabelPrinter' export default { name: 'LeaveApply', - dicts: ['hrm_leave_shift', 'hrm_out_type', 'hrm_department', 'hrm_leave_employee'], + dicts: ['hrm_leave_shift', 'hrm_out_type', 'hrm_department'], components: { FileUpload, - DictSelect, + EmployeeSelector, OutLabelPrinter }, data() { diff --git a/klp-ui/src/views/wms/hrm/apply/leave.vue b/klp-ui/src/views/wms/hrm/apply/leave.vue index 0b8b64b1..c5d1f738 100644 --- a/klp-ui/src/views/wms/hrm/apply/leave.vue +++ b/klp-ui/src/views/wms/hrm/apply/leave.vue @@ -21,8 +21,7 @@ - + @@ -104,11 +103,7 @@ - - - - - + @@ -155,14 +150,14 @@ import { getLeaveRequest, addLeaveRequest, updateLeaveRequest } from "@/api/wms/ import { listApproval, updateApproval } from "@/api/wms/approval" import { listDept } from "@/api/wms/dept" import FileUpload from '@/components/FileUpload' -import DictSelect from '@/components/DictSelect' +import EmployeeSelector from '@/components/EmployeeSelector' export default { name: 'LeaveApply', - dicts: ['hrm_leave_shift', 'hrm_leave_type', 'hrm_department', 'hrm_leave_employee'], + dicts: ['hrm_leave_shift', 'hrm_leave_type', 'hrm_department'], components: { FileUpload, - DictSelect + EmployeeSelector }, data() { return { diff --git a/klp-ui/src/views/wms/hrm/employeeInfo/index.vue b/klp-ui/src/views/wms/hrm/employeeInfo/index.vue new file mode 100644 index 00000000..34c1627f --- /dev/null +++ b/klp-ui/src/views/wms/hrm/employeeInfo/index.vue @@ -0,0 +1,379 @@ + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + 新增 + + + 修改 + + + 删除 + + + 导出 + + + + + + + + + + + + + + + + + + + {{ parseTime(scope.row.entryTime, '{y}-{m}-{d}') }} + + + + + + + + + 修改 + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-ui/src/views/wms/hrm/records/meal.vue b/klp-ui/src/views/wms/hrm/records/meal.vue index 06d297aa..25c91a52 100644 --- a/klp-ui/src/views/wms/hrm/records/meal.vue +++ b/klp-ui/src/views/wms/hrm/records/meal.vue @@ -34,7 +34,7 @@ - + 搜索 @@ -110,11 +110,7 @@ - - - - - + {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }} @@ -163,18 +159,18 @@ - + ({{ form.dineInPeople || 0 }}人) - + ({{ form.takeoutPeople || 0 }}人) - + @@ -191,11 +187,12 @@