แก้ UI
This commit is contained in:
STW_TTTY\stwtt
parent
9fb037fc80
commit
7cbbc58218
2 changed files with 95 additions and 80 deletions
|
|
@ -586,7 +586,7 @@ function onSubmit() {
|
||||||
:key="index"
|
:key="index"
|
||||||
:name="item"
|
:name="item"
|
||||||
>
|
>
|
||||||
<div class="column q-col-gutter-sm" style="height: 70vh">
|
<div class="column q-col-gutter-sm" >
|
||||||
<!-- เลือกเลขที่ตำแหน่ง -->
|
<!-- เลือกเลขที่ตำแหน่ง -->
|
||||||
<div class="col-7">
|
<div class="col-7">
|
||||||
<q-card
|
<q-card
|
||||||
|
|
@ -731,7 +731,7 @@ function onSubmit() {
|
||||||
<div class="col-5">
|
<div class="col-5">
|
||||||
<q-card
|
<q-card
|
||||||
bordered
|
bordered
|
||||||
style="height: 100%; border: 1px solid #d6dee1"
|
style="min-height: 30vh; border: 1px solid #d6dee1"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
|
class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
|
||||||
|
|
@ -858,6 +858,14 @@ function onSubmit() {
|
||||||
: col.value
|
: col.value
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
v-else-if="col.name === 'positionArea'"
|
||||||
|
class="table_ellipsis"
|
||||||
|
>
|
||||||
|
{{
|
||||||
|
props.row.positionArea ? props.row.positionArea:'-'
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
|
||||||
<div v-else>
|
<div v-else>
|
||||||
{{ col.value ? col.value : "-" }}
|
{{ col.value ? col.value : "-" }}
|
||||||
|
|
|
||||||
|
|
@ -243,86 +243,93 @@ watch(
|
||||||
props.DataRow ? `${props.DataRow.currentRound} น.` : ""
|
props.DataRow ? `${props.DataRow.currentRound} น.` : ""
|
||||||
}}</span>
|
}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="row q-mt-sm justify-between">
|
<div class="row q-mt-sm q-col-gutter-sm">
|
||||||
<q-select
|
<div class="col-6">
|
||||||
v-model="formData.round"
|
<q-select
|
||||||
label="รอบที่ต้องการเปลี่ยน"
|
v-model="formData.round"
|
||||||
dense
|
label="รอบที่ต้องการเปลี่ยน"
|
||||||
ref="roundRef"
|
dense
|
||||||
:rules="[(val) => !!val || 'กรุณาเลือกรอบที่ต้องการเปลี่ยน']"
|
ref="roundRef"
|
||||||
emit-value
|
:rules="[
|
||||||
map-options
|
(val) => !!val || 'กรุณาเลือกรอบที่ต้องการเปลี่ยน',
|
||||||
option-label="name"
|
]"
|
||||||
:options="roundOp"
|
emit-value
|
||||||
option-value="id"
|
map-options
|
||||||
lazy-rules
|
option-label="name"
|
||||||
hide-bottom-space
|
:options="roundOp"
|
||||||
:borderless="true"
|
option-value="id"
|
||||||
outlined
|
lazy-rules
|
||||||
style="width: 23.5rem"
|
hide-bottom-space
|
||||||
/>
|
:borderless="true"
|
||||||
|
outlined
|
||||||
|
style="width: 23.5rem"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="col-6">
|
||||||
|
<datepicker
|
||||||
|
menu-class-name="modalfix"
|
||||||
|
v-model="formData.effectiveDate"
|
||||||
|
:locale="'th'"
|
||||||
|
autoApply
|
||||||
|
borderless
|
||||||
|
:enableTimePicker="false"
|
||||||
|
week-start="0"
|
||||||
|
:min-date="
|
||||||
|
dataToday
|
||||||
|
? new Date(dataToday.getTime() + 24 * 60 * 60 * 1000)
|
||||||
|
: null
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<template #year="{ year }">
|
||||||
|
{{ year + 543 }}
|
||||||
|
</template>
|
||||||
|
<template #year-overlay-value="{ value }">
|
||||||
|
{{ parseInt(value + 543) }}
|
||||||
|
</template>
|
||||||
|
<template #trigger>
|
||||||
|
<q-input
|
||||||
|
for="inputDatereceive"
|
||||||
|
outlined
|
||||||
|
hide-bottom-space
|
||||||
|
ref="effectiveDateRef"
|
||||||
|
dense
|
||||||
|
class="datepicker"
|
||||||
|
:model-value="
|
||||||
|
formData.effectiveDate != null
|
||||||
|
? date2Thai(formData.effectiveDate)
|
||||||
|
: null
|
||||||
|
"
|
||||||
|
label="วันที่ให้มีผล"
|
||||||
|
:rules="[
|
||||||
|
(val) => !!val || `${'กรุณาเลือกวันที่ให้มีผล'}`,
|
||||||
|
]"
|
||||||
|
>
|
||||||
|
<template v-slot:prepend>
|
||||||
|
<q-icon
|
||||||
|
name="event"
|
||||||
|
class="cursor-pointer"
|
||||||
|
style="color: var(--q-primary)"
|
||||||
|
>
|
||||||
|
</q-icon>
|
||||||
|
</template>
|
||||||
|
</q-input>
|
||||||
|
</template>
|
||||||
|
</datepicker>
|
||||||
|
</div>
|
||||||
|
|
||||||
<datepicker
|
<div class="col-12">
|
||||||
menu-class-name="modalfix"
|
<q-input
|
||||||
v-model="formData.effectiveDate"
|
outlined
|
||||||
:locale="'th'"
|
stack-label
|
||||||
autoApply
|
ref="resonRef"
|
||||||
borderless
|
v-model="formData.reson"
|
||||||
:enableTimePicker="false"
|
label="เหตุผล"
|
||||||
week-start="0"
|
hide-bottom-space
|
||||||
:min-date="
|
type="textarea"
|
||||||
dataToday
|
:rules="[(val) => !!val || `กรุณากรอกเหตุผล`]"
|
||||||
? new Date(dataToday.getTime() + 24 * 60 * 60 * 1000)
|
></q-input>
|
||||||
: null
|
</div>
|
||||||
"
|
|
||||||
>
|
|
||||||
<template #year="{ year }">
|
|
||||||
{{ year + 543 }}
|
|
||||||
</template>
|
|
||||||
<template #year-overlay-value="{ value }">
|
|
||||||
{{ parseInt(value + 543) }}
|
|
||||||
</template>
|
|
||||||
<template #trigger>
|
|
||||||
<q-input
|
|
||||||
for="inputDatereceive"
|
|
||||||
outlined
|
|
||||||
ref="effectiveDateRef"
|
|
||||||
dense
|
|
||||||
style="width: 23.5rem"
|
|
||||||
class="datepicker"
|
|
||||||
:model-value="
|
|
||||||
formData.effectiveDate != null
|
|
||||||
? date2Thai(formData.effectiveDate)
|
|
||||||
: null
|
|
||||||
"
|
|
||||||
label="วันที่ให้มีผล"
|
|
||||||
:rules="[
|
|
||||||
(val) => !!val || `${'กรุณาเลือกวันที่ให้มีผล'}`,
|
|
||||||
]"
|
|
||||||
>
|
|
||||||
<template v-slot:prepend>
|
|
||||||
<q-icon
|
|
||||||
name="event"
|
|
||||||
class="cursor-pointer"
|
|
||||||
style="color: var(--q-primary)"
|
|
||||||
>
|
|
||||||
</q-icon>
|
|
||||||
</template>
|
|
||||||
</q-input>
|
|
||||||
</template>
|
|
||||||
</datepicker>
|
|
||||||
</div>
|
</div>
|
||||||
<q-input
|
|
||||||
class="col-12 bg-white"
|
|
||||||
outlined
|
|
||||||
stack-label
|
|
||||||
ref="resonRef"
|
|
||||||
v-model="formData.reson"
|
|
||||||
label="เหตุผล"
|
|
||||||
hide-bottom-space
|
|
||||||
type="textarea"
|
|
||||||
:rules="[(val) => !!val || `กรุณากรอกเหตุผล`]"
|
|
||||||
></q-input>
|
|
||||||
</div>
|
</div>
|
||||||
</q-card-section>
|
</q-card-section>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue