diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue index 5e9c6a7..7786ab7 100644 --- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue +++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue @@ -469,7 +469,7 @@ onMounted(() => { ref="leaveDetailRef" for="leaveDetailRef" v-model="formDataSick.leaveDetail" - label="รายละเอียด" + label="สาเหตุการลา" :readonly="!edit || statusCheck === 'NEW'" bg-color="white" /> diff --git a/src/modules/05_leave/components/FormLeave/03_Birth.vue b/src/modules/05_leave/components/FormLeave/03_Birth.vue index 55ce182..fd0a334 100644 --- a/src/modules/05_leave/components/FormLeave/03_Birth.vue +++ b/src/modules/05_leave/components/FormLeave/03_Birth.vue @@ -388,7 +388,7 @@ onMounted(() => { ref="leaveDetailRef" for="leaveDetailRef" v-model="formDataBirth.leaveDetail" - label="รายละเอียด" + label="สาเหตุการลา" :readonly="!edit || statusCheck === 'NEW'" />
diff --git a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue index 3688d65..31de76b 100644 --- a/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue +++ b/src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue @@ -465,7 +465,7 @@ onMounted(() => { ref="leaveDetailRef" for="leaveDetailRef" v-model="formDataHelpWife.leaveDetail" - label="รายละเอียด" + label="สาเหตุการลา" :readonly="!edit || statusCheck === 'NEW'" />
diff --git a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue index 5c90cdb..08fae56 100644 --- a/src/modules/05_leave/components/FormLeave/05_VacationForm.vue +++ b/src/modules/05_leave/components/FormLeave/05_VacationForm.vue @@ -468,7 +468,7 @@ onMounted(() => { ref="leaveDetailRef" for="leaveDetailRef" v-model="formDataVacation.leaveDetail" - label="รายละเอียด" + label="สาเหตุการลา" :readonly="!edit || statusCheck === 'NEW'" />
diff --git a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue index 8bca988..5a4d401 100644 --- a/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue +++ b/src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue @@ -644,7 +644,7 @@ onMounted(() => { ref="leaveDetailRef" for="leaveDetailRef" v-model="formDataOrdination.leaveDetail" - label="รายละเอียด" + label="สาเหตุการลา" :readonly="!edit || statusCheck === 'NEW'" />
diff --git a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue index 540f52a..d25e3ed 100644 --- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue +++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue @@ -411,7 +411,7 @@ onMounted(() => { dense outlined type="textarea" - label="รายละเอียด" + label="สาเหตุการลา" :readonly="!edit || statusCheck === 'NEW'" />
diff --git a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue index 2f10afc..baac03b 100644 --- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue +++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue @@ -466,7 +466,7 @@ onMounted(() => { outlined v-model="formDataMilitary.leaveDetail" type="textarea" - label="รายละเอียด" + label="สาเหตุการลา" />
diff --git a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue index 3034ed4..e53954c 100644 --- a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue +++ b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue @@ -624,7 +624,7 @@ onMounted(async () => { dense outlined type="textarea" - label="รายละเอียด" + label="สาเหตุการลา" />
diff --git a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue index 5f894cc..713f21b 100644 --- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue +++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue @@ -595,7 +595,7 @@ onMounted(async () => { dense outlined type="textarea" - label="รายละเอียด" + label="สาเหตุการลา" />
diff --git a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue index 558d814..7920aa0 100644 --- a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue +++ b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue @@ -362,7 +362,7 @@ onMounted(() => { ref="leaveDetailRef" for="leaveDetailRef" v-model="formDataWorkInternational.leaveDetail" - label="รายละเอียด" + label="สาเหตุการลา" :readonly="!edit || statusCheck === 'NEW'" />
diff --git a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue index dbccd95..0138567 100644 --- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue +++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue @@ -688,7 +688,7 @@ onMounted(async () => { ref="leaveDetailRef" for="leaveDetailRef" v-model="formDataFollowSpouse.leaveDetail" - label="รายละเอียด" + label="สาเหตุการลา" :readonly="!edit || statusCheck === 'NEW'" />
diff --git a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue index d43ed86..d78a51a 100644 --- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue +++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue @@ -350,7 +350,7 @@ onMounted(() => { dense outlined type="textarea" - label="รายละเอียด" + label="สาเหตุการลา" />
diff --git a/src/modules/05_leave/components/Table.vue b/src/modules/05_leave/components/Table.vue index cbf161d..eed96f0 100644 --- a/src/modules/05_leave/components/Table.vue +++ b/src/modules/05_leave/components/Table.vue @@ -52,8 +52,8 @@ const table = ref(null); */ const currentPage = ref(1); const pagination = ref({ - sortBy: "desc", - descending: false, + sortBy: "dateSendLeave", + descending: true, page: 1, rowsPerPage: Number(props.pageSize), }); diff --git a/src/modules/05_leave/components/formDetail/01_SickForm.vue b/src/modules/05_leave/components/formDetail/01_SickForm.vue index 1c9d53d..7eec67b 100644 --- a/src/modules/05_leave/components/formDetail/01_SickForm.vue +++ b/src/modules/05_leave/components/formDetail/01_SickForm.vue @@ -67,7 +67,7 @@ const props = defineProps({
{{ props.data.leaveAddress }}
-
รายละเอียด
+
สาเหตุการลา
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue index 6c3a70c..cbc3e8e 100644 --- a/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue +++ b/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue @@ -56,7 +56,7 @@ const props = defineProps({
{{ props.data.leaveAddress }}
-
รายละเอียด
+
สาเหตุการลา
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/components/formDetail/05_VacationForm.vue b/src/modules/05_leave/components/formDetail/05_VacationForm.vue index 0f5f6f4..fb0b9be 100644 --- a/src/modules/05_leave/components/formDetail/05_VacationForm.vue +++ b/src/modules/05_leave/components/formDetail/05_VacationForm.vue @@ -71,7 +71,7 @@ const props = defineProps({
{{ props.data.leaveAddress }}
-
รายละเอียด
+
สาเหตุการลา
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue b/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue index 739007f..9e4e567 100644 --- a/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue +++ b/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue @@ -72,7 +72,7 @@ const props = defineProps({
-
รายละเอียด
+
สาเหตุการลา
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/components/formDetail/07_HajjForm.vue b/src/modules/05_leave/components/formDetail/07_HajjForm.vue index c6054b3..403c089 100644 --- a/src/modules/05_leave/components/formDetail/07_HajjForm.vue +++ b/src/modules/05_leave/components/formDetail/07_HajjForm.vue @@ -51,7 +51,7 @@ const props = defineProps({
-
รายละเอียด
+
สาเหตุการลา
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue b/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue index 8f57aa2..c3a7d9d 100644 --- a/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue +++ b/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue @@ -61,7 +61,7 @@ const props = defineProps({
{{ props.data.absentDayAt }}
-
รายละเอียด
+
สาเหตุการลา
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/components/formDetail/09_StudyForm.vue b/src/modules/05_leave/components/formDetail/09_StudyForm.vue index 1b177a0..2196ae8 100644 --- a/src/modules/05_leave/components/formDetail/09_StudyForm.vue +++ b/src/modules/05_leave/components/formDetail/09_StudyForm.vue @@ -85,7 +85,7 @@ const props = defineProps({
{{ props.data.leaveAddress }}
-
รายละเอียด
+
สาเหตุการลา
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/components/formDetail/10_TrainForm.vue b/src/modules/05_leave/components/formDetail/10_TrainForm.vue index c84bf2f..32cae53 100644 --- a/src/modules/05_leave/components/formDetail/10_TrainForm.vue +++ b/src/modules/05_leave/components/formDetail/10_TrainForm.vue @@ -84,7 +84,7 @@ const props = defineProps({
{{ props.data.leaveAddress }}
-
รายละเอียด
+
สาเหตุการลา
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue b/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue index c233168..027c386 100644 --- a/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue +++ b/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue @@ -38,7 +38,7 @@ const props = defineProps({
-
รายละเอียด
+
รายละสาเหตุการลาเอียด
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue b/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue index 4b1aedc..d1ff5cb 100644 --- a/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue +++ b/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue @@ -119,7 +119,7 @@ const props = defineProps({
-
รายละเอียด
+
สาเหตุการลา
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue b/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue index 8cd324c..676d062 100644 --- a/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue +++ b/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue @@ -38,7 +38,7 @@ const props = defineProps({
-
รายละเอียด
+
สาเหตุการลา
{{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts index 94bb5e0..8a39d48 100644 --- a/src/modules/05_leave/store.ts +++ b/src/modules/05_leave/store.ts @@ -39,7 +39,7 @@ export const useLeaveStore = defineStore("Leave", () => { leaveTypeName: e.leaveTypeName, leaveTypeId: e.leaveTypeId, fullName: e.fullName, - dateSendLeave: e.dateSendLeave && date2Thai(e.dateSendLeave), + dateSendLeave: e.dateSendLeave && date2Thai(e.dateSendLeave,false,true), dateLeave: date2Thai(e.leaveStartDate) + " - " + date2Thai(e.leaveEndDate), status: e.status,