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

fix

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-03-24 09:08:00 +07:00
parent 77381dbd09
commit 924ca29cb1
6 changed files with 51 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
View file

@ -282,7 +282,7 @@ onMounted(() => {
<div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
<div>สังกัด</div>
</div>
<div class="col-12 col-sm-12 col-md-7">
<div class="col-12 col-sm-12 col-md-7 text-html">
{{ formMain.ocId ? formMain.ocId : "-" }}
</div>
</div>

21
src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
View file

@ -52,6 +52,7 @@ const {
formatDatePosition,
findOrgName,
convertDateToAPI,
findOrgNameHtml,
} = useCounterMixin();
const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
@ -195,8 +196,9 @@ const baseColumns = ref<QTableColumn[]>([
label: "สังกัด",
sortable: true,
field: "organization",
headerStyle: "font-size: 14px",
headerStyle: "font-size: 14px;",
style: "font-size: 14px",
format(val, row) {
return findOrgName({
root: row.orgRoot,
@ -960,8 +962,21 @@ onMounted(async () => {
<q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
</div>
<div v-else-if="col.name == 'organization'" class="table_ellipsis">
{{ col.value ? col.value : "-" }}
<div
v-else-if="col.name == 'organization'"
class="text-html"
>
{{
props.row
? findOrgNameHtml({
root: props.row.orgRoot,
child1: props.row.orgChild1,
child2: props.row.orgChild2,
child3: props.row.orgChild3,
child4: props.row.orgChild4,
})
: "-"
}}
</div>
<div v-else>
{{ col.value ? col.value : "-" }}

15
src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
View file

@ -50,6 +50,7 @@ const {
pathRegistryEmp,
onSearchDataTable,
convertDateToAPI,
findOrgNameHtml,
} = useCounterMixin();
const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
@ -906,8 +907,18 @@ onMounted(async () => {
<q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
</div>
<div v-else-if="col.name == 'organization'" class="table_ellipsis">
{{ col.value ? col.value : "-" }}
<div v-else-if="col.name == 'organization'" class="text-html">
{{
props.row
? findOrgNameHtml({
root: props.row.orgRoot,
child1: props.row.orgChild1,
child2: props.row.orgChild2,
child3: props.row.orgChild3,
child4: props.row.orgChild4,
})
: "-"
}}
</div>
<div v-else>
{{ col.value ? col.value : "-" }}