diff --git a/src/stores/data.ts b/src/stores/data.ts index dad7009..2b4d032 100644 --- a/src/stores/data.ts +++ b/src/stores/data.ts @@ -13,7 +13,8 @@ export const useDataStore = defineStore("dataMain", () => { const storeRegistry = useRegistryInFormationStore(); const $q = useQuasar(); const mixin = useCounterMixin(); - const { messageError, showLoader, hideLoader, findPosMasterNo,findOrgName } = mixin; + const { messageError, showLoader, hideLoader, findPosMasterNo, findOrgName } = + mixin; // ref() คือการประกาศ state เหมือน vuex const formData = reactive({ profileId: "", @@ -26,7 +27,7 @@ export const useDataStore = defineStore("dataMain", () => { posTypeName: "", posLevelName: "", salary: null, - birthDate: '', + birthDate: "", posNo: "", org: "", dateStart: "", @@ -111,7 +112,12 @@ export const useDataStore = defineStore("dataMain", () => { formData.birthDate = data.birthDate; formData.posTypeName = data.posTypeName; formData.posExecutiveName = data.posExecutiveName; - formData.posLevelName = data.posLevelName; + formData.posLevelName = + data.profileType === "EMPLOYEE" + ? data.posTypeShortName + ? `${data.posTypeShortName} ${data.posLevelName}` + : `${data.posLevelName}` + : data.posLevelName; formData.dateStart = data.dateStart; formData.dateRetireLaw = data.dateRetireLaw; formData.posNo = findPosMasterNo(data);