hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix display and sort registry

Browse source
This commit is contained in:
Warunee Tamkoo 2025-06-11 16:55:14 +07:00
parent 7025a797f2
commit ef9a805cb4
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/10_registry/01_Information/05_Educations.vue
View file

@ -267,7 +267,7 @@ const columns = ref<QTableProps["columns"]>([
}, },
]); ]);
const pagination = ref({ const pagination = ref({
sortBy: "lastUpdatedAt", // sortBy: "lastUpdatedAt",
}); });
const columnsHistory = ref<QTableProps["columns"]>([ const columnsHistory = ref<QTableProps["columns"]>([

36
src/modules/10_registry/02_Government/01_Government.vue
View file

@ -497,19 +497,19 @@ onMounted(async () => {
<div class="row"> <div class="row">
<div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm"> <div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm">
<div class="row"> <div class="row">
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-6 text-grey-6 text-weight-medium">
วันที่สั่งบรรจุ วันที่สั่งบรรจุ
</div> </div>
<div class="col-7"> <div class="col-6">
{{ formData.dateAppoint ? date2Thai(formData.dateAppoint) : "-" }} {{ formData.dateAppoint ? date2Thai(formData.dateAppoint) : "-" }}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-6 text-grey-6 text-weight-medium">
วันที่เริ่มปฏิบัติราชการ วันที่เริ่มปฏิบัติราชการ
</div> </div>
<div class="col-7"> <div class="col-6">
{{ formData.dateStart ? date2Thai(formData.dateStart) : "-" }} {{ formData.dateStart ? date2Thai(formData.dateStart) : "-" }}
</div> </div>
</div> </div>
@ -518,22 +518,32 @@ onMounted(async () => {
v-if="dateToISO(formData.dateAppoint as Date) !== dateToISO(formData.dateStart as Date)" v-if="dateToISO(formData.dateAppoint as Date) !== dateToISO(formData.dateStart as Date)"
class="row" class="row"
> >
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-6 text-grey-6 text-weight-medium">
เหตุผลที่วันที่ไม่ตรงกัน เหตุผลที่วันที่ไม่ตรงกัน
</div> </div>
<div class="col-7"> <div class="col-6">
{{ formData.reasonSameDate ? formData.reasonSameDate : "-" }} {{ formData.reasonSameDate ? formData.reasonSameDate : "-" }}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-5 text-grey-6 text-weight-medium"> <div class="col-6 text-grey-6 text-weight-medium">
วันครบเกษียณอายุ วันครบเกษียณอายุ
</div> </div>
<div class="col-7"> <div class="col-6">
{{ formData.dateLeave ? date2Thai(formData.dateLeave) : "-" }} {{ formData.dateLeave ? date2Thai(formData.dateLeave) : "-" }}
</div> </div>
</div> </div>
<div class="row">
<div class="col-6 text-grey-6 text-weight-medium">
วันที่เกษียณอายุราชการตามกฏหมาย
</div>
<div class="col-6">
{{
formData.dateRetireLaw ? date2Thai(formData.dateRetireLaw) : "-"
}}
</div>
</div>
</div> </div>
<div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm"> <div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm">
@ -561,16 +571,6 @@ onMounted(async () => {
{{ formData.govAgePlus ? formData.govAgePlus : 0 }} {{ formData.govAgePlus ? formData.govAgePlus : 0 }}
</div> </div>
</div> </div>
<div class="row">
<div class="col-5 text-grey-6 text-weight-medium">
วันที่เกษียณอายุราชการตามกฏหมาย
</div>
<div class="col-7">
{{
formData.dateRetireLaw ? date2Thai(formData.dateRetireLaw) : "-"
}}
</div>
</div>
</div> </div>
</div> </div>
</q-card> </q-card>

2
src/modules/10_registry/02_Government/07_Position.vue
View file

@ -114,7 +114,7 @@ const baseColumns = ref<QTableColumn[]>([
style: "font-size: 14px", style: "font-size: 14px",
format(val, row) { format(val, row) {
return row.posNoAbb && row.posNo return row.posNoAbb && row.posNo
? `${row.posNoAbb}${row.posNo}` ? `${row.posNoAbb} ${row.posNo}`
: row.posNo : row.posNo
? row.posNo ? row.posNo
: "-"; : "-";