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

salary Columns discipline

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-05-01 14:28:45 +07:00
parent 929abb26fd
commit d3d6feb379
2 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
View file

@ -525,25 +525,30 @@ function onClickViewInfo(type: string, id: string) {
{{ props.row.isSuspension == null ? "-" : "" }}
</div>
</div>
<div
v-else-if="
col.name == 'posSalary' ||
col.name == 'discipline' ||
col.name == 'leave'
"
>
<div v-else-if="col.name == 'posSalary' || col.name == 'leave'">
<q-btn
v-if="checkPermission($route)?.attrIsGet"
flat
dense
icon="info"
:color="
col.name == 'discipline' && props.row.isPunish ? 'red' : 'info'
"
color="info"
@click.pervent="onClickViewInfo(col.name, props.row.profileId)"
>
</q-btn>
</div>
<div v-else-if="col.name == 'discipline'">
<q-btn
v-if="checkPermission($route)?.attrIsGet && props.row.isPunish"
flat
dense
icon="info"
color="red"
@click.pervent="onClickViewInfo(col.name, props.row.profileId)"
>
</q-btn>
<div v-else>-</div>
</div>
<div v-else>
{{ col.value ? col.value : "-" }}

27
src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
View file

@ -539,28 +539,35 @@ watch(
{{ Number(props.row.amount).toLocaleString() }}
</div>
<div
v-else-if="
col.name == 'posSalary' ||
col.name == 'discipline' ||
col.name == 'leave'
"
>
<div v-else-if="col.name == 'posSalary' || col.name == 'leave'">
<q-btn
v-if="checkPermission($route)?.attrIsGet"
flat
dense
icon="info"
class="q-pa-none q-ml-xs"
:color="
col.name == 'discipline' && props.row.isPunish ? 'red' : 'info'
"
color="info"
size="12px"
@click.pervent="onClickViewInfo(col.name, props.row.profileId)"
>
</q-btn>
</div>
<div v-else-if="col.name == 'discipline'">
<q-btn
v-if="checkPermission($route)?.attrIsGet && props.row.isPunish"
flat
dense
icon="info"
class="q-pa-none q-ml-xs"
color="red"
size="12px"
@click.pervent="onClickViewInfo(col.name, props.row.profileId)"
>
</q-btn>
<div v-else>-</div>
</div>
<div v-else>
{{ col.value ? col.value : "-" }}
</div>