Merge branch 'nice' into develop

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-05-20 10:11:50 +07:00
commit be9951bd40
2 changed files with 10 additions and 3 deletions

View file

@ -41,7 +41,9 @@ function fetchDataProfile(data: DataProfile) {
fetchProfile(data.profileId);
}
profile.id = data.profileId;
profile.fullName = `${data.prefix}${data.firstName} ${data.lastName}`;
profile.fullName = `${data.prefix ?? ""}${data.firstName ?? ""} ${
data.lastName ?? ""
} `;
profile.position =
data.position == "" || data.position === null ? "-" : data.position;
if (data.posTypeName && data.posLevelName) {

View file

@ -10,12 +10,14 @@ import config from "@/app.config";
import keycloak from "@/plugins/keycloak";
import type { QTableProps, QForm } from "quasar";
import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
import type {
TypeFile,
ResponseDataDetail,
rowFile,
} from "@/modules/05_placement/interface/response/Transfer";
import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
import CardProfile from "@/components/CardProfile.vue";
const modalPersonal = ref<boolean>(false);
const personId = ref<string>("");
@ -28,6 +30,7 @@ const dataId = route.params.id as string;
const myForm = ref<QForm | null>(null);
const roleAdmin = ref<boolean>(false);
const edit = ref<boolean>(false);
const dataProfile = ref<DataProfile>();
const organizationPositionOld = ref<string>("");
const positionTypeOld = ref<string>("");
@ -164,6 +167,7 @@ const getData = async () => {
.get(config.API.transferId(dataId.toString()))
.then((res: any) => {
const data = res.data.result;
dataProfile.value = res.data.result as unknown as DataProfile;
id.value = data.id;
let list: TypeFile[] = [];
if (data.docs.length > 0) {
@ -319,7 +323,8 @@ onMounted(async () => {
/>
รายละเอยดการขอโอนของ {{ responseData.fullname }}
</div>
<q-card bordered class="row col-12 text-dark">
<CardProfile :data="dataProfile as DataProfile" />
<!-- <q-card bordered class="row col-12 text-dark">
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-subtitle2">
{{ responseData.fullname }}
@ -371,7 +376,7 @@ onMounted(async () => {
</div>
</div>
</div>
</q-card>
</q-card> -->
<q-card bordered class="row col-12 text-dark q-mt-sm">
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">