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

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-12-26 13:49:06 +07:00
commit e55d3ca1bf
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue
View file

@ -89,6 +89,9 @@ const columns = ref<QTableProps["columns"]>([
field: "status",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return convertText(row.status);
},
},
]);
@ -224,11 +227,6 @@ watchEffect(() => {
1
}}
</div>
<div v-else-if="col.name == 'status'">
{{
props.row.status ? convertText(props.row.status) : "-"
}}
</div>
<div v-else>
{{ col.value ? col.value : "-" }}

6
src/modules/05_placement/components/probation/MainAppoint.vue
View file

@ -77,6 +77,9 @@ const columns = ref<QTableProps["columns"]>([
field: "status",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return convertText(row.status);
},
},
]);
@ -285,9 +288,6 @@ onMounted(async () => {
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div v-else-if="col.name == 'status'">
{{ props.row.status ? convertText(props.row.status) : "-" }}
</div>
<div v-else>
{{ col.value ? col.value : "-" }}