diff --git a/klp-ui/src/views/wms/coil/info.vue b/klp-ui/src/views/wms/coil/info.vue index c420622a..f9d05b6a 100644 --- a/klp-ui/src/views/wms/coil/info.vue +++ b/klp-ui/src/views/wms/coil/info.vue @@ -712,6 +712,7 @@ + @@ -893,17 +894,19 @@ export default { before: '逻辑库:' + (item.warehouseNameBefore || '-'), after: '逻辑库:' + (item.warehouseNameAfter || '-'), createTime: item.createTime || '-', + remark: item.remark || '-', ...item }); }); // 添加技术部改判记录 this.coilQualityRejudgeList.forEach(item => { list.push({ + ...item, type: '技术部改判', before: '质量状态:' + (item.beforeQuality || '-'), after: '质量状态:' + (item.afterQuality || '-'), createTime: item.createTime || '-', - ...item + remark: item.rejudgeReason, }); }); // 按时间排序 @@ -2114,7 +2117,7 @@ export default { } .table-wrapper.warehouse-table { - flex: 3; + flex: 2; } .table-wrapper.transfer-table { diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 1dfcb719..7ab1f58b 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -353,6 +353,10 @@ @click="handleReplaceLabel(scope.row)"> 重贴标签 + + 查看记录 + @@ -611,6 +615,29 @@ 确认 + + + + + + + + + + {{ scope.row.before }} + + + + + {{ scope.row.after }} + + + + + + + + @@ -630,6 +657,8 @@ import { } from "@/api/wms/coil"; import { listBoundCoil } from "@/api/wms/deliveryWaybillDetail"; import { addPendingAction } from "@/api/wms/pendingAction"; +import { listTransferOrderItem } from "@/api/wms/transferOrderItem"; +import { listCoilQualityRejudge } from "@/api/wms/coilQualityRejudge"; import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; import QRCode from "@/components/QRCode"; import * as XLSX from 'xlsx' @@ -992,6 +1021,9 @@ export default { itemManufacturer: undefined, notifyReLabel: false }, + // 调拨记录弹窗 + transferRecordVisible: false, + transferRecordList: [], }; }, computed: { @@ -1096,6 +1128,62 @@ export default { this.getList(); }) }, + // 查看调拨记录 + async handleViewTransferRecord(row) { + this.transferRecordVisible = true; + this.transferRecordList = []; + try { + // 获取批量调拨记录 + this.loading = true; + const transferOrderRes = await listTransferOrderItem({ + coilId: row.coilId, + pageNum: 1, + pageSize: 100 + }); + // 获取技术部改判记录 + const rejudgeRes = await listCoilQualityRejudge({ + coilId: row.coilId, + pageNum: 1, + pageSize: 100 + }); + // 合并记录 + const list = []; + // 添加批量调拨记录 + (transferOrderRes.rows || []).forEach(item => { + list.push({ + type: '批量调拨', + before: '逻辑库:' + (item.warehouseNameBefore || '-'), + after: '逻辑库:' + (item.warehouseNameAfter || '-'), + createTime: item.createTime || '-', + remark: item.remark || '-', + ...item + }); + }); + // 添加技术部改判记录 + (rejudgeRes.rows || []).forEach(item => { + list.push({ + ...item, + type: '技术部改判', + before: '质量状态:' + (item.beforeQuality || '-'), + after: '质量状态:' + (item.afterQuality || '-'), + createTime: item.createTime || '-', + remark: item.rejudgeReason, + }); + }); + // 按时间排序 + list.sort((a, b) => { + const timeA = new Date(a.createTime || 0).getTime(); + const timeB = new Date(b.createTime || 0).getTime(); + return timeB - timeA; + }); + this.transferRecordList = list; + } catch (error) { + console.error('获取调拨记录失败:', error); + this.$message.error('获取调拨记录失败'); + } finally { + this.loading = false; + } + }, // 格式化毫秒值为xx天xx小时xx分钟 formatDuration(milliseconds) { if (!milliseconds || milliseconds < 0) return ''; diff --git a/klp-ui/src/views/wms/move/batch.vue b/klp-ui/src/views/wms/move/batch.vue index 088cb346..0b2109cd 100644 --- a/klp-ui/src/views/wms/move/batch.vue +++ b/klp-ui/src/views/wms/move/batch.vue @@ -221,7 +221,7 @@ 导出 刷新 - +