diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue index 2f0bfee23..d4ccec3ae 100644 --- a/src/components/CardProfile.vue +++ b/src/components/CardProfile.vue @@ -16,7 +16,7 @@ import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; import { useCounterMixin } from "@/stores/mixin"; /** use*/ -const { findOrgNameOld, findOrgName } = useCounterMixin(); +const { findOrgNameOldHtml, findOrgNameHtml } = useCounterMixin(); /** propsDataProfile*/ const props = defineProps({ @@ -57,7 +57,7 @@ async function fetchDataProfile(data: DataProfile) { } else if (data.posLevelNameOld) { profile.positionLevel = `(${data.posLevelNameOld})`; } else profile.positionLevel = "-"; - profile.organization = findOrgNameOld(data); + profile.organization = findOrgNameOldHtml(data); } else { profile.position = data.position == "" || data.position == null ? "-" : data.position; @@ -68,7 +68,7 @@ async function fetchDataProfile(data: DataProfile) { } else if (data.posLevelName) { profile.positionLevel = `(${data.posLevelName})`; } else profile.positionLevel = "-"; - profile.organization = findOrgName(data); + profile.organization = findOrgNameHtml(data); } } diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue index 349a3befc..c5dc8c7ee 100644 --- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue +++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue @@ -146,7 +146,7 @@ const columns = ref([ { name: "oc", align: "left", - label: "สังกัด", + label: "หน่วยงาน", sortable: true, field: "oc", headerStyle: "font-size: 14px",