diff --git a/src/modules/03_leave/store.ts b/src/modules/03_leave/store.ts index 85921f7..ca729ff 100644 --- a/src/modules/03_leave/store.ts +++ b/src/modules/03_leave/store.ts @@ -11,6 +11,8 @@ export const useRestDataStore = defineStore("Rest", () => { return "อนุมัติ"; case "REJECT": return "ไม่อนุมัติ"; + case "DELETE": + return "ยกเลิกการลาออก"; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; case "DONE": diff --git a/src/modules/03_leave/views/AddLeave.vue b/src/modules/03_leave/views/AddLeave.vue index 7fac7fc..f82f2e6 100644 --- a/src/modules/03_leave/views/AddLeave.vue +++ b/src/modules/03_leave/views/AddLeave.vue @@ -170,7 +170,7 @@
- +
@@ -316,7 +316,6 @@ const cancelResing = () => { if (route.params.id !== undefined) { id.value = route.params.id.toString() deleteResting(id.value) - clickBack() } }) .onCancel(() => {}) @@ -335,6 +334,7 @@ const deleteResting = async (id: string) => { }) .finally(() => { hideLoader() + clickBack() }) } diff --git a/src/modules/03_leave/views/result.vue b/src/modules/03_leave/views/result.vue index 3d31e6f..cbfbeb9 100644 --- a/src/modules/03_leave/views/result.vue +++ b/src/modules/03_leave/views/result.vue @@ -211,7 +211,7 @@ const createResult = async () => {
- +