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

ปรับแสดงคอมลัมน์ แก้ bug แสดงเกษียณ ของเลื่อนค่าจ้างลูกจ้าง

Browse source
This commit is contained in:
Warunee Tamkoo 2024-04-03 11:43:24 +07:00
parent 80d48c9f1b
commit 77e68ab871
3 changed files with 60 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue
View file

@ -76,6 +76,15 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "posLevel",
align: "left",
label: "ระดับชั้นงาน",
sortable: false,
field: "posLevel",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "posType",
align: "left",
@ -94,6 +103,27 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "group",
align: "left",
label: "ผังค่าจ้าง(เดิม)",
sortable: false,
field: "group",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return val ? "กลุ่ม" + val : "-";
},
},
{
name: "salaryLevel",
align: "left",
label: "ขั้น(เดิม)",
sortable: false,
field: "salaryLevel",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "amount",
align: "left",
@ -144,6 +174,8 @@ const visibleColumns = ref<string[]>([
"amountUse",
"positionSalaryAmount",
"isRetired",
"group",
"salaryLevel",
]);
/** modalDialog*/
@ -283,7 +315,7 @@ watch(
store.roundMainCode === 'OCT'
? columns
: columns
? columns.slice(0, 10)
? columns.slice(0, 12)
: []
"
option-value="name"
@ -382,16 +414,12 @@ watch(
}}
</div>
<div
v-else-if="
col.name === 'isRetired' && store.roundMainCode === 'OCT'
"
>
<div v-else-if="col.name === 'isRetired'">
<q-icon
name="check"
color="primary"
size="24px"
v-if="props.row.isRetired"
v-if="props.row.isRetired && store.roundMainCode === 'OCT'"
/>
</div>

23
src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue
View file

@ -89,6 +89,27 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "group",
align: "left",
label: "ผังค่าจ้าง(เดิม)",
sortable: false,
field: "group",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return val ? "กลุ่ม" + val : "-";
},
},
{
name: "salaryLevel",
align: "left",
label: "ขั้น(เดิม)",
sortable: false,
field: "salaryLevel",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "amount",
align: "left",
@ -176,6 +197,8 @@ const visibleColumns = ref<string[]>([
"isSuspension",
"isAbsent",
"isLeave",
"group",
"salaryLevel",
]);
/** modalDialog*/

8
src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
View file

@ -392,16 +392,12 @@ watch(
}}
</div>
<div
v-else-if="
col.name === 'isRetired' && store.roundMainCode === 'OCT'
"
>
<div v-else-if="col.name === 'isRetired'">
<q-icon
name="check"
color="primary"
size="24px"
v-if="props.row.isRetired"
v-if="props.row.isRetired && store.roundMainCode === 'OCT'"
/>
</div>