From 50fdb30920d81711039b523cb6fbc68ed0201ef1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 12 May 2026 18:07:29 +0700 Subject: [PATCH] fix(receive): Display columns posTypeOld --- .../05_placement/components/Receive/DialogOrders.vue | 6 ++++-- src/modules/05_placement/views/03_receiveMain.vue | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/modules/05_placement/components/Receive/DialogOrders.vue b/src/modules/05_placement/components/Receive/DialogOrders.vue index e347d89bf..3d7315c78 100644 --- a/src/modules/05_placement/components/Receive/DialogOrders.vue +++ b/src/modules/05_placement/components/Receive/DialogOrders.vue @@ -112,9 +112,11 @@ const columns2 = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return row.positionTypeOld + return row.positionTypeOld && row.positionTypeOl !== "-" ? `${row.positionTypeOld}${ - row.positionLevelOld ? `(${row.positionLevelOld})` : "" + row.positionLevelOld && row.positionLevelOld !== "-" + ? `(${row.positionLevelOld})` + : "" }` : ""; }, diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue index 58b7a544b..7cfd48a32 100644 --- a/src/modules/05_placement/views/03_receiveMain.vue +++ b/src/modules/05_placement/views/03_receiveMain.vue @@ -133,9 +133,11 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return row.positionTypeOld + return row.positionTypeOld && row.positionTypeOld !== "-" ? `${row.positionTypeOld}${ - row.positionLevelOld ? `(${row.positionLevelOld})` : "" + row.positionLevelOld && row.positionLevelOld !== "-" + ? `(${row.positionLevelOld})` + : "" }` : ""; },