แก้ลา

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"
         />

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'"
         />
         <div class="full-width" v-if="statusCheck != 'NEW'">

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'"
         />
         <div class="full-width" v-if="statusCheck != 'NEW'">

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'"
         />
         <div class="full-width" v-if="statusCheck != 'NEW'">

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'"
         />
         <div class="full-width" v-if="statusCheck != 'NEW'">

src/modules/05_leave/components/FormLeave/07_HajjForm.vue

@@ -411,7 +411,7 @@ onMounted(() => {
           dense
           outlined
           type="textarea"
-          label="รายละเอียด"
+          label="สาเหตุการลา"
           :readonly="!edit || statusCheck === 'NEW'"
         />
         <div class="full-width" v-if="statusCheck != 'NEW'">

src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue

@@ -466,7 +466,7 @@ onMounted(() => {
           outlined
           v-model="formDataMilitary.leaveDetail"
           type="textarea"
-          label="รายละเอียด"
+          label="สาเหตุการลา"
         />
 
         <div class="col-12" v-if="statusCheck != 'NEW'">

src/modules/05_leave/components/FormLeave/09_StudyForm.vue

@@ -624,7 +624,7 @@ onMounted(async () => {
           dense
           outlined
           type="textarea"
-          label="รายละเอียด"
+          label="สาเหตุการลา"
         />
 
         <div class="col-12" v-if="statusCheck != 'NEW'">

src/modules/05_leave/components/FormLeave/10_TrainForm.vue

@@ -595,7 +595,7 @@ onMounted(async () => {
           dense
           outlined
           type="textarea"
-          label="รายละเอียด"
+          label="สาเหตุการลา"
         />
 
         <div class="col-12" v-if="statusCheck != 'NEW'">

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'"
         />
         <div class="full-width" v-if="statusCheck != 'NEW'">

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'"
         />
         <div class="full-width" v-if="statusCheck != 'NEW'">

src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue

@@ -350,7 +350,7 @@ onMounted(() => {
           dense
           outlined
           type="textarea"
-          label="รายละเอียด"
+          label="สาเหตุการลา"
         />
 
         <div class="col-12" v-if="statusCheck != 'NEW'">

src/modules/05_leave/components/Table.vue

@@ -52,8 +52,8 @@ const table = ref<any>(null);
  */
 const currentPage = ref<number>(1);
 const pagination = ref({
-  sortBy: "desc",
+  sortBy: "dateSendLeave",
-  descending: false,
+  descending: true,
   page: 1,
   rowsPerPage: Number(props.pageSize),
 });

src/modules/05_leave/components/formDetail/01_SickForm.vue

@@ -67,7 +67,7 @@ const props = defineProps({
       <div class="col-xs-12 col-md-6">{{ props.data.leaveAddress }}</div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">สาเหตุการลา</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue

@@ -56,7 +56,7 @@ const props = defineProps({
       <div class="col-xs-12 col-md-6">{{ props.data.leaveAddress }}</div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">สาเหตุการลา</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

src/modules/05_leave/components/formDetail/05_VacationForm.vue

@@ -71,7 +71,7 @@ const props = defineProps({
       <div class="col-xs-12 col-md-6">{{ props.data.leaveAddress }}</div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">สาเหตุการลา</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

src/modules/05_leave/components/formDetail/06_OrdinationForm.vue

@@ -72,7 +72,7 @@ const props = defineProps({
       </div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">สาเหตุการลา</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

src/modules/05_leave/components/formDetail/07_HajjForm.vue

@@ -51,7 +51,7 @@ const props = defineProps({
       </div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">สาเหตุการลา</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

src/modules/05_leave/components/formDetail/08_MilitaryForm.vue

@@ -61,7 +61,7 @@ const props = defineProps({
       <div class="col-xs-12 col-md-6">{{ props.data.absentDayAt }}</div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">สาเหตุการลา</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

src/modules/05_leave/components/formDetail/09_StudyForm.vue

@@ -85,7 +85,7 @@ const props = defineProps({
       <div class="col-xs-12 col-md-6">{{ props.data.leaveAddress }}</div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">สาเหตุการลา</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

src/modules/05_leave/components/formDetail/10_TrainForm.vue

@@ -84,7 +84,7 @@ const props = defineProps({
       <div class="col-xs-12 col-md-6">{{ props.data.leaveAddress }}</div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">สาเหตุการลา</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue

@@ -38,7 +38,7 @@ const props = defineProps({
       </div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">รายละสาเหตุการลาเอียด</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue

@@ -119,7 +119,7 @@ const props = defineProps({
       </div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">สาเหตุการลา</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue

@@ -38,7 +38,7 @@ const props = defineProps({
       </div>
     </div>
     <div class="row">
-      <div class="col-xs-12 col-md-6 text-grey-8">รายละเอียด</div>
+      <div class="col-xs-12 col-md-6 text-grey-8">สาเหตุการลา</div>
       <div class="col-xs-12 col-md-6">
         {{ props.data.leaveDetail ? props.data.leaveDetail : "-" }}
       </div>

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,