From ea05b899a18d74a06a7f91b228ab387e3c14e1fb Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 9 Apr 2025 13:38:10 +0700 Subject: [PATCH 1/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=9E?= =?UTF-8?q?=E0=B8=B4=E0=B8=98=E0=B8=B5=E0=B8=AE=E0=B8=B1=E0=B8=88=20?= =?UTF-8?q?=E0=B8=94=E0=B8=B1=E0=B8=81=E0=B8=88=E0=B8=B2=E0=B8=81=20status?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_leave/views/EditPage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/05_leave/views/EditPage.vue b/src/modules/05_leave/views/EditPage.vue index 40107ac..2d28a06 100644 --- a/src/modules/05_leave/views/EditPage.vue +++ b/src/modules/05_leave/views/EditPage.vue @@ -114,9 +114,9 @@ const modelSpecific = computed(() => { (x) => x.id == formData.leaveTypeId )?.code; - if (code == "LV-006" && formData.ordainDayLocationName != "") { + if (code == "LV-006" && formData.hajjDayStatus == false) { return "b1"; - } else if (code == "LV-006" && formData.ordainDayLocationName == "") { + } else if (code == "LV-006" && formData.hajjDayStatus == true) { return "b2"; } else if (code == "LV-008" && formData.studyDayTrainingSubject == "") { return "s1"; From 054c3d5eba285ded86409caf2fa643ca5d8652e6 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Wed, 9 Apr 2025 15:35:48 +0700 Subject: [PATCH 2/5] hide error get commeand --- src/modules/06_evaluate/components/step/step2.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue index 3b286f8..ec64486 100644 --- a/src/modules/06_evaluate/components/step/step2.vue +++ b/src/modules/06_evaluate/components/step/step2.vue @@ -338,7 +338,8 @@ function getCommander() { formCommand.commanderAbovePosition = data.commanderAbovePosition; }) .catch((e) => { - messageError($q, e); + console.log(e); + // messageError($q, e); }); } /** callback function */ From e1a75a392bf75e07ddef304f8bb0aae8f33936a1 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Wed, 9 Apr 2025 15:53:19 +0700 Subject: [PATCH 3/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?= =?UTF-8?q?=E0=B8=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/01_dashboard/views/Dashboard.vue | 17 +++++++---------- src/modules/07_appealComplain/views/Main.vue | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue index 937509a..e3b32af 100644 --- a/src/modules/01_dashboard/views/Dashboard.vue +++ b/src/modules/01_dashboard/views/Dashboard.vue @@ -31,22 +31,19 @@ const idInboxActive = ref(); // Id ข้อความที่เล const filteredItems = computed(() => { const isOfficer = dataStore.officerType === "OFFICER"; const conditions: Record = { - "ทดลองปฏิบัติหน้าที่ราชการ": dataStore.isProbation, - "ประเมินบุคคล": isOfficer, - "ผลงาน": isOfficer, - "ขอโอน": isOfficer, + ทดลองปฏิบัติหน้าที่ราชการ: dataStore.isProbation, + ประเมินบุคคล: isOfficer, + ผลงาน: isOfficer, + ขอโอน: isOfficer, "ผู้ขอรับการประเมิน (KPI)": isOfficer, "ผู้ประเมิน (KPI)": isOfficer, "ทุนการศึกษา/ฝึกอบรม": isOfficer, - "การพัฒนารายบุคคล": isOfficer, + การพัฒนารายบุคคล: isOfficer, }; - return items.value.filter( - (item) => conditions[item.title] ?? true - ); + return items.value.filter((item) => conditions[item.title] ?? true); }); - const items = ref([ { icon: "mdi-account-group-outline", @@ -98,7 +95,7 @@ const items = ref([ }, { icon: "mdi-scale-balance", - title: "อุทธรณ์ร้องทุกข์", + title: "อุทธรณ์/ร้องทุกข์", sub: "ทำเรื่องขออุทธรณ์ หรือร้องทุกข์", color: "green-3", path: "/appeal-complain", diff --git a/src/modules/07_appealComplain/views/Main.vue b/src/modules/07_appealComplain/views/Main.vue index 008db43..9abeffb 100644 --- a/src/modules/07_appealComplain/views/Main.vue +++ b/src/modules/07_appealComplain/views/Main.vue @@ -252,7 +252,7 @@ onMounted(async () => { class="q-mr-sm" @click="clickBack" /> - อุทธรณ์ร้องทุกข์ + อุทธรณ์/ร้องทุกข์
From 4cf9595a6d45f3e2c7f9595a144f560b70a6b835 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Wed, 9 Apr 2025 15:57:11 +0700 Subject: [PATCH 4/5] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=AA=E0=B8=96?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B8=A3=E0=B8=AD=E0=B8=AD=E0=B8=AD?= =?UTF-8?q?=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/02_transfer/store.ts | 3 ++- src/modules/03_retire/store.ts | 2 ++ src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/02_transfer/store.ts b/src/modules/02_transfer/store.ts index 038bc84..0450d7a 100644 --- a/src/modules/02_transfer/store.ts +++ b/src/modules/02_transfer/store.ts @@ -13,9 +13,10 @@ export const useTransferDataStore = defineStore("transfer", () => { return "ไม่อนุมัติ"; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; + case "WAITING": + return "รอออกคำสั่ง"; case "DONE": return "ออกคำสั่งเสร็จแล้ว"; - default: return "-"; } diff --git a/src/modules/03_retire/store.ts b/src/modules/03_retire/store.ts index abe9e86..c133f06 100644 --- a/src/modules/03_retire/store.ts +++ b/src/modules/03_retire/store.ts @@ -13,6 +13,8 @@ export const useRestDataStore = defineStore("Rest", () => { return "ไม่อนุมัติ"; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; + case "WAITING": + return "รอออกคำสั่ง"; case "DONE": return "ออกคำสั่งเสร็จแล้ว"; case "DONECANCEL": diff --git a/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue b/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue index bab7875..75d2dc1 100644 --- a/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue +++ b/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue @@ -188,6 +188,8 @@ function statusText(val: string) { return "ไม่อนุมัติ"; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; + case "WAITING": + return "รอออกคำสั่ง"; case "DONE": return "ออกคำสั่งเสร็จแล้ว"; From 9688cca41f75a11fbccf11af2698addcc6e212ee Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Wed, 9 Apr 2025 15:58:44 +0700 Subject: [PATCH 5/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=81?= =?UTF-8?q?=E0=B8=A5=E0=B8=B1=E0=B8=9A=20=E0=B8=A3=E0=B8=AD=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_leave/components/DialogDetail.vue | 8 ++++---- src/modules/05_leave/components/ListView.vue | 6 ++++-- src/modules/05_leave/views/EditPage.vue | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue index 95c3136..dd0aece 100644 --- a/src/modules/05_leave/components/DialogDetail.vue +++ b/src/modules/05_leave/components/DialogDetail.vue @@ -269,7 +269,7 @@ async function fetchDataDetail(id: string) { formData.dear = data.dear ?? "-"; checkLeaveType( formData.leaveTypeId, - data.hajjDayStatus, + formData.ordainDayLocationName, formData.studyDayTrainingSubject ); }) @@ -289,7 +289,7 @@ async function fetchDataDetail(id: string) { */ function checkLeaveType( leaveTypeId: string, - hajjDayStatus: boolean, + ordainDayLocationName: string, studyDayTrainingSubject: string ) { if (props.leaveType) { @@ -301,9 +301,9 @@ function checkLeaveType( checkForm.value = "FormChildbirth"; } else if (type === "LV-005") { checkForm.value = "FormHoliday"; - } else if (type === "LV-006" && hajjDayStatus === true) { + } else if (type === "LV-006" && ordainDayLocationName === "") { checkForm.value = "FormHajj"; - } else if (type === "LV-006" && hajjDayStatus === false) { + } else if (type === "LV-006") { checkForm.value = "FormUpasom"; } else if (type === "LV-007") { checkForm.value = "FormCheckSelect"; diff --git a/src/modules/05_leave/components/ListView.vue b/src/modules/05_leave/components/ListView.vue index de3ceaf..c6ac5f1 100644 --- a/src/modules/05_leave/components/ListView.vue +++ b/src/modules/05_leave/components/ListView.vue @@ -154,9 +154,11 @@ function convert(val: any) { ); const type = filtertype?.code; if (type == "LV-006" && val.hajjDayStatus == false) { - return "ลาอุปสมบท"; + return "ลาอุปสมบทหรือการลาประกอบพิธีฮัจญ์ฯ"; + // return "ลาอุปสมบท"; รอ API } else if (type == "LV-006" && val.hajjDayStatus == true) { - return "ลาประกอบพิธีฮัจญ์"; + return "ลาอุปสมบทหรือการลาประกอบพิธีฮัจญ์ฯ"; + // return "ลาประกอบพิธีฮัจญ์"; รอ API } else { return val.leaveTypeName; } diff --git a/src/modules/05_leave/views/EditPage.vue b/src/modules/05_leave/views/EditPage.vue index 2d28a06..40107ac 100644 --- a/src/modules/05_leave/views/EditPage.vue +++ b/src/modules/05_leave/views/EditPage.vue @@ -114,9 +114,9 @@ const modelSpecific = computed(() => { (x) => x.id == formData.leaveTypeId )?.code; - if (code == "LV-006" && formData.hajjDayStatus == false) { + if (code == "LV-006" && formData.ordainDayLocationName != "") { return "b1"; - } else if (code == "LV-006" && formData.hajjDayStatus == true) { + } else if (code == "LV-006" && formData.ordainDayLocationName == "") { return "b2"; } else if (code == "LV-008" && formData.studyDayTrainingSubject == "") { return "s1";