diff --git a/klp-ui/src/api/wms/employeeChange.js b/klp-ui/src/api/wms/employeeChange.js new file mode 100644 index 00000000..3330b33f --- /dev/null +++ b/klp-ui/src/api/wms/employeeChange.js @@ -0,0 +1,64 @@ +import request from '@/utils/request' + +// 查询员工异动（入职/离职）列表 +export function listEmployeeChange(query) { + return request({ + url: '/wms/employeeChange/list', + method: 'get', + params: query + }) +} + +// 查询员工异动（入职/离职）详细 +export function getEmployeeChange(changeId) { + return request({ + url: '/wms/employeeChange/' + changeId, + method: 'get' + }) +} + +// 新增员工异动（入职/离职） +export function addEmployeeChange(data) { + return request({ + url: '/wms/employeeChange', + method: 'post', + data: data + }) +} + +// 修改员工异动（入职/离职） +export function updateEmployeeChange(data) { + return request({ + url: '/wms/employeeChange', + method: 'put', + data: data + }) +} + +// 删除员工异动（入职/离职） +export function delEmployeeChange(changeId) { + return request({ + url: '/wms/employeeChange/' + changeId, + method: 'delete' + }) +} + +// 员工入职 +export function employeeEntry(data) { + return request({ + url: '/wms/employeeChange/entry', + method: 'post', + data: data + }) +} + +/** + * 员工离职 + */ +export function employeeLeave(data) { + return request({ + url: '/wms/employeeChange/leave', + method: 'post', + data: data + }) +} diff --git a/klp-ui/src/api/wms/pendingAction.js b/klp-ui/src/api/wms/pendingAction.js index 00cb2f24..c0aba021 100644 --- a/klp-ui/src/api/wms/pendingAction.js +++ b/klp-ui/src/api/wms/pendingAction.js @@ -85,6 +85,10 @@ export function updatePendingAction(data) { if (payload.completeTime) { payload.completeTime = parseDate(payload.completeTime) } + if (payload.scanTime) { + // 扫码日期格式化为yyyy-MM-dd'T'HH:mm:ss.SSSX + payload.scanTime = parseDate(payload.scanTime).replace(' ', 'T') + '.000Z' + } return request({ url: '/wms/coilPendingAction', method: 'put', diff --git a/klp-ui/src/views/wms/coil/merge/acid.vue b/klp-ui/src/views/wms/coil/merge/acid.vue new file mode 100644 index 00000000..11dec624 --- /dev/null +++ b/klp-ui/src/views/wms/coil/merge/acid.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/delivery/components/detailTable.vue b/klp-ui/src/views/wms/delivery/components/detailTable.vue index c684bf12..643d7775 100644 --- a/klp-ui/src/views/wms/delivery/components/detailTable.vue +++ b/klp-ui/src/views/wms/delivery/components/detailTable.vue @@ -264,6 +264,7 @@ export default { rawMaterialFactory: coil.manufacturer, coilNo: coil.currentCoilNo, specification: coil.specification, + settlementType: '卷重结算', material: coil.material, quantity: 1, weight: coil.netWeight, @@ -278,7 +279,7 @@ export default { productName: undefined, edgeType: undefined, packaging: undefined, - settlementType: undefined, + settlementType: '卷重结算', rawMaterialFactory: undefined, coilNo: undefined, specification: undefined, @@ -358,6 +359,7 @@ export default { coilId: coil.coilId, productName: coil.itemName, edgeType: coil.trimmingRequirement, + settlementType: '卷重结算', packaging: coil.packagingRequirement, rawMaterialFactory: coil.manufacturer, coilNo: coil.currentCoilNo, diff --git a/klp-ui/src/views/wms/hrm/employeeInfo/index.vue b/klp-ui/src/views/wms/hrm/employeeInfo/index.vue index 34c1627f..8e8407a7 100644 --- a/klp-ui/src/views/wms/hrm/employeeInfo/index.vue +++ b/klp-ui/src/views/wms/hrm/employeeInfo/index.vue @@ -1,53 +1,32 @@