fixing display
This commit is contained in:
parent
07c816a8ef
commit
92d6804b31
1 changed files with 25 additions and 36 deletions
|
|
@ -675,6 +675,10 @@ onMounted(() => {
|
|||
dense
|
||||
class="custom-header-table"
|
||||
hide-pagination
|
||||
:pagination="{
|
||||
page: 1,
|
||||
rowsPerPage: 100,
|
||||
}"
|
||||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
|
|
@ -693,8 +697,8 @@ onMounted(() => {
|
|||
"
|
||||
round
|
||||
flat
|
||||
color="primary"
|
||||
icon="mdi-pencil-outline"
|
||||
color="edit"
|
||||
icon="edit"
|
||||
size="14px"
|
||||
@click="onOpenDialog(props.row)"
|
||||
>
|
||||
|
|
@ -709,10 +713,19 @@ onMounted(() => {
|
|||
>
|
||||
{{ `- ${row.position}`
|
||||
}}{{
|
||||
row.posType !== null || row.posLevel !== null
|
||||
? ` (${row.posType ? row.posType : ""}${
|
||||
row.posLevel ? " " + row.posLevel : ""
|
||||
})`
|
||||
props.row.groupTarget === "OFFICER" &&
|
||||
(row.posType || row.posLevel)
|
||||
? ` (${
|
||||
row.posType &&
|
||||
(row.posType == "อำนวยการ" ||
|
||||
row.posType == "บริหาร")
|
||||
? row.posType
|
||||
: ""
|
||||
}${row.posLevel ? row.posLevel : ""})`
|
||||
: row.posLevel
|
||||
? ` (${row.posLevel})`
|
||||
: row.posType
|
||||
? ` (${row.posType})`
|
||||
: ""
|
||||
}}
|
||||
</div>
|
||||
|
|
@ -751,6 +764,10 @@ onMounted(() => {
|
|||
dense
|
||||
class="custom-header-table"
|
||||
hide-pagination
|
||||
:pagination="{
|
||||
page: 1,
|
||||
rowsPerPage: 100,
|
||||
}"
|
||||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
|
|
@ -769,8 +786,8 @@ onMounted(() => {
|
|||
"
|
||||
round
|
||||
flat
|
||||
color="primary"
|
||||
icon="mdi-pencil-outline"
|
||||
color="edit"
|
||||
icon="edit"
|
||||
size="14px"
|
||||
@click="
|
||||
() => {
|
||||
|
|
@ -1100,13 +1117,6 @@ onMounted(() => {
|
|||
option-value="name"
|
||||
emit-value
|
||||
map-options
|
||||
:rules="[
|
||||
(val:string) =>
|
||||
!!val || `${formGroupTarget.groupTargetSub !== 'EMPLOYEE' &&
|
||||
formGroupTarget.groupTargetSub !== 'EMPLOYEETEMP'
|
||||
? 'กรุณาเลือกตำแหน่งประเภท'
|
||||
: 'กรุณาเลือกกลุ่มงาน ' }`,
|
||||
]"
|
||||
input-class="text-red"
|
||||
:label="
|
||||
formGroupTarget.groupTargetSub !== 'EMPLOYEE' &&
|
||||
|
|
@ -1141,13 +1151,6 @@ onMounted(() => {
|
|||
? 'ระดับตำแหน่ง'
|
||||
: 'ระดับชั้นงาน'
|
||||
"
|
||||
:rules="[
|
||||
(val:string) =>
|
||||
!!val || `${formGroupTarget.groupTargetSub !== 'EMPLOYEE' &&
|
||||
formGroupTarget.groupTargetSub !== 'EMPLOYEETEMP'
|
||||
? 'กรุณาเลือกระดับตำแหน่ง'
|
||||
: 'กรุณาเลือกระดับชั้นงาน ' }`,
|
||||
]"
|
||||
clearable
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -1398,13 +1401,6 @@ onMounted(() => {
|
|||
? 'ตำแหน่งประเภท'
|
||||
: 'กลุ่มงาน'
|
||||
"
|
||||
:rules="[
|
||||
(val:string) =>
|
||||
!!val || `${formGroupTarget.groupTargetSub !== 'EMPLOYEE' &&
|
||||
formGroupTarget.groupTargetSub !== 'EMPLOYEETEMP'
|
||||
? 'กรุณาเลือกตำแหน่งประเภท'
|
||||
: 'กรุณาเลือกกลุ่มงาน ' }`,
|
||||
]"
|
||||
clearable
|
||||
@update:model-value="updatePosTypeName"
|
||||
/>
|
||||
|
|
@ -1432,13 +1428,6 @@ onMounted(() => {
|
|||
"
|
||||
hide-bottom-space
|
||||
lazy-rules
|
||||
:rules="[
|
||||
(val:string) =>
|
||||
!!val || `${formGroupTarget.groupTargetSub !== 'EMPLOYEE' &&
|
||||
formGroupTarget.groupTargetSub !== 'EMPLOYEETEMP'
|
||||
? 'กรุณาเลือกระดับตำแหน่ง'
|
||||
: 'กรุณาเลือกระดับชั้นงาน ' }`,
|
||||
]"
|
||||
clearable
|
||||
/>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue