fix(organization): prevent displaying null for prefix
This commit is contained in:
parent
660fed8375
commit
d73fbf80f9
3 changed files with 6 additions and 4 deletions
|
|
@ -213,7 +213,9 @@ function formatHistoryOwnerData(data: HistoryPos[]) {
|
|||
return data.map((item) => ({
|
||||
...item,
|
||||
fullname: item.firstName
|
||||
? `${item.prefix}${item.firstName} ${item.lastName}`.trim()
|
||||
? `${item.prefix || ""}${item.firstName || ""} ${
|
||||
item.lastName || ""
|
||||
}`.trim()
|
||||
: "ว่าง",
|
||||
}));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ const modal = defineModel<boolean>("modal", { required: true });
|
|||
let reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
|
||||
const totalPage = defineModel<number>("totalPage", { 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 props = defineProps({
|
||||
fetchDataTree: {
|
||||
|
|
|
|||
|
|
@ -777,7 +777,7 @@ watch(
|
|||
<DialogMovePos
|
||||
v-model:modal="modalDialogMMove"
|
||||
v-model:nodeTree="nodeTree"
|
||||
v-model:columns="columns as QTableProps[]"
|
||||
v-model:columns="columns"
|
||||
v-model:rows="posMaster"
|
||||
v-model:totalPage="totalPage"
|
||||
v-model:reqMaster="reqMaster"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue