diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue index d51d125..27ea45d 100644 --- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue +++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue @@ -1,459 +1,559 @@ diff --git a/src/modules/05_leave/components/FormLeave/03_Birth.vue b/src/modules/05_leave/components/FormLeave/03_Birth.vue index e361107..a25336e 100644 --- a/src/modules/05_leave/components/FormLeave/03_Birth.vue +++ b/src/modules/05_leave/components/FormLeave/03_Birth.vue @@ -1,358 +1,385 @@ diff --git a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue index e9546b1..5c5ba12 100644 --- a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue +++ b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue @@ -1,483 +1,584 @@ diff --git a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue index 7f99cc0..0bd4dac 100644 --- a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue +++ b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue @@ -1,464 +1,559 @@ diff --git a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue index a1361bc..8c4401c 100644 --- a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue +++ b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue @@ -1,578 +1,735 @@ diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue index ca073ff..c2cb6ea 100644 --- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue +++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue @@ -1,388 +1,507 @@ diff --git a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue index 9a52128..39ca8d7 100644 --- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue +++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue @@ -1,464 +1,564 @@ diff --git a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue index 9e2e0f7..55195f1 100644 --- a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue +++ b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue @@ -1,565 +1,706 @@ diff --git a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue index 0e34655..2194a9c 100644 --- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue +++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue @@ -1,565 +1,696 @@ diff --git a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue index c6c2a42..d87bbcf 100644 --- a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue +++ b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue @@ -1,280 +1,328 @@ diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue index fe5e4b4..4461c97 100644 --- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue +++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue @@ -1,624 +1,763 @@ diff --git a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue index 7c88f21..21d66e0 100644 --- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue +++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue @@ -1,398 +1,514 @@ diff --git a/src/modules/05_leave/interface/request/FollowSpouseForm.ts b/src/modules/05_leave/interface/request/FollowSpouseForm.ts index a07cb8e..82f6d04 100644 --- a/src/modules/05_leave/interface/request/FollowSpouseForm.ts +++ b/src/modules/05_leave/interface/request/FollowSpouseForm.ts @@ -27,10 +27,10 @@ interface FormRef { coupleDayPosition: object | null //ตำแหน่งคู่สมรส coupleDayLevel: object | null //ระดับคู่สมรส coupleDayLevelCountry: object | null //ไปปฏิบัติราชการ ณ ประเทศ - followHistoryCountry: object | null //ประวัติการลาติดตามคู่สมรสประเทศ - followHistoryTime: object | null //ประวัติการลาติดตามคู่สมรสประเทศ - followHistoryStart: object | null //ประวัติการลาติดตามคู่สมรสประเทศ - followHistoryEnd: object | null //ประวัติการลาติดตามคู่สมรสประเทศ + // followHistoryCountry: object | null //ประวัติการลาติดตามคู่สมรสประเทศ + // followHistoryTime: object | null //ประวัติการลาติดตามคู่สมรสประเทศ + // followHistoryStart: object | null //ประวัติการลาติดตามคู่สมรสประเทศ + // followHistoryEnd: object | null //ประวัติการลาติดตามคู่สมรสประเทศ leaveDetail: object | null //รายละเอียดการลา leaveAddress: object | null //สถานที่ติดต่อขณะลา leaveDocument: object | null //เอกสารปะกอบ diff --git a/src/modules/05_leave/views/AddPage.vue b/src/modules/05_leave/views/AddPage.vue index 344836e..0344fc9 100644 --- a/src/modules/05_leave/views/AddPage.vue +++ b/src/modules/05_leave/views/AddPage.vue @@ -1,164 +1,238 @@ diff --git a/src/modules/05_leave/views/EditPage.vue b/src/modules/05_leave/views/EditPage.vue index 234c120..0896e5f 100644 --- a/src/modules/05_leave/views/EditPage.vue +++ b/src/modules/05_leave/views/EditPage.vue @@ -1,334 +1,461 @@ diff --git a/src/modules/05_leave/views/Main.vue b/src/modules/05_leave/views/Main.vue index 53fce09..2a1e2d0 100644 --- a/src/modules/05_leave/views/Main.vue +++ b/src/modules/05_leave/views/Main.vue @@ -1,7 +1,7 @@