diff --git a/src/modules/01_metadataNew/components/position-employee/01ListPosition.vue b/src/modules/01_metadataNew/components/position-employee/01ListPosition.vue index 813b2d1e4..b1e309a66 100644 --- a/src/modules/01_metadataNew/components/position-employee/01ListPosition.vue +++ b/src/modules/01_metadataNew/components/position-employee/01ListPosition.vue @@ -170,23 +170,25 @@ async function fetchData(statusFetch: boolean = false) { } async function fetchType() { - showLoader(); - await http - .get(config.API.orgEmployeeType) - .then((res) => { - const data = res.data.result; - posTypeMain.value = data; - posTypeOp.value = data.map((e: ResGroup) => ({ - id: e.id, - name: e.posTypeName, - })); - }) - .catch((err) => { - messageError($q, err); - }) - .finally(() => { - hideLoader(); - }); + if (posTypeMain.value.length === 0) { + showLoader(); + await http + .get(config.API.orgEmployeeType) + .then((res) => { + const data = res.data.result; + posTypeMain.value = data; + posTypeOp.value = data.map((e: ResGroup) => ({ + id: e.id, + name: e.posTypeName, + })); + }) + .catch((err) => { + messageError($q, err); + }) + .finally(() => { + hideLoader(); + }); + } } async function onClickSubmit() { diff --git a/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue b/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue index bd8160a45..2cfcbdf08 100644 --- a/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue +++ b/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue @@ -88,6 +88,7 @@ const visibleColumns = ref([ const filter = ref(""); const levelId = ref(""); +const titleName = ref(""); const formDataLevel = reactive({ posLevelName: null, posTypeName: "", @@ -109,7 +110,8 @@ function fetchPosGroup() { .then((res) => { const data: ResGroup[] = res.data.result; const group = data.find((e: ResGroup) => e.id === posTypeId.value); - formDataLevel.posTypeName = group?.posTypeName; + + titleName.value = group?.posTypeName ?? null; }) .catch((err) => { messageError($q, err); @@ -148,6 +150,8 @@ function onClickOpenDialog(statusEdit: boolean = false, data: any = []) { formDataLevel.posLevelName = data.posLevelName; formDataLevel.posTypeName = data.posTypeName; formDataLevel.posLevelAuthority = data.posLevelAuthority; + } else { + formDataLevel.posTypeName = titleName.value ? titleName.value : ""; } } @@ -236,7 +240,7 @@ onMounted(() => { class="q-mr-sm" @click="router.go(-1)" /> - รายการระดับชั้นงาน{{ formDataLevel.posTypeName }} + รายการระดับชั้นงาน{{ titleName }}