From 0b9d3718af71ddd541b5fd719d413955427a0f4a Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 3 Apr 2025 16:31:25 +0700 Subject: [PATCH 1/3] fixing display org --- .../components/06_dismissOrder/DialogSendToCommand.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue b/src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue index 1bde9f263..95419afff 100644 --- a/src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue +++ b/src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue @@ -261,7 +261,10 @@ watchEffect(() => { {{ props.rowIndex + 1 }} -
+
{{ props.row.organizationPositionOld ? props.row.organizationPositionOld From 3031727c51fe624b1be0fc241ef245e32fcaa23d Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 3 Apr 2025 16:57:32 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=A3=E0=B8=AD=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?= =?UTF-8?q?=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 --- .../components/probation/MainAppoint.vue | 2 ++ .../components/probation/ProbationDetail.vue | 2 +- src/modules/05_placement/store.ts | 11 ++++++---- src/modules/06_retirement/store/Main.ts | 4 +++- src/modules/06_retirement/store/resignMain.ts | 21 ++++++++++++++++--- src/modules/08_registryEmployee/store.ts | 4 +++- .../stores/registry-employee.ts | 4 +++- .../11_discipline/store/SuspendStore.ts | 4 +++- .../Tab/Dialog/DialogGovernment.vue | 4 +++- 9 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/modules/05_placement/components/probation/MainAppoint.vue b/src/modules/05_placement/components/probation/MainAppoint.vue index ae08e5f3d..1da0d98b6 100644 --- a/src/modules/05_placement/components/probation/MainAppoint.vue +++ b/src/modules/05_placement/components/probation/MainAppoint.vue @@ -137,6 +137,8 @@ function convertText(val: string) { return "รอดำเนินการ"; case "REPORT": return "ส่งไปออกคำสั่ง"; + case "WAITING": + return "รอออกคำสั่ง"; case "DONE": return "ออกคำสั่งเสร็จสิ้น"; default: diff --git a/src/modules/05_placement/components/probation/ProbationDetail.vue b/src/modules/05_placement/components/probation/ProbationDetail.vue index 5003c7bca..0ab9679f6 100644 --- a/src/modules/05_placement/components/probation/ProbationDetail.vue +++ b/src/modules/05_placement/components/probation/ProbationDetail.vue @@ -147,7 +147,7 @@ const probation_statusOP = ref([ }, { id: 9, - label: "ออกคำสั่งเสร็จแล้ว", + label: "ออกคำสั่งเสร็จสิ้น", disable: true, }, ]); diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts index aa0293fd5..af28e52c2 100644 --- a/src/modules/05_placement/store.ts +++ b/src/modules/05_placement/store.ts @@ -355,7 +355,7 @@ export const useTransferDataStore = defineStore("transferDataStore", () => { }, { id: "9", - value: "ออกคำสั่งเสร็จแล้ว", + value: "ออกคำสั่งเสร็จสิ้น", }, ]); const statusMainOp = ref([ @@ -364,7 +364,8 @@ export const useTransferDataStore = defineStore("transferDataStore", () => { { id: "APPROVE", name: "อนุมัติ" }, { id: "REJECT", name: "ไม่อนุมัติ" }, { id: "REPORT", name: "ส่งรายชื่อไปออกคำสั่ง" }, - { id: "DONE", name: "ออกคำสั่งเสร็จแล้ว" }, + { id: "WAITING", name: "รอออกคำสั่ง" }, + { id: "DONE", name: "ออกคำสั่งเสร็จสิ้น" }, ]); const statusOp = ref(statusMainOp.value); @@ -380,8 +381,10 @@ export const useTransferDataStore = defineStore("transferDataStore", () => { return "ไม่อนุมัติ"; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; + case "WAITING": + return "รอออกคำสั่ง"; case "DONE": - return "ออกคำสั่งเสร็จแล้ว"; + return "ออกคำสั่งเสร็จสิ้น"; default: return "-"; @@ -422,7 +425,7 @@ export const useTransferDataStore = defineStore("transferDataStore", () => { case 8: return "ส่งรายชื่อไปออกคำสั่ง"; case 9: - return "ออกคำสั่งเสร็จแล้ว"; + return "ออกคำสั่งเสร็จสิ้น"; default: return "-"; } diff --git a/src/modules/06_retirement/store/Main.ts b/src/modules/06_retirement/store/Main.ts index e41eeea0f..e79a0f7f2 100644 --- a/src/modules/06_retirement/store/Main.ts +++ b/src/modules/06_retirement/store/Main.ts @@ -13,8 +13,10 @@ export const useRetirementDataStore = defineStore("retirement", () => { return "ไม่อนุมัติ"; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; + case "WAITING": + return "รอออกคำสั่ง"; case "DONE": - return "ออกคำสั่งเสร็จแล้ว"; + return "ออกคำสั่งเสร็จสิ้น"; case "DONECANCEL": return "ยกเลิกการลาออก"; case "CANCEL": diff --git a/src/modules/06_retirement/store/resignMain.ts b/src/modules/06_retirement/store/resignMain.ts index 2362c9c93..4cc95474a 100644 --- a/src/modules/06_retirement/store/resignMain.ts +++ b/src/modules/06_retirement/store/resignMain.ts @@ -13,7 +13,7 @@ export const useDataStore = defineStore("resign", () => { group: "1", }, { - name: "รอออกคำสั่ง", + name: "อนุมัติแล้ว", value: "APPROVE", group: "1", }, @@ -23,7 +23,12 @@ export const useDataStore = defineStore("resign", () => { group: "1", }, { - name: "ออกคำสั่งเสร็จแล้ว", + name: "รอออกคำสั่ง", + value: "WAITING", + group: "1", + }, + { + name: "ออกคำสั่งเสร็จสิ้น", value: "DONE", group: "1", }, @@ -39,7 +44,7 @@ export const useDataStore = defineStore("resign", () => { group: "2", }, { - name: "รอออกคำสั่ง", + name: "อนุมัติแล้ว", value: "APPROVE", group: "2", }, @@ -48,6 +53,16 @@ export const useDataStore = defineStore("resign", () => { value: "REPORT", group: "2", }, + { + name: "รอออกคำสั่ง", + value: "WAITING", + group: "2", + }, + { + name: "รอออกคำสั่ง", + value: "WAITING", + group: "2", + }, { name: "ออกคำสั่งสำเร็จ", value: "DONE", diff --git a/src/modules/08_registryEmployee/store.ts b/src/modules/08_registryEmployee/store.ts index f12c757c8..ef900e0f2 100644 --- a/src/modules/08_registryEmployee/store.ts +++ b/src/modules/08_registryEmployee/store.ts @@ -97,8 +97,10 @@ export const useRegistryEmployeeDataStore = defineStore( return "ไม่อนุมัติ"; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; + case "WAITING": + return "รอออกคำสั่ง"; case "DONE": - return "ออกคำสั่งเสร็จแล้ว"; + return "ออกคำสั่งเสร็จสิ้น"; default: return "-"; diff --git a/src/modules/08_registryEmployee/stores/registry-employee.ts b/src/modules/08_registryEmployee/stores/registry-employee.ts index faf943ad9..fd1e00c00 100644 --- a/src/modules/08_registryEmployee/stores/registry-employee.ts +++ b/src/modules/08_registryEmployee/stores/registry-employee.ts @@ -44,8 +44,10 @@ export const useRegistryEmp = defineStore("registryEmployeeTemp", () => { return "ไม่อนุมัติ"; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; + case "WAITING": + return "รอออกคำสั่ง"; case "DONE": - return "ออกคำสั่งเสร็จแล้ว"; + return "ออกคำสั่งเสร็จสิ้น"; default: return "-"; } diff --git a/src/modules/11_discipline/store/SuspendStore.ts b/src/modules/11_discipline/store/SuspendStore.ts index 5c3b5d6ed..84e6fe581 100644 --- a/src/modules/11_discipline/store/SuspendStore.ts +++ b/src/modules/11_discipline/store/SuspendStore.ts @@ -83,8 +83,10 @@ export const useDisciplineSuspendStore = defineStore( return "ไม่อนุมัติ"; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; + case "WAITING": + return "รอออกคำสั่ง"; case "DONE": - return "ออกคำสั่งเสร็จแล้ว"; + return "ออกคำสั่งเสร็จสิ้น"; default: return "-"; diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogGovernment.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogGovernment.vue index 6a346a9a6..cb270a8c1 100644 --- a/src/modules/14_KPI/components/Tab/Dialog/DialogGovernment.vue +++ b/src/modules/14_KPI/components/Tab/Dialog/DialogGovernment.vue @@ -190,8 +190,10 @@ function statusText(val: string) { return "ไม่อนุมัติ"; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; + case "WAITING": + return "รอออกคำสั่ง"; case "DONE": - return "ออกคำสั่งเสร็จแล้ว"; + return "ออกคำสั่งเสร็จสิ้น"; default: return "-"; From de81595300d6471db8e640c9ed8487f15ba78990 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 3 Apr 2025 17:04:30 +0700 Subject: [PATCH 3/3] fixing --- src/modules/06_retirement/store/resignMain.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/modules/06_retirement/store/resignMain.ts b/src/modules/06_retirement/store/resignMain.ts index 4cc95474a..b165e3c05 100644 --- a/src/modules/06_retirement/store/resignMain.ts +++ b/src/modules/06_retirement/store/resignMain.ts @@ -58,11 +58,6 @@ export const useDataStore = defineStore("resign", () => { value: "WAITING", group: "2", }, - { - name: "รอออกคำสั่ง", - value: "WAITING", - group: "2", - }, { name: "ออกคำสั่งสำเร็จ", value: "DONE",