Merge branch 'nice_dev' into develop

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-02-12 13:14:10 +07:00
commit 937bf4cf7b
4 changed files with 119 additions and 4 deletions

View file

@ -685,6 +685,19 @@ async function emitSearch(keyword: string, typeSelect: string) {
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div v-else-if="col.name === 'posExecutiveName'">
{{ col.value ? col.value : "-" }}
</div>
<div
v-else-if="col.name === 'positionExecutiveField'"
>
{{ col.value ? col.value : "-" }}
</div>
<div v-else-if="col.name === 'positionArea'">
{{ col.value ? col.value : "-" }}
</div>
<div v-else>
{{ col.value }}
</div>
@ -839,6 +852,19 @@ async function emitSearch(keyword: string, typeSelect: string) {
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div v-else-if="col.name === 'posExecutiveName'">
{{ col.value ? col.value : "-" }}
</div>
<div
v-else-if="col.name === 'positionExecutiveField'"
>
{{ col.value ? col.value : "-" }}
</div>
<div v-else-if="col.name === 'positionArea'">
{{ col.value ? col.value : "-" }}
</div>
<div v-else>
{{ col.value }}
</div>