diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue index 8460013..7c67049 100644 --- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue +++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue @@ -1,511 +1,457 @@ diff --git a/src/modules/05_leave/components/FormLeave/03_Birth.vue b/src/modules/05_leave/components/FormLeave/03_Birth.vue index 1d1f1c2..978a6fa 100644 --- a/src/modules/05_leave/components/FormLeave/03_Birth.vue +++ b/src/modules/05_leave/components/FormLeave/03_Birth.vue @@ -1,425 +1,419 @@ diff --git a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue index a3e7806..4d4334a 100644 --- a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue +++ b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue @@ -1,510 +1,477 @@ diff --git a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue index 2e2cba6..43318eb 100644 --- a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue +++ b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue @@ -1,504 +1,458 @@ diff --git a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue index 3e33edf..e697820 100644 --- a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue +++ b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue @@ -1,660 +1,572 @@ diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue index 3374fda..6c67c11 100644 --- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue +++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue @@ -1,439 +1,380 @@ diff --git a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue index 05c09e1..25cbc8d 100644 --- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue +++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue @@ -1,495 +1,458 @@ diff --git a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue index 3bf2e7a..234770d 100644 --- a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue +++ b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue @@ -1,640 +1,559 @@ diff --git a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue index d23bcf9..d79b75e 100644 --- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue +++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue @@ -1,629 +1,559 @@ diff --git a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue index ce2d0b5..9b01c85 100644 --- a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue +++ b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue @@ -1,309 +1,277 @@ diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue index 127cfb2..0dd0bff 100644 --- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue +++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue @@ -1,698 +1,618 @@ diff --git a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue index 3ae86de..20c17cc 100644 --- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue +++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue @@ -1,439 +1,392 @@ diff --git a/src/modules/05_leave/components/formDetail/formCheckSelect.vue b/src/modules/05_leave/components/formDetail/formCheckSelect.vue index 0cead4d..2b83471 100644 --- a/src/modules/05_leave/components/formDetail/formCheckSelect.vue +++ b/src/modules/05_leave/components/formDetail/formCheckSelect.vue @@ -1,82 +1,82 @@ diff --git a/src/modules/05_leave/components/formDetail/formChildbirth.vue b/src/modules/05_leave/components/formDetail/formChildbirth.vue index 115f2f5..1740be4 100644 --- a/src/modules/05_leave/components/formDetail/formChildbirth.vue +++ b/src/modules/05_leave/components/formDetail/formChildbirth.vue @@ -1,76 +1,76 @@ diff --git a/src/modules/05_leave/components/formDetail/formHajj.vue b/src/modules/05_leave/components/formDetail/formHajj.vue index 903d36b..effc1a8 100644 --- a/src/modules/05_leave/components/formDetail/formHajj.vue +++ b/src/modules/05_leave/components/formDetail/formHajj.vue @@ -1,69 +1,69 @@ diff --git a/src/modules/05_leave/components/formDetail/formHoliday.vue b/src/modules/05_leave/components/formDetail/formHoliday.vue index 5b843c3..602bf03 100644 --- a/src/modules/05_leave/components/formDetail/formHoliday.vue +++ b/src/modules/05_leave/components/formDetail/formHoliday.vue @@ -1,81 +1,81 @@ diff --git a/src/modules/05_leave/components/formDetail/formLeave.vue b/src/modules/05_leave/components/formDetail/formLeave.vue index 3e176d8..b3fa6ba 100644 --- a/src/modules/05_leave/components/formDetail/formLeave.vue +++ b/src/modules/05_leave/components/formDetail/formLeave.vue @@ -1,79 +1,77 @@ diff --git a/src/modules/05_leave/components/formDetail/formLeaveToTraining.vue b/src/modules/05_leave/components/formDetail/formLeaveToTraining.vue index 4df5389..13c6275 100644 --- a/src/modules/05_leave/components/formDetail/formLeaveToTraining.vue +++ b/src/modules/05_leave/components/formDetail/formLeaveToTraining.vue @@ -1,98 +1,96 @@ diff --git a/src/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue b/src/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue index 7bf9065..9561acd 100644 --- a/src/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue +++ b/src/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue @@ -41,11 +41,20 @@ const props = defineProps({
-
-
เอกสารแบบฟอร์ม
-
- ดาวน์โหลดไฟล์ +
เอกสารแนบ
+
+
+
+
+ {{ "เอกสารแนบฉบับที่" + (index + 1) }} + + ดาวน์โหลดไฟล์ + +
+
+
+
-
-
-
diff --git a/src/modules/05_leave/components/formDetail/formSpouse.vue b/src/modules/05_leave/components/formDetail/formSpouse.vue index e652a3c..9a79376 100644 --- a/src/modules/05_leave/components/formDetail/formSpouse.vue +++ b/src/modules/05_leave/components/formDetail/formSpouse.vue @@ -84,10 +84,19 @@ const props = defineProps({
เอกสารแนบ
-
- ดาวน์โหลดไฟล์ +
+
+
+
+ {{ "เอกสารแนบฉบับที่" + (index + 1) }} + + ดาวน์โหลดไฟล์ + +
+
+
+
-
-
-
diff --git a/src/modules/05_leave/components/formDetail/formStudy.vue b/src/modules/05_leave/components/formDetail/formStudy.vue index d80fc1a..26975d2 100644 --- a/src/modules/05_leave/components/formDetail/formStudy.vue +++ b/src/modules/05_leave/components/formDetail/formStudy.vue @@ -80,10 +80,19 @@ const props = defineProps({
เอกสารแนบ
-
- ดาวน์โหลดไฟล์ +
+
+
+
+ {{ "เอกสารแนบฉบับที่" + (index + 1) }} + + ดาวน์โหลดไฟล์ + +
+
+
+
-
-
-
diff --git a/src/modules/05_leave/components/formDetail/formUpasom.vue b/src/modules/05_leave/components/formDetail/formUpasom.vue index a38b9df..9241cb9 100644 --- a/src/modules/05_leave/components/formDetail/formUpasom.vue +++ b/src/modules/05_leave/components/formDetail/formUpasom.vue @@ -1,94 +1,94 @@ diff --git a/src/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue b/src/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue index 7bf9065..9561acd 100644 --- a/src/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue +++ b/src/modules/05_leave/components/formDetail/formVocationalRehabilitation.vue @@ -41,11 +41,20 @@ const props = defineProps({
-
-
เอกสารแบบฟอร์ม
-
- ดาวน์โหลดไฟล์ +
เอกสารแนบ
+
+
+
+
+ {{ "เอกสารแนบฉบับที่" + (index + 1) }} + + ดาวน์โหลดไฟล์ + +
+
+
+
-
-
-
diff --git a/src/modules/05_leave/views/EditPage.vue b/src/modules/05_leave/views/EditPage.vue index 7f4cbb1..234c120 100644 --- a/src/modules/05_leave/views/EditPage.vue +++ b/src/modules/05_leave/views/EditPage.vue @@ -48,7 +48,7 @@ const formData = reactive({ leaveAddress: "", //สถานที่ติดต่อขณะลา leaveNumber: "", //หมายเลขที่ติดต่อขณะลา leaveDetail: "", //รายละเอียดการลา - leaveDocument: "", //อัปโหลดเอกสารประกอบรายละเอียด + leaveDocument: [], //อัปโหลดเอกสารประกอบรายละเอียด leaveDraftDocument: "", //อัปโหลดแบบฟอร์มการลา leaveLastStart: null, //ลาครั้งสุดท้ายในประเภทนั้น ๆ เริ่มเมื่อวันที่(ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว)(Auto) leaveLastEnd: null, //ลาครั้งสุดท้ายในประเภทนั้น ๆ สิ้นสุดเมื่อวันที่(ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว)(Auto) @@ -216,18 +216,18 @@ function onSubmit(formData: FormData) { }) .finally(() => { hideLoader() + fetchDataDetail(personalId.value) }) }) } -function onConfirm() { - console.log(personalId.value) +function onConfirm(id: string) { dialogConfirm( $q, async () => { showLoader() await http - .get(config.API.leaveUserSendId(personalId.value)) + .put(config.API.leaveUserSendId(personalId.value), { reason: "" }) .then(() => { // router.push("/leave") success($q, "ยื่นใบลาสำเร็จ") @@ -259,7 +259,7 @@ onMounted(() => {
แก้ไขใบลา - {{ formData.leaveTypeName }} {{ personalId }} + {{ formData.leaveTypeName }}
diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue index ba13e20..1ef1145 100644 --- a/src/modules/06_evaluate/components/EvaluateStepMain.vue +++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue @@ -1,133 +1,120 @@