diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue index cb4000d20..e5b14f53f 100644 --- a/src/modules/04_registryPerson/components/TableView.vue +++ b/src/modules/04_registryPerson/components/TableView.vue @@ -399,9 +399,13 @@ watch( class="text-weight-medium q-mt-sm" > {{ - `${props.row.prefix ? props.row.prefix : ""}${ - props.row.firstName - } ${props.row.lastName}` + `${ + props.row.rank + ? props.row.rank + : props.row.prefix + ? props.row.prefix + : "" + }${props.row.firstName} ${props.row.lastName}` }}
รายละเอียด {{ - `${props.row.prefix ? props.row.prefix : ""}${ - props.row.firstName - } ${props.row.lastName}` + `${ + props.row.rank + ? props.row.rank + : props.row.prefix + ? props.row.prefix + : "" + }${props.row.firstName} ${props.row.lastName}` }}
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue index 300a62a9b..960a21bff 100644 --- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue +++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue @@ -485,7 +485,7 @@ onMounted(() => { {{ `${ informaData.rank ? informaData.rank : informaData.prefix ?? "" - } ${informaData.firstName} ${informaData.lastName}` + }${informaData.firstName} ${informaData.lastName}` }}
diff --git a/src/modules/04_registryPerson/interface/request/Main.ts b/src/modules/04_registryPerson/interface/request/Main.ts index 225cef4f6..ecda33aae 100644 --- a/src/modules/04_registryPerson/interface/request/Main.ts +++ b/src/modules/04_registryPerson/interface/request/Main.ts @@ -10,6 +10,8 @@ interface FormFilter { isShowRetire: boolean | null; isProbation: boolean | null; isAll?: boolean; + nodeId?: string | null; + node?: string | null; } interface FormAddPerson { diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts index 59e9aa6a8..867a7e72d 100644 --- a/src/modules/04_registryPerson/store.ts +++ b/src/modules/04_registryPerson/store.ts @@ -62,6 +62,8 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => { isShowRetire: false, isProbation: false, isAll: true, + nodeId: null, + node: null, }); const labelOption = reactive({ @@ -72,11 +74,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => { node: "เลือกหน่วยงาน", }); - const nodeData = reactive({ - nodeId: null, - node: null, - }); - return { fetchType, fetchLevel, @@ -89,6 +86,5 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => { mode, formFilter, labelOption, - nodeData, }; }); diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue index 4897cb7a3..308510db5 100644 --- a/src/modules/04_registryPerson/views/detailView.vue +++ b/src/modules/04_registryPerson/views/detailView.vue @@ -792,7 +792,7 @@ onMounted(async () => { formDetail.rank ? formDetail.rank : formDetail.prefix ?? "" - } ${formDetail.firstName} ${formDetail.lastName}` + }${formDetail.firstName} ${formDetail.lastName}` }}
diff --git a/src/modules/04_registryPerson/views/list.vue b/src/modules/04_registryPerson/views/list.vue index 822f35cb2..e5f5b9d83 100644 --- a/src/modules/04_registryPerson/views/list.vue +++ b/src/modules/04_registryPerson/views/list.vue @@ -44,21 +44,22 @@ const nodeData = reactive({ page: 1, pageSize: 10, round: "", - nodeId: null, - node: null, name: "เลือกหน่วยงาน/ส่วนราชการ", keyword: "", + nodeId: null, + node: null, }); -const conditionTotal = computed(() => { - let num: string = ""; - if (store.formFilter.isProbation && store.formFilter.isShowRetire) { - num = "(2)"; - } else if (store.formFilter.isProbation || store.formFilter.isShowRetire) { - num = "(1)"; - } else ""; - return num; -}); +// const conditionTotal = computed(() => { +// let num: string = ""; +// if (store.formFilter.isProbation && store.formFilter.isShowRetire) { +// num = "(2)"; +// } else if (store.formFilter.isProbation || store.formFilter.isShowRetire) { +// num = "(1)"; +// } else ""; + +// return num; +// }); /** * function เรียกข้อมูลตำแหน่งประเภท @@ -143,12 +144,15 @@ function fetchDataPerson() { queryParams.type = empType.value; } - if (store.nodeData.node !== null && store.nodeData.nodeId !== null) { - queryParams.node = store.nodeData.node; - queryParams.nodeId = store.nodeData.nodeId; + if (store.formFilter.node !== null && store.formFilter.nodeId !== null) { + queryParams.node = store.formFilter.node; + queryParams.nodeId = store.formFilter.nodeId; + } + + if (store.formFilter.nodeId) { + queryParams.isAll = store.formFilter.isAll; } - queryParams.isAll = store.formFilter.isAll; http .get( config.API.registryNew(empType.value !== "officer" ? "-employee" : ""), @@ -267,7 +271,7 @@ async function selectType() { store.labelOption.posLevel != "ทั้งหมด" || store.formFilter.isShowRetire || store.formFilter.isProbation || - store.nodeData.nodeId != null + store.formFilter.nodeId != null ) { store.formFilter.page = 1; fetchDataPerson(); @@ -316,6 +320,8 @@ function clearSelect(t: string) { } else if (t === "org") { nodeData.node = null; nodeData.nodeId = null; + store.formFilter.node = null; + store.formFilter.nodeId = null; store.labelOption.node = empType.value === "officer" ? "เลือกหน่วยงาน/ส่วนราชการ" @@ -332,8 +338,8 @@ async function fetchTree(id: string) { .then((res) => { const data = res.data.result; node.value = data; - store.nodeData.node = nodeData.node; - store.nodeData.nodeId = nodeData.nodeId; + store.formFilter.node = nodeData.node; + store.formFilter.nodeId = nodeData.nodeId; }) .catch((err) => { messageError($q, err); @@ -358,8 +364,8 @@ function fetchActive() { } function sendNode() { - nodeData.node = store.nodeData.node; - nodeData.nodeId = store.nodeData.nodeId; + nodeData.node = store.formFilter.node; + nodeData.nodeId = store.formFilter.nodeId; store.labelOption.node = nodeData.name; selectNode.value = false; fetchDataPerson(); @@ -376,15 +382,15 @@ watch( function updateSelectedTreeMain(data: any) { if (nodeData.node === data.orgLevel && nodeData.nodeId === data.orgTreeId) { - store.nodeData.node = null; - store.nodeData.nodeId = null; + store.formFilter.node = null; + store.formFilter.nodeId = null; nodeData.name = empType.value === "officer" ? "เลือกหน่วยงาน/ส่วนราชการ" : "เลือกหน่วยงาน"; } else { - store.nodeData.node = data.orgLevel; - store.nodeData.nodeId = data.orgTreeId; + store.formFilter.node = data.orgLevel; + store.formFilter.nodeId = data.orgTreeId; nodeData.name = data.orgName; } } @@ -466,12 +472,8 @@ onMounted(async () => { -->
{ /> {
{