Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2024-11-05 09:22:12 +07:00
commit c29eede844
24 changed files with 171 additions and 129 deletions

View file

@ -274,7 +274,7 @@ onMounted(() => {
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -290,7 +290,7 @@ onMounted(() => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -306,7 +306,7 @@ onMounted(() => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -322,7 +322,7 @@ onMounted(() => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12">
<q-input
v-model="salary"
@ -339,7 +339,7 @@ onMounted(() => {
:class="getClass(edit)"
/>
</div>
</div>
</div> -->
<div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-6 row items-center">
<div class="col-12">

View file

@ -258,7 +258,7 @@ onMounted(() => {
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -274,7 +274,7 @@ onMounted(() => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -290,7 +290,7 @@ onMounted(() => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -306,7 +306,7 @@ onMounted(() => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12">
<q-input
v-model="salary"
@ -323,7 +323,7 @@ onMounted(() => {
:class="getClass(edit)"
/>
</div>
</div>
</div> -->
<div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-6 row items-center">
<div class="col-12">

View file

@ -261,7 +261,7 @@ onMounted(async () => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -277,7 +277,7 @@ onMounted(async () => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -293,7 +293,7 @@ onMounted(async () => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -309,7 +309,7 @@ onMounted(async () => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12">
<q-input
v-model="salary"
@ -326,7 +326,7 @@ onMounted(async () => {
reverse-fill-mask
/>
</div>
</div>
</div> -->
<div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-4 row items-center">
<div class="col-12">

View file

@ -930,7 +930,7 @@ onMounted(async () => {
type="textarea"
/>
</div>
<div class="col-xs-6 col-sm-3">
<div class="col-xs-6 col-sm-4">
<q-input
:class="getClass(edit)"
:outlined="edit"
@ -944,7 +944,7 @@ onMounted(async () => {
:label="`${'ประเภทตำแหน่ง'}`"
/>
</div>
<div class="col-xs-6 col-sm-3">
<div class="col-xs-6 col-sm-4">
<q-input
:class="getClass(edit)"
:outlined="edit"
@ -958,7 +958,7 @@ onMounted(async () => {
:label="`${'ระดับตำแหน่ง'}`"
/>
</div>
<div class="col-xs-6 col-sm-3">
<div class="col-xs-6 col-sm-4">
<q-input
:class="getClass(edit)"
:outlined="edit"
@ -972,7 +972,7 @@ onMounted(async () => {
:label="`${'เลขที่'}`"
/>
</div>
<div class="col-xs-6 col-sm-3">
<!-- <div class="col-xs-6 col-sm-3">
<q-input
:class="getClass(edit)"
v-model="salary"
@ -987,7 +987,7 @@ onMounted(async () => {
mask="###,###,###,###"
reverse-fill-mask
/>
</div>
</div> -->
<div class="col-xs-12">
<q-input
:class="getClass(edit)"

View file

@ -234,7 +234,7 @@ onMounted(() => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -250,7 +250,7 @@ onMounted(() => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -266,7 +266,7 @@ onMounted(() => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">
<q-input
:class="getClass(edit)"
@ -282,7 +282,7 @@ onMounted(() => {
/>
</div>
</div>
<div class="col-xs-6 col-sm-3 row">
<!-- <div class="col-xs-6 col-sm-3 row">
<div class="col-12">
<q-input
v-model="salary"
@ -299,7 +299,7 @@ onMounted(() => {
reverse-fill-mask
/>
</div>
</div>
</div> -->
<div class="col-12"><q-separator /></div>
<div class="col-xs-6 col-sm-4 row">
<div class="col-12">

View file

@ -547,7 +547,7 @@ onMounted(async () => {
</div>
<div class="col-12">
<div class="row q-col-gutter-x-xs">
<div class="col-xs-6 col-sm-3">
<div class="col-xs-6 col-sm-4">
<q-input
:class="getClass(edit)"
:outlined="edit"
@ -561,7 +561,7 @@ onMounted(async () => {
:label="`${'ประเภทตำแหน่ง'}`"
/>
</div>
<div class="col-xs-6 col-sm-3">
<div class="col-xs-6 col-sm-4">
<q-input
:class="getClass(edit)"
:outlined="edit"
@ -575,7 +575,7 @@ onMounted(async () => {
:label="`${'ระดับตำแหน่ง'}`"
/>
</div>
<div class="col-xs-6 col-sm-3">
<div class="col-xs-6 col-sm-4">
<q-input
:class="getClass(edit)"
:outlined="edit"
@ -589,7 +589,7 @@ onMounted(async () => {
:label="`${'เลขที่'}`"
/>
</div>
<div class="col-xs-6 col-sm-3">
<!-- <div class="col-xs-6 col-sm-3">
<q-input
:class="getClass(edit)"
:outlined="edit"
@ -604,7 +604,7 @@ onMounted(async () => {
mask="###,###,###,###"
reverse-fill-mask
/>
</div>
</div> -->
</div>
</div>