diff --git a/src/modules/04_registryPerson/views/requestEdit.vue b/src/modules/04_registryPerson/views/requestEdit.vue index 706a629ed..6dedc05df 100644 --- a/src/modules/04_registryPerson/views/requestEdit.vue +++ b/src/modules/04_registryPerson/views/requestEdit.vue @@ -31,7 +31,7 @@ import { useCounterMixin } from "@/stores/mixin"; const $q = useQuasar(); const router = useRouter(); const store = useRequestEditStore(); -const { showLoader, hideLoader, messageError } = useCounterMixin(); +const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin(); /** * Table @@ -44,11 +44,12 @@ const maxPage = ref(0); const columns = ref([ { - name: "no", + name: "lastUpdatedAt", align: "left", - label: "ลำดับ", - sortable: false, - field: (row) => rows.value.indexOf(row) + 1, + label: "วันที่ยื่นขอ", + sortable: true, + field: "lastUpdatedAt", + format: (v) => (v ? date2Thai(v, false, true) : "-"), headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -103,7 +104,7 @@ const columns = ref([ { name: "remark", align: "left", - label: "หมายเหตุ ", + label: "หมายเหตุ", sortable: true, field: "remark", format: (v) => (v ? v : "-"), @@ -112,7 +113,8 @@ const columns = ref([ }, ]); const visibleColumns = ref([ - "no", + "lastUpdatedAt", + "fullname", "topic", "detail", @@ -124,7 +126,7 @@ const visibleColumns = ref([ /** * ตัวแปร */ -const status = ref(""); +const status = ref("PENDING"); const keyword = ref(""); const statusOption = ref(store.optionStatus); const modalStatus = ref(false); diff --git a/src/modules/15_development/components/DialogRecordPerson.vue b/src/modules/15_development/components/DialogRecordPerson.vue index 06ea8b5a4..d67780d50 100644 --- a/src/modules/15_development/components/DialogRecordPerson.vue +++ b/src/modules/15_development/components/DialogRecordPerson.vue @@ -350,6 +350,7 @@ watch( class="inputgreen" dense outlined + hide-bottom-space :model-value=" formData.dateStart ? date2Thai(formData.dateStart) : null " @@ -386,6 +387,7 @@ watch(