diff --git a/apps/hand-factory/api/wms/pendingAction.js b/apps/hand-factory/api/wms/pendingAction.js index 683886a..3f55787 100644 --- a/apps/hand-factory/api/wms/pendingAction.js +++ b/apps/hand-factory/api/wms/pendingAction.js @@ -1,5 +1,23 @@ import request from '@/utils/request' +function parseDate(date) { + // 修复1:参数名和内部变量名冲突,改用tempDate + // 修复2:如果传入的date为空/无效,默认使用当前时间 + const tempDate = date ? new Date(date) : new Date(); + + // 获取年、月、日、时、分、秒(补零处理,确保是两位数) + const year = tempDate.getFullYear(); + // 月份从0开始,所以要+1,不足两位补0 + const month = String(tempDate.getMonth() + 1).padStart(2, '0'); + const day = String(tempDate.getDate()).padStart(2, '0'); + const hours = String(tempDate.getHours()).padStart(2, '0'); + const minutes = String(tempDate.getMinutes()).padStart(2, '0'); + const seconds = String(tempDate.getSeconds()).padStart(2, '0'); + + // 格式化为YYYY-mm-dd HH:mm:ss并返回 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; +} + // 查询钢卷待操作列表 export function listPendingAction(query) { return request({ @@ -19,19 +37,33 @@ export function getPendingAction(actionId) { // 新增钢卷待操作 export function addPendingAction(data) { + const payload = { ...data } + if (payload.processTime) { + payload.processTime = parseDate(payload.processTime) + } + if (payload.completeTime) { + payload.completeTime = parseDate(payload.completeTime) + } return request({ url: '/wms/coilPendingAction', method: 'post', - data: data + data: payload }) } // 修改钢卷待操作 export function updatePendingAction(data) { + const payload = { ...data } + if (payload.processTime) { + payload.processTime = parseDate(payload.processTime) + } + if (payload.completeTime) { + payload.completeTime = parseDate(payload.completeTime) + } return request({ url: '/wms/coilPendingAction', method: 'put', - data: data + data: payload }) } @@ -75,3 +107,12 @@ export function cancelAction(actionId) { }) } +// 导出钢卷待操作 +export function exportPendingAction(query) { + return request({ + url: '/wms/coilPendingAction/export', + method: 'post', + params: query + }) +} +