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

Merge branch 'develop' into devTee

Browse source 
# Conflicts:
#	src/api/15_development/api.development.ts
#	src/modules/15_development/interface/index/Main.ts
#	src/modules/15_development/interface/request/Main.ts
This commit is contained in:
STW_TTTY\stwtt 2024-04-03 17:13:53 +07:00
commit 5c1747262f
12 changed files with 210 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,6 +94,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",
@ -140,6 +161,8 @@ const visibleColumns = ref<string[]>([
"position",
"posType",
"posLevel",
"group",
"salaryLevel",
"amount",
"amountUse",
"positionSalaryAmount",
@ -283,7 +306,7 @@ watch(
store.roundMainCode === 'OCT'
? columns
: columns
? columns.slice(0, 10)
? columns.slice(0, 11)
: []
"
option-value="name"
@ -299,7 +322,7 @@ watch(
store.roundMainCode === 'OCT'
? columns
: columns
? columns.slice(0, 10)
? columns.slice(0, 11)
: []
"
:rows="props.rows"
@ -382,16 +405,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>