hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m39s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-05-20 15:59:29 +07:00
commit 15fde564ed
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/Dialogs/DialogOrgSelectEmployee.vue
View file

@ -232,7 +232,8 @@ function close() {
async function getDataTable(id: string, level: number = 0) { async function getDataTable(id: string, level: number = 0) {
showLoader(); showLoader();
positionNo.value = [];
rowsData.value = [];
const body = { const body = {
node: level, node: level,
nodeId: id, nodeId: id,
@ -265,6 +266,7 @@ async function getDataTable(id: string, level: number = 0) {
posMasterNo: posMasterNo:
e.orgShortname + e.orgShortname +
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") + (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
" " +
e.posMasterNo + e.posMasterNo +
(e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""), (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
positionName: e.positionName, positionName: e.positionName,
@ -302,9 +304,7 @@ async function getDataTable(id: string, level: number = 0) {
messageError($q, err); messageError($q, err);
}) })
.finally(() => { .finally(() => {
setTimeout(() => { hideLoader();
hideLoader();
}, 1000);
}); });
} }

5
src/modules/05_placement/stores/storeSelect.ts
View file

@ -14,9 +14,10 @@ export const useSelectOrgStore = defineStore("selectorg", () => {
isPosition: e.isPosition, isPosition: e.isPosition,
posMasterNo: posMasterNo:
e.orgShortname + e.orgShortname +
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : " ") + (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
" " +
e.posMasterNo + e.posMasterNo +
(e.posMasterNoSuffix != null ? e.posMasterNoSuffix : " "), (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
positionName: e.positionName, positionName: e.positionName,
posTypeName: e.posTypeName, posTypeName: e.posTypeName,
posLevelName: e.posLevelName, posLevelName: e.posLevelName,