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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
STW_TTTY\stwtt 2024-08-29 14:38:10 +07:00
commit f34e62713a
17 changed files with 115 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/04_registryPerson/store.ts
View file

@ -88,6 +88,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
mode,
formFilter,
labelOption,
nodeData
nodeData,
};
});

12
src/modules/04_registryPerson/views/list.vue
View file

@ -143,9 +143,9 @@ function fetchDataPerson() {
queryParams.type = empType.value;
}
if (nodeData.node !== null && nodeData.nodeId !== null) {
queryParams.node = nodeData.node;
queryParams.nodeId = nodeData.nodeId;
if (store.nodeData.node !== null && store.nodeData.nodeId !== null) {
queryParams.node = store.nodeData.node;
queryParams.nodeId = store.nodeData.nodeId;
}
http
.get(
@ -256,12 +256,14 @@ async function selectType() {
: "เลือกหน่วยงาน";
} else {
// แต่ถ้าประเภทเดิมระบบจะใช้ filter เดิมที่เคยค้นหาไว้
if (
store.formFilter.keyword != "" ||
store.labelOption.posType != "ทั้งหมด" ||
store.labelOption.posLevel != "ทั้งหมด" ||
store.formFilter.isShowRetire != null ||
store.formFilter.isProbation != null
store.formFilter.isShowRetire ||
store.formFilter.isProbation ||
store.nodeData.nodeId != null
) {
store.formFilter.page = 1;
fetchDataPerson();