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

fix bug

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-06-24 15:57:23 +07:00
parent 5246a694d4
commit 53fc2493e3
9 changed files with 100 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/modules/05_placement/components/PersonalList/Table.vue
View file

@ -898,37 +898,6 @@ onMounted(async () => {
>
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-list dense style="min-width: 180px">
<q-item
v-if="
roleAdmin &&
props.row.draft !== 'ส่งตัวแล้ว' &&
props.row.statusId !== 'DISCLAIM'
"
clickable
v-close-popup
@click="
openAppointModal(
props.row.personalId,
props.row,
'APPOINTED'
)
"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="primary"
size="xs"
name="mdi-bookmark-outline"
/>
</q-item-section>
<q-item-section
>เลือกหน่วยงานที่รับบรรจุและแต่งตั้ง</q-item-section
>
</q-item>
<q-item
v-if="
props.row.nodeName !== null &&
@ -1010,6 +979,38 @@ onMounted(async () => {
<q-item-section>เลือกหน่วยงานที่รับแต่งตั้ง</q-item-section>
</q-item>
<q-item
v-if="
roleAdmin &&
props.row.draft !== 'ส่งตัวแล้ว' &&
props.row.statusId !== 'DISCLAIM'
"
clickable
v-close-popup
@click="
openAppointModal(
props.row.personalId,
props.row,
'APPOINTED'
)
"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="primary"
size="xs"
name="mdi-bookmark-outline"
/>
</q-item-section>
<q-item-section
>เลือกหน่วยงานที่รับบรรจุและแต่งตั้ง</q-item-section
>
</q-item>
<q-item
v-if="
props.row.bmaOfficer !== 'บุคคลภายนอก' &&

9
src/modules/05_placement/components/Transfer/transferMain.vue
View file

@ -66,7 +66,7 @@ const columns = ref<QTableProps["columns"]>([
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
format(val, row) {
return `${row.prefix}${row.firstName} ${row.lastName}`;
return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
},
},
{
@ -78,7 +78,11 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return row.positionTypeOld + " (" + row.positionLevelOld + ")";
return row.positionTypeOld
? `${row.positionTypeOld}${
row.positionLevelOld ? `(${row.positionLevelOld})` : ""
}`
: "";
},
},
{
@ -257,6 +261,7 @@ onMounted(async () => {
</div>
<div v-else>
{{}}
{{
col.value == null ? "" : col.value == "" ? "-" : col.value
}}