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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

Browse source
This commit is contained in:
Warunee Tamkoo 2024-11-12 14:08:26 +07:00
commit 96dde8fda5
25 changed files with 59 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/06_retirement/components/resignEMP/ResignByid.vue
View file

@ -526,7 +526,7 @@ onMounted(async () => {
</script>
<template>
<div class="q-gutter-sm q-pa-sm">
<div class="q-pa-sm">
<div class="toptitle text-dark col-12 row items-center">
<q-btn
icon="mdi-arrow-left"
@ -1095,6 +1095,7 @@ onMounted(async () => {
greedy
@submit.prevent
@validation-success="onSubmitAttached"
class="full-width"
>
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-dark">
@ -1168,9 +1169,9 @@ onMounted(async () => {
:readonly="!edit"
:borderless="!edit"
v-model="positionTypeOld"
:rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
:rules="[(val:string) => !!val || `${'กรุณากรอกกลุ่มงาน'}`]"
hide-bottom-space
:label="`${'ตำแหน่งประเภท'}`"
:label="`${'กลุ่มงาน'}`"
/>
</div>
</div>

5
src/modules/06_retirement/components/resignEMP/ResignReject.vue
View file

@ -520,6 +520,7 @@ onMounted(async () => {
greedy
@submit.prevent
@validation-success="onSubmitAttached"
class="full-width"
>
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-dark">
@ -593,9 +594,9 @@ onMounted(async () => {
:readonly="!edit"
:borderless="!edit"
v-model="positionTypeOld"
:rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
:rules="[(val:string) => !!val || `${'กรุณากรอกกลุ่มงาน'}`]"
hide-bottom-space
:label="`${'ตำแหน่งประเภท'}`"
:label="`${'กลุ่มงาน'}`"
/>
</div>
</div>