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

fix(organization): prevent displaying null for prefix

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-05-22 17:51:03 +07:00
parent 660fed8375
commit d73fbf80f9
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/02_organization/components/DialogHistoryPos.vue
View file

@ -213,7 +213,9 @@ function formatHistoryOwnerData(data: HistoryPos[]) {
return data.map((item) => ({ return data.map((item) => ({
...item, ...item,
fullname: item.firstName fullname: item.firstName
? `${item.prefix}${item.firstName} ${item.lastName}`.trim() ? `${item.prefix || ""}${item.firstName || ""} ${
item.lastName || ""
}`.trim()
: "ว่าง", : "ว่าง",
})); }));
} }

2
src/modules/16_positionEmployee/components/DialogMovePos.vue
View file

@ -50,7 +50,7 @@ const modal = defineModel<boolean>("modal", { required: true });
let reqMaster = defineModel<FilterMaster>("reqMaster", { required: true }); let reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
const totalPage = defineModel<number>("totalPage", { required: true }); const totalPage = defineModel<number>("totalPage", { required: true });
const nodeTree = defineModel<OrgTree[]>("nodeTree", { required: true }); const nodeTree = defineModel<OrgTree[]>("nodeTree", { required: true });
const columns = defineModel<QTableProps[]>("columns", {}); const columns = defineModel<QTableProps["columns"]>("columns", { required: true });
const rows = defineModel<PosMaster2[]>("rows", { required: true }); const rows = defineModel<PosMaster2[]>("rows", { required: true });
const props = defineProps({ const props = defineProps({
fetchDataTree: { fetchDataTree: {

2
src/modules/16_positionEmployee/components/TableMain.vue
View file

@ -777,7 +777,7 @@ watch(
<DialogMovePos <DialogMovePos
v-model:modal="modalDialogMMove" v-model:modal="modalDialogMMove"
v-model:nodeTree="nodeTree" v-model:nodeTree="nodeTree"
v-model:columns="columns as QTableProps[]" v-model:columns="columns"
v-model:rows="posMaster" v-model:rows="posMaster"
v-model:totalPage="totalPage" v-model:totalPage="totalPage"
v-model:reqMaster="reqMaster" v-model:reqMaster="reqMaster"