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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

Browse source 
# Conflicts:
#	src/modules/05_placement/components/Main.vue
This commit is contained in:
Thanit Konmek 2023-07-13 10:51:58 +07:00
commit 4854a01b7a
2 changed files with 49 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/modules/05_placement/components/Main.vue
View file

@ -135,17 +135,18 @@ const fetchPlacementData = async (val: number) => {
// rows.value = DataStore.DataMainOrig;
DataStore.DataMainOrig.map((e: any) => {
// rows.value.push({
// examRound: e.examRound,
// examOrder: e.examOrder,
// examTypeName: e.examTypeName,
// examTypeValue: e.examTypeValue,
// accountEndDate: date2Thai(e.accountEndDate),
// accountExpirationDate: date2Thai(e.accountExpirationDate),
// accountStartDate: date2Thai(e.accountStartDate),
// fiscalYear: e.fiscalYear,
// numberOfCandidates: e.numberOfCandidates,
// });
rows.value.push({
id: e.id,
examRound: e.examRound,
examOrder: e.examOrder,
examTypeName: e.examTypeName,
examTypeValue: e.examTypeValue,
accountEndDate: date2Thai(e.accountEndDate),
accountExpirationDate: date2Thai(e.accountExpirationDate),
accountStartDate: date2Thai(e.accountStartDate),
fiscalYear: e.fiscalYear,
numberOfCandidates: e.numberOfCandidates,
});
});
examTypeFilter();
@ -244,17 +245,18 @@ const searchFilterTable = async () => {
);
// rows.value = DataStore.DataMainUpdate;
DataStore.DataMainUpdate.map((e: any) => {
// rows.value.push({
// examRound: e.examRound,
// examOrder: e.examOrder,
// examTypeName: e.examTypeName,
// examTypeValue: e.examTypeValue,
// accountEndDate: date2Thai(e.accountEndDate),
// accountExpirationDate: date2Thai(e.accountExpirationDate),
// accountStartDate: date2Thai(e.accountStartDate),
// fiscalYear: e.fiscalYear,
// numberOfCandidates: e.numberOfCandidates,
// });
rows.value.push({
id: e.id,
examRound: e.examRound,
examOrder: e.examOrder,
examTypeName: e.examTypeName,
examTypeValue: e.examTypeValue,
accountEndDate: date2Thai(e.accountEndDate),
accountExpirationDate: date2Thai(e.accountExpirationDate),
accountStartDate: date2Thai(e.accountStartDate),
fiscalYear: e.fiscalYear,
numberOfCandidates: e.numberOfCandidates,
});
});
}
};

49
src/modules/05_placement/components/pass/Table.vue
View file

@ -143,9 +143,11 @@ const getTable = async () => {
const rowData = {
personalId: data.personalId,
idCard: data.idCard,
fullName: data.fullName,
fullName: data.fullName + ' ' + data.idCard,
name: data.fullName,
profilePhoto: data.profilePhoto,
organizationName: data.organizationName,
organizationName: data.organizationName + ' ' + data.organizationShortName + ' ' + data.positionNumber + ' ' + data.positionPath,
orgName: data.organizationName,
organizationShortName: data.organizationShortName,
positionNumber: data.positionNumber,
positionPath: data.positionPath,
@ -423,30 +425,29 @@ const pagination = ref({
/>
<img v-else :src="props.row.avatar" class="col-4 img-info" />
<div class="col-4">
<div class="text-weight-medium">{{ props.row.fullName }}</div>
<div class="text-weight-light">{{ props.row.idCard }}</div>
<div class="text-weight-medium">{{ props.row.name }}</div>
<div class="text-weight-light">{{ props.row.idCard }}</div>
</div>
</div>
</div>
</template>
<template v-else-if="col.name === 'number'">
<div class="text-weight-medium">
{{ props.row.number !== null ? props.row.number : "-" }}
</div>
</template>
</template>
<template v-else-if="col.name === 'number'">
<div class="text-weight-medium">
{{ props.row.number !== null ? props.row.number : "-" }}
</div>
</template>
<template v-else-if="col.name === 'organizationName'">
<div
v-if="
props.row.organizationName !== null ||
props.row.positionPath !== null
"
>
<div class="col-4">
<div class="text-weight-medium">
{{
props.row.organizationName !== null
? props.row.organizationName
: "-"
<template v-else-if="col.name === 'organizationName'">
<div
v-if="props.row.orgName !== null ||
props.row.positionPath !== null
"
>
<div class="col-4">
<div class="text-weight-medium">
{{
props.row.orgName !== null
? props.row.orgName
: "-"
}}
{{
props.row.organizationShortName !== null