From f00e98766cd3a50f1093fe286cbc15915f4d11f9 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Tue, 5 Mar 2024 14:13:46 +0700 Subject: [PATCH 1/4] closed #14 --- .../components/DialogNewStructure.vue | 4 ++-- src/modules/02_organizationalNew/views/main.vue | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/modules/02_organizationalNew/components/DialogNewStructure.vue b/src/modules/02_organizationalNew/components/DialogNewStructure.vue index cd59d44e4..7e1e01c44 100644 --- a/src/modules/02_organizationalNew/components/DialogNewStructure.vue +++ b/src/modules/02_organizationalNew/components/DialogNewStructure.vue @@ -29,6 +29,7 @@ const props = defineProps({ fetchActive: { type: Function, require: true, + default: () => "fetchActive function", }, }); @@ -84,7 +85,6 @@ function validateForm() { } if (hasError.every((result) => result === true)) { onSubmit(); - } else { } } @@ -102,7 +102,7 @@ function onSubmit() { store.draftId = res.data.result.id; store.statusView = "list"; success($q, "บันทึกข้อมูลสำเร็จ"); - props.fetchActive?.(); + props.fetchActive(); }) .catch((err) => { messageError($q, err); diff --git a/src/modules/02_organizationalNew/views/main.vue b/src/modules/02_organizationalNew/views/main.vue index 31b3809e5..3a805b1ac 100644 --- a/src/modules/02_organizationalNew/views/main.vue +++ b/src/modules/02_organizationalNew/views/main.vue @@ -29,8 +29,8 @@ const modalDateTime = ref(false); // ตั้งเวลาเผย /** สถานะ*/ const isStatusData = ref(false); // แสดงตั้งเวลาเผยแพร่ -const ishasActive = ref(false); // สถานะการทำงาน -const ishasDraft = ref(false); // สถานะแบบร่าง +// const ishasActive = ref(false); // สถานะการทำงาน +// const ishasDraft = ref(false); // สถานะแบบร่าง /** List เพิ่มโครงสร้าง*/ const itemStructure = ref([ { @@ -73,10 +73,10 @@ async function fetchOrganizationActive() { isStatusData.value = true; if (isStatusData.value) { if (data.activeName === null) { - ishasActive.value = true; + // ishasActive.value = true; store.typeOrganizational = "draft"; } else if (data.draftName === null) { - ishasDraft.value = true; + // ishasDraft.value = true; store.typeOrganizational = "current"; } } @@ -225,6 +225,7 @@ onMounted(async () => { :outline="store.typeOrganizational === 'current' ? false : true" color="blue" label="ปัจจุบัน" + :disable="store.activeId == '' || store.activeId == null" @click=" (store.typeOrganizational = 'current'), (labelHistory = 'ประวัติโครงสร้าง') @@ -237,11 +238,11 @@ onMounted(async () => { :outline="store.typeOrganizational === 'draft' ? false : true" color="blue" label="แบบร่าง" + :disable="store.draftId == '' || store.draftId == null" @click=" (store.typeOrganizational = 'draft'), (labelHistory = 'ประวัติโครงสร้าง') " - :disable="ishasDraft" /> Date: Tue, 5 Mar 2024 14:27:00 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?= =?UTF-8?q?=20tab=20=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/02_organizationalNew/views/main.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/02_organizationalNew/views/main.vue b/src/modules/02_organizationalNew/views/main.vue index 3a805b1ac..998cf0493 100644 --- a/src/modules/02_organizationalNew/views/main.vue +++ b/src/modules/02_organizationalNew/views/main.vue @@ -143,6 +143,7 @@ function onClickHistory(id: string, name: string) { /** lifecycleHook */ onMounted(async () => { + store.typeOrganizational = "current"; await fetchOrganizationActive(); await fetchHistory(); }); From 621edfd144da4ceb42f44a6e1be780ecc1fa23b4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 5 Mar 2024 14:32:05 +0700 Subject: [PATCH 3/4] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80?= =?UTF-8?q?=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD?= =?UTF-8?q?=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/13_salary/views/salaryLists.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue index 0420f8ce9..48e615c96 100644 --- a/src/modules/13_salary/views/salaryLists.vue +++ b/src/modules/13_salary/views/salaryLists.vue @@ -77,9 +77,9 @@ function getRound() { store.roundMainCode = roundFilter.value.shortCode; - getSnap(roundFilter.value.shortCode); - getAgency(roundFilter.value.revisionId); - getAgencyPosition(roundFilter.value.revisionId); + await getSnap(roundFilter.value.shortCode); + await getAgency(roundFilter.value.revisionId); + await getAgencyPosition(roundFilter.value.revisionId); // if (agencyFilter.value && roundFilter.value.id && snapFilter.value) { // await fetchSalalyPeriod( @@ -149,7 +149,7 @@ async function getAgency(id: string) { id: x.id, name: x.orgRootName, })); - agencyFilter.value = store.rootId; + // agencyFilter.value = store.rootId; }) .catch((err) => { messageError($q, err); @@ -165,11 +165,12 @@ async function getAgencyPosition(id: string) { await http .get(config.API.keycloakPositionByid(id)) .then(async (res) => { - const data = res.data.result; + const data = await res.data.result; const position = agencyOptions.value?.find( (e: DataOption) => e.id === data.rootId ); + agencyFilter.value = position ? position.id : ""; if (agencyFilter.value && roundFilter.value.id && snapFilter.value) { From 8da5662b43b866281e594e1362ff7f2e9ecca282 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 5 Mar 2024 14:51:14 +0700 Subject: [PATCH 4/4] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=20=3D>=20=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=20load?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/13_salary/components/SalaryLists/TabMain.vue | 8 ++++---- src/modules/13_salary/views/salaryLists.vue | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue index b2c19d015..cd92791e1 100644 --- a/src/modules/13_salary/components/SalaryLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue @@ -185,7 +185,7 @@ const maxPage = ref(1); * @param id กลุ่ม */ function fetchDataQuota(id: string) { - showLoader(); + // showLoader(); http .get(config.API.salaryListPeriodQuota(id)) .then((res) => { @@ -205,10 +205,10 @@ function fetchDataQuota(id: string) { }) .catch((err) => { messageError($q, err); - }) - .finally(() => { - hideLoader(); }); + // .finally(() => { + // hideLoader(); + // }); } /** diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue index 48e615c96..21ceff33a 100644 --- a/src/modules/13_salary/views/salaryLists.vue +++ b/src/modules/13_salary/views/salaryLists.vue @@ -218,7 +218,9 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) { messageError($q, err); }) .finally(() => { - hideLoader(); + setTimeout(() => { + hideLoader(); + }, 800); }); }