From b46f0e772e22e4641e3265beacf9856bbb043094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Sat, 3 Oct 2026 22:22:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/interfaceCallLog54.vue | 17 +++++++++++------ .../warehousePallet/warehousePallet54.vue | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/views/modules/haianWarehouse/warehouse/interfaceCallLog54.vue b/src/views/modules/haianWarehouse/warehouse/interfaceCallLog54.vue index 79cdeb7..3bc83bf 100644 --- a/src/views/modules/haianWarehouse/warehouse/interfaceCallLog54.vue +++ b/src/views/modules/haianWarehouse/warehouse/interfaceCallLog54.vue @@ -349,15 +349,20 @@ export default { this.getDataList() }, - // 状态标签色 - rqrq - getStatusType(status) { + // 列表和详情兼容历史Success/FAILED状态；空值和未识别状态保持未知，不解析响应内容重判结果 - rqrq + normalizeCallStatus (status) { + const normalizedStatus = String(status || '').toUpperCase() + return normalizedStatus === 'FAILED' ? 'ERROR' : normalizedStatus + }, + // 按统一状态展示颜色，历史成功显示绿色、历史失败显示红色，未知状态保留中性色 - rqrq + getStatusType (status) { const statusMap = { PROCESSING: 'warning', SUCCESS: 'success', ERROR: 'danger', TIMEOUT: 'info' } - return statusMap[status] || 'info' + return statusMap[this.normalizeCallStatus(status)] || 'info' }, - // 状态文案 - rqrq - getStatusLabel(status) { + // 列表、详情及导出共用状态文案，兼容历史大小写和失败别名，未知值不显示成功 - rqrq + getStatusLabel (status) { const statusMap = { PROCESSING: '处理中', SUCCESS: '成功', ERROR: '失败', TIMEOUT: '超时' } - return statusMap[status] || '未知' + return statusMap[this.normalizeCallStatus(status)] || '未知' }, // 查看详情 - rqrq diff --git a/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue b/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue index 30af933..fed8d88 100644 --- a/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue +++ b/src/views/modules/haianWarehouse/warehousePallet/warehousePallet54.vue @@ -356,6 +356,7 @@ export default { { columnProp: 'emptyFlag', columnLabel: '空托盘', columnWidth: 90, align: 'center', headerAlign: 'center', formatter: 'yn' }, { columnProp: 'callingFlag', columnLabel: '调用标记', columnWidth: 90, align: 'center', headerAlign: 'center', formatter: 'yn' }, { columnProp: 'remark', columnLabel: '备注', columnWidth: 220, align: 'left', headerAlign: 'center' }, + { columnProp: 'manualRemark', columnLabel: '手工备注', columnWidth: 220, align: 'left', headerAlign: 'center' }, { columnProp: 'createdBy', columnLabel: '创建人', columnWidth: 100, align: 'center', headerAlign: 'center' }, { columnProp: 'createdTime', columnLabel: '创建时间', columnWidth: 160, align: 'center', headerAlign: 'center' }, { columnProp: 'updatedBy', columnLabel: '修改人', columnWidth: 100, align: 'center', headerAlign: 'center' },