diff --git a/src/modules/05_leave/router.ts b/src/modules/05_leave/router.ts
index 6b64f87..f689438 100644
--- a/src/modules/05_leave/router.ts
+++ b/src/modules/05_leave/router.ts
@@ -1,40 +1,29 @@
/**
* Router leave
*/
-const leave = () => import("@/modules/05_leave/views/Main.vue")
+const leave = () => import("@/modules/05_leave/views/Main.vue");
-const addAbsence = () => import("@/modules/05_leave/views/AddPage.vue")
-
-const samplePage = () => import("@/modules/05_leave/views/SampleForm.vue")
+const addAbsence = () => import("@/modules/05_leave/views/AddPage.vue");
/* const Checkout = () => import("@/modules/04_checkin/views/Checkout.vue");
*/
export default [
- {
- path: "/leave",
- name: "leave",
- component: leave,
- meta: {
- Auth: true,
- Key: [7],
- },
- },
- {
- path: "/leave/add",
- name: "addAbsence",
- component: addAbsence,
- meta: {
- Auth: true,
- Key: [7],
- },
- },
- {
- path: "/leave/sample",
- name: "sample-page",
- component: samplePage,
- meta: {
- Auth: true,
- Key: [7],
- },
- },
-]
+ {
+ path: "/leave",
+ name: "leave",
+ component: leave,
+ meta: {
+ Auth: true,
+ Key: [7],
+ },
+ },
+ {
+ path: "/leave/add",
+ name: "addAbsence",
+ component: addAbsence,
+ meta: {
+ Auth: true,
+ Key: [7],
+ },
+ },
+];
diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts
index ff24391..9d5b535 100644
--- a/src/modules/05_leave/store.ts
+++ b/src/modules/05_leave/store.ts
@@ -165,10 +165,10 @@ export const useLeaveStore = defineStore("Leave", () => {
}
const optionsSpecific = ref([
- { id: '0', name: "ลาไปศึกษา" },
- { id: '1', name: "ฝึกอบรม" },
- { id: '2', name: "ปฎิบัติการวิจัย" },
- { id: '3', name: "ดูงาน" },
+ { id: 's0', name: "ลาไปศึกษาต่อ" },
+ { id: 's1', name: "ลาฝึกอบรม" },
+ { id: 's2', name: "ลาปฎิบัติการวิจัย" },
+ { id: 's3', name: "ลาดูงาน" },
]);
const optionsOrdination = ref([
{ id: '0', name: "ลาอุปสมบท" },
@@ -268,7 +268,7 @@ export const useLeaveStore = defineStore("Leave", () => {
case "4": return "ลาพักผ่อน";
case "5": return "ลาอุปสมบทหรือลาประกอบพิธีฮัจย์ฯ";
case "6": return "ลาเข้ารับการตรวจเลือกหรือเข้ารับการเตรียมพล";
- case "7": return "ลาไปศึกษา";
+ case "7": return "ลาไปศึกษา ฝึกอบรม ปฎิบัติการวิจัย หรือดูงาน";
case "8": return "ลาไปปฎิบัติงานในองค์การระหว่างประเทศ";
case "9": return "ลาติดตามคู่สมรส";
case "10": return "ลาไปฟื้นฟูสมรรถภาพด้านอาชีพ";
@@ -286,10 +286,10 @@ export const useLeaveStore = defineStore("Leave", () => {
function convertSubtitleInfo2(val: string) {
if (val) {
switch (val) {
- case "0": return "ลาไปศึกษา";
- case "1": return "ฝึกอบรม";
- case "2": return "ปฎิบัติการวิจัย";
- case "3": return "ดูงาน";
+ case "s0": return "ลาไปศึกษาต่อ";
+ case "s1": return "ลาฝึกอบรม";
+ case "s2": return "ลาปฎิบัติการวิจัย";
+ case "s3": return "ลาดูงาน";
}
}
}
diff --git a/src/modules/05_leave/views/AddPage.vue b/src/modules/05_leave/views/AddPage.vue
index d74395a..a0218b5 100644
--- a/src/modules/05_leave/views/AddPage.vue
+++ b/src/modules/05_leave/views/AddPage.vue
@@ -133,8 +133,8 @@ const onSubmit = async () => {
-
-
+
+
diff --git a/src/modules/05_leave/views/SampleForm.vue b/src/modules/05_leave/views/SampleForm.vue
deleted file mode 100644
index 92b1bcc..0000000
--- a/src/modules/05_leave/views/SampleForm.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-