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

แก้ ชื่อ อาจ null

Browse source
This commit is contained in:
STW_TTTY\stwtt 2024-06-24 15:21:20 +07:00
parent 9599310b84
commit 16ab4806a5
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/06_retirement/components/ListRetirement/AddList.vue
View file

@ -132,6 +132,9 @@ const fecthProfile = async () => {
); );
rows.value = res.data.result.data.map((e: any) => ({ rows.value = res.data.result.data.map((e: any) => ({
id: e.id, id: e.id,
prefix:e.prefix,
firstName:e.firstName,
lastName:e.lastName,
fullname: e.prefix + e.firstName + " " + e.lastName, fullname: e.prefix + e.firstName + " " + e.lastName,
position: e.position, position: e.position,
level: level:
@ -265,10 +268,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
<q-tr :props="props" class="cursor-pointer"> <q-tr :props="props" class="cursor-pointer">
<q-td>{{ props.rowIndex + 1 }}</q-td> <q-td>{{ props.rowIndex + 1 }}</q-td>
<q-td key="fullname" :props="props"> <q-td key="fullname" :props="props">
{{ props.row.fullname }} {{ props.row.prefix ? props.row.prefix:'' }}{{ props.row.firstName ? props.row.firstName:'' }} {{ props.row.lastName ? props.row.lastName:'' }}
</q-td> </q-td>
<q-td key="position" :props="props"> <q-td key="position" :props="props">
{{ props.row.position }} {{ props.row.position ? props.row.position:'-' }}
</q-td> </q-td>
<q-td key="level" :props="props">{{ props.row.level }}</q-td> <q-td key="level" :props="props">{{ props.row.level }}</q-td>
<q-td <q-td

17
src/modules/06_retirement/components/ListRetirement/TableList.vue
View file

@ -53,7 +53,7 @@ const dataProfile = ref<Object>([]);
/** คอลัมน์ที่แสดง */ /** คอลัมน์ที่แสดง */
const columns = ref<any["columns"]>([]); const columns = ref<any["columns"]>([]);
const rows = ref<any>([]); const rows = ref<any[]>([]);
const visibleColumns = ref<string[]>([ const visibleColumns = ref<string[]>([
"order", "order",
"name", "name",
@ -101,6 +101,9 @@ const fecthlistprofile = async (id: string) => {
id: e.id, id: e.id,
profileId: e.profileId, profileId: e.profileId,
order: e.order, order: e.order,
prefix: e.prefix,
firstName: e.firstName,
lastName: e.lastName,
name: e.prefix + e.firstName + " " + e.lastName, name: e.prefix + e.firstName + " " + e.lastName,
organization: e.root, organization: e.root,
position: e.position, position: e.position,
@ -629,7 +632,11 @@ function updatemodalPersonal(modal: boolean) {
@click.stop="onclickViewinfo(props.row.profileId)" @click.stop="onclickViewinfo(props.row.profileId)"
> >
<q-td key="order" :props="props">{{ props.row.order }} </q-td> <q-td key="order" :props="props">{{ props.row.order }} </q-td>
<q-td key="name" :props="props">{{ props.row.name }}</q-td> <q-td key="name" :props="props"
>{{ props.row.prefix ? props.row.prefix : ""
}}{{ props.row.firstName ? props.row.firstName : "" }}
{{ props.row.lastName ? props.row.lastName : "" }}</q-td
>
<!-- <q-td <!-- <q-td
class="table_ellipsis" class="table_ellipsis"
key="organizationOrganization" key="organizationOrganization"
@ -637,7 +644,7 @@ function updatemodalPersonal(modal: boolean) {
>{{ props.row.organizationOrganization }}</q-td >{{ props.row.organizationOrganization }}</q-td
> --> > -->
<q-td key="position" :props="props">{{ <q-td key="position" :props="props">{{
props.row.position props.row.position ? props.row.position:'-'
}}</q-td> }}</q-td>
<q-td key="positionType" :props="props" <q-td key="positionType" :props="props"
>{{ props.row.positionType ? props.row.positionType : "-" }} >{{ props.row.positionType ? props.row.positionType : "-" }}
@ -649,7 +656,7 @@ function updatemodalPersonal(modal: boolean) {
</q-td> </q-td>
<q-td key="positionNumber" :props="props">{{ <q-td key="positionNumber" :props="props">{{
props.row.positionNumber props.row.positionNumber ? props.row.positionNumber:'-'
}}</q-td> }}</q-td>
<!-- <q-td key="organizationAgency" :props="props">{{ <!-- <q-td key="organizationAgency" :props="props">{{
props.row.organizationAgency props.row.organizationAgency
@ -658,7 +665,7 @@ function updatemodalPersonal(modal: boolean) {
props.row.organizationGovernmentAgency props.row.organizationGovernmentAgency
}}</q-td> --> }}</q-td> -->
<q-td class="table_ellipsis" key="organization" :props="props">{{ <q-td class="table_ellipsis" key="organization" :props="props">{{
props.row.organization props.row.organization ? props.row.organization:'-'
}}</q-td> }}</q-td>
<!-- <q-td class="table_ellipsis" key="bureau" :props="props">{{ <!-- <q-td class="table_ellipsis" key="bureau" :props="props">{{
props.row.bureau props.row.bureau