Merge branch 'nice' into develop

src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue

@@ -25,7 +25,7 @@ const dataMapToSend = computed(() => {
     firstName: i.firstName,
     lastName: i.lastName,
     citizenId: i.citizenId,
-    remarkVertical: i.reason,
+    remarkVertical: i.reasonResign,
     remarkHorizontal: i.remarkHorizontal,
   }));
 });
@@ -158,6 +158,8 @@ const modalCommand = ref<boolean>(false);
 
 /** popup ยืนยันส่งัว */
 function saveOrder() {
+  console.log(selected.value);
+  
   dialogConfirm(
     $q,
     () => {

src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue

@@ -25,7 +25,7 @@ const dataMapToSend = computed(() => {
     firstName: i.firstName,
     lastName: i.lastName,
     citizenId: i.citizenId,
-    remarkVertical: i.reason,
+    remarkVertical: i.reasonResign,
     remarkHorizontal: i.remarkHorizontal,
   }));
 });

src/modules/06_retirement/interface/response/Main.ts

@@ -29,6 +29,7 @@ interface ResponseItems {
   fullname: string;
   datetext: string | null;
   citizenId: string;
+  reasonResign: string;
 }
 
 interface TypeFile {