diff --git a/src/modules/05_placement/components/Receive/DialogOrders.vue b/src/modules/05_placement/components/Receive/DialogOrders.vue index 3d7315c78..e347d89bf 100644 --- a/src/modules/05_placement/components/Receive/DialogOrders.vue +++ b/src/modules/05_placement/components/Receive/DialogOrders.vue @@ -112,11 +112,9 @@ const columns2 = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return row.positionTypeOld && row.positionTypeOl !== "-" + return row.positionTypeOld ? `${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 7cfd48a32..58b7a544b 100644 --- a/src/modules/05_placement/views/03_receiveMain.vue +++ b/src/modules/05_placement/views/03_receiveMain.vue @@ -133,11 +133,9 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return row.positionTypeOld && row.positionTypeOld !== "-" + return row.positionTypeOld ? `${row.positionTypeOld}${ - row.positionLevelOld && row.positionLevelOld !== "-" - ? `(${row.positionLevelOld})` - : "" + row.positionLevelOld ? `(${row.positionLevelOld})` : "" }` : ""; },