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

แก้ไขการแสดงผลกรณีถึงแก่กรรม

Browse source
This commit is contained in:
Warunee Tamkoo 2023-09-01 18:12:43 +07:00
parent 5555706f20
commit f9d8d9486e
5 changed files with 160 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/modules/08_registryEmployee/views/Salary.vue
View file

@ -16,26 +16,24 @@
>
<template #columns="props">
<q-tr :props="props">
<q-td
v-for="col in props.cols"
:key="col.name"
:props="props"
@click="selectData(props)"
class="cursor-pointer"
>
<q-td v-for="col in props.cols" :key="col.name" :props="props" @click="selectData(props)"
class="cursor-pointer">
<div v-if="col.name == 'date'" class="table_ellipsis">
{{ date2Thai(col.value) }}
</div>
<div
v-else-if="
<div v-else-if="props.row.salaryStatus !== 'DEATH' && (
col.name == 'positionSalaryAmount' ||
col.name == 'mouthSalaryAmount' ||
col.name == 'amount'
"
class="table_ellipsis"
>
col.name == 'amount')
" class="table_ellipsis">
{{ col.value == null ? "" : col.value.toLocaleString("en-US") }}
</div>
<div v-else-if="props.row.salaryStatus === 'DEATH' && col.name == 'position'" class="table_ellipsis">
ถึงแก่กรรม
</div>
<div v-else-if="props.row.salaryStatus === 'DEATH' && col.name !== 'salaryRef'" class="table_ellipsis">
-
</div>
<div v-else class="table_ellipsis">
{{ col.value }}
</div>
@ -1548,6 +1546,7 @@ const fetchData = async () => {
positionExecutiveSideId: e.positionExecutiveSideId,
salaryClass: e.salaryClass,
salaryRef: e.salaryRef,
salaryStatus: e.salaryStatus,
refCommandNo: e.refCommandNo,
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
@ -2026,6 +2025,7 @@ const clickHistory = async (row: RequestItemsObject) => {
salaryClass: e.salaryClass,
salaryRef: e.salaryRef,
refCommandNo: e.refCommandNo,
salaryStatus: e.salaryStatus,
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
});

2
src/modules/08_registryEmployee/views/SalaryEmployee.vue
View file

@ -1513,6 +1513,7 @@ const fetchData = async () => {
salaryClass: e.salaryClass,
salaryRef: e.salaryRef,
refCommandNo: e.refCommandNo,
salaryStatus: e.salaryStatus,
// refCommandDate: new Date(e.refCommandDate),
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
@ -1982,6 +1983,7 @@ const clickHistory = async (row: RequestItemsEmployee) => {
salaryClass: e.salaryClass,
salaryRef: e.salaryRef,
refCommandNo: e.refCommandNo,
salaryStatus: e.salaryStatus,
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
});