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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2024-12-23 09:25:50 +07:00
commit 2f1572bde0
8 changed files with 140 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
View file

@ -301,7 +301,7 @@ const historyColumns = ref<QTableProps["columns"]>([
sortable: true,
field: "endDate",
format(val, row) {
row.isDate
return row.isDate
? date2Thai(row.endDate)
: new Date(row.endDate).getFullYear() + 543;
},

2
src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
View file

@ -677,7 +677,6 @@ onMounted(() => {
<q-th v-for="col in props.cols" :key="col.name" :props="props">
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
<q-th auto-width />
</q-tr>
</template>
<template v-slot:body="props" v-if="mode === 'table'">
@ -685,7 +684,6 @@ onMounted(() => {
<q-td v-for="col in props.cols" :key="col.id">
<div>{{ col.value ? col.value : "-" }}</div>
</q-td>
<q-td auto-width> </q-td>
</q-tr>
</template>
</d-table>

18
src/modules/04_registryPerson/views/detailView.vue
View file

@ -497,6 +497,11 @@ function appointPost() {
*/
function clickPassaway() {
dialogPassaway.value = true;
filePassaway.value = null;
deathCertificateNo.value = "";
dateDeath.value = new Date();
placeDeathCertificate.value = "";
reasonDeath.value = "";
}
/**
@ -1003,7 +1008,7 @@ onMounted(async () => {
<q-separator />
<q-card-section class="q-pa-md row q-col-gutter-sm">
<q-file
class="col-12 col-sm-6 col-md-5"
class="col-12 col-sm-6 col-md-5 inputgreen"
outlined
dense
v-model="filePassaway"
@ -1018,7 +1023,7 @@ onMounted(async () => {
</template>
</q-file>
<q-input
class="col-12 col-sm-6 col-md-7"
class="col-12 col-sm-6 col-md-7 inputgreen"
dense
outlined
v-model="deathCertificateNo"
@ -1026,7 +1031,7 @@ onMounted(async () => {
/>
<datepicker
class="col-12 col-sm-6 col-md-5"
class="col-12 col-sm-6 col-md-5 inputgreen"
menu-class-name="modalfix"
v-model="dateDeath"
:locale="'th'"
@ -1064,14 +1069,14 @@ onMounted(async () => {
</datepicker>
<q-input
class="col-12 col-sm-6 col-md-7"
class="col-12 col-sm-6 col-md-7 inputgreen"
dense
outlined
v-model="placeDeathCertificate"
label="สถานที่ออกใบมรณบัตร"
/>
<q-input
class="col-12"
class="col-12 inputgreen"
dense
outlined
v-model="reasonDeath"
@ -1083,11 +1088,8 @@ onMounted(async () => {
<q-separator />
<q-card-actions align="right">
<q-btn
unelevated
label="บันทึก"
dense
color="public"
class="q-px-md"
@click="clickSaveDeceased"
:disable="
filePassaway === null ||