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

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-06-05 18:14:42 +07:00
commit 13837fb002
5 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
View file

@ -494,6 +494,7 @@ onMounted(() => {
<div class="row q-col-gutter-sm">
<div class="col-xs-12 col-md-6">
<datepicker
menu-class-name="modalfix"
v-model="containDate"
:locale="'th'"
autoApply
@ -536,6 +537,7 @@ onMounted(() => {
</div>
<div class="col-xs-12 col-md-6">
<datepicker
menu-class-name="modalfix"
v-model="workDate"
:locale="'th'"
autoApply

2
src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
View file

@ -1059,6 +1059,7 @@ onMounted(async () => {
<div class="col-xs-12 col-sm-6 col-md-4">
<!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือกวันที่คำสั่งมีผล'}`, ]" -->
<datepicker
menu-class-name="modalfix"
v-model="formData.commandDateAffect"
:locale="'th'"
autoApply
@ -1179,6 +1180,7 @@ onMounted(async () => {
<div class="col-xs-6 col-sm-6 col-md-4">
<!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือก วันที่ลงนาม'}`,]" -->
<datepicker
menu-class-name="modalfix"
v-model="formData.commandDateSign"
:locale="'th'"
autoApply

2
src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
View file

@ -1023,6 +1023,7 @@ onMounted(async () => {
<div class="col-xs-12 col-sm-6 col-md-4">
<!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือกวันที่คำสั่งมีผล'}`, ]" -->
<datepicker
menu-class-name="modalfix"
v-model="formData.commandDateAffect"
:locale="'th'"
autoApply
@ -1143,6 +1144,7 @@ onMounted(async () => {
<div class="col-xs-6 col-sm-6 col-md-4">
<!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือก วันที่ลงนาม'}`,]" -->
<datepicker
menu-class-name="modalfix"
v-model="formData.commandDateSign"
:locale="'th'"
autoApply

2
src/modules/04_registryPerson/views/edit/components/FormPosition.vue
View file

@ -142,6 +142,7 @@ function classInput(val: boolean) {
<div class="col-xs-12 col-sm-6 col-md-4">
<!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือกวันที่คำสั่งมีผล'}`, ]" -->
<datepicker
menu-class-name="modalfix"
:readonly="isReadonly"
v-model="formData.commandDateAffect"
:locale="'th'"
@ -273,6 +274,7 @@ function classInput(val: boolean) {
<div class="col-xs-6 col-sm-6 col-md-4">
<!-- :rules="[ (val: string) => !!val || `${'กรุณาเลือก วันที่ลงนาม'}`,]" -->
<datepicker
menu-class-name="modalfix"
v-model="formData.commandDateSign"
:locale="'th'"
autoApply

3
src/modules/04_registryPerson/views/edit/components/Table.vue
View file

@ -1063,13 +1063,11 @@ onMounted(async () => {
/>
<datepicker
menu-class-name="modalfix"
v-model="formData.commandYear"
:locale="'th'"
autoApply
year-picker
:enableTimePicker="false"
teleport-center
@update:model-value="onUpdateData"
>
<template #year="{ year }">{{ year + 543 }}</template>
@ -1291,7 +1289,6 @@ onMounted(async () => {
:enableTimePicker="false"
week-start="0"
autoApply
teleport-center
@update:model-value="onUpdateData"
>
<template #year="{ year }">{{ year + 543 }}</template>