diff --git a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue index 7cc60e02f..64c6b73f2 100644 --- a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue +++ b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue @@ -50,9 +50,9 @@ const dataMapToSend = computed(() => { firstName: i.firstName, lastName: i.lastName, citizenId: i.idcard, - position: i.positionOld, - posType: i.positionTypeOld, - posLevel: i.positionLevelOld, + position: i.position, + posType: i.posTypeName, + posLevel: i.posLevelName, })); }); diff --git a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue index 06767a812..cc09b074a 100644 --- a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue +++ b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue @@ -32,13 +32,12 @@ const dataMapToSend = computed(() => { firstName: i.firstName, lastName: i.lastName, citizenId: i.citizenId, - position: i.positionOld, - posType: i.positionTypeOld, - posLevel: i.positionLevelOld, + position: i.position, + posType: i.positionType, + posLevel: i.positionLevel, })); }); -const asd = ref(""); //ตัวแปรเก็บคำสั่งที่เลือก const commandType = ref(""); //ตัวแปรเก็บคำสั่งที่เลือก const commandOp = ref([]); const listCommand = ref([]); // เก็บคำสั่งทั้งหมด