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})` + : "" }` : ""; },