From 9b30ab5aa884807e2d174ec4bb8dda4fdc0c726f Mon Sep 17 00:00:00 2001 From: waruneeta Date: Thu, 7 Mar 2024 09:48:06 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?= =?UTF-8?q?=E0=B9=81=E0=B8=A5=E0=B8=B0=20layout=20=E0=B8=AB=E0=B8=A5?= =?UTF-8?q?=E0=B8=B1=E0=B8=81=E0=B9=80=E0=B8=81=E0=B8=93=E0=B8=91=E0=B9=8C?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9E=E0=B8=B4=E0=B8=88=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B8=93=E0=B8=B2=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=99=E0=B8=82=E0=B8=B1=E0=B9=89=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SalaryLists/DialogInfoCriteria.vue | 122 ++++++++---------- 1 file changed, 56 insertions(+), 66 deletions(-) diff --git a/src/modules/13_salary/components/SalaryLists/DialogInfoCriteria.vue b/src/modules/13_salary/components/SalaryLists/DialogInfoCriteria.vue index 8ba760237..05b9a2772 100644 --- a/src/modules/13_salary/components/SalaryLists/DialogInfoCriteria.vue +++ b/src/modules/13_salary/components/SalaryLists/DialogInfoCriteria.vue @@ -12,7 +12,7 @@ function closeDialog() { From 6cfee6bab68528d847fed166a266cabbca3f63ba Mon Sep 17 00:00:00 2001 From: waruneeta Date: Thu, 7 Mar 2024 12:05:11 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?= =?UTF-8?q?=E0=B9=83=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=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 --- .../13_salary/components/SalaryLists/TabMain.vue | 7 ++----- .../components/SalaryLists/TableTypePending.vue | 10 +++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue index 9125ded00..42028eba8 100644 --- a/src/modules/13_salary/components/SalaryLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue @@ -314,14 +314,11 @@ onMounted(async () => { - หลักเกณฑ์การพิจารณาเลื่อนขั้นเงินข้าราชการ - + /> diff --git a/src/modules/13_salary/components/SalaryLists/TableTypePending.vue b/src/modules/13_salary/components/SalaryLists/TableTypePending.vue index 1509a9193..392b51079 100644 --- a/src/modules/13_salary/components/SalaryLists/TableTypePending.vue +++ b/src/modules/13_salary/components/SalaryLists/TableTypePending.vue @@ -82,7 +82,7 @@ const columns = ref([ { name: "result", align: "center", - label: "ผลการประเมินผลการปฏิบัติราชการ", + label: "ผลการประเมินฯ", sortable: false, field: "result", headerStyle: "font-size: 14px", @@ -100,7 +100,7 @@ const columns = ref([ { name: "punish", align: "center", - label: "การลงโทษทางวินัย", + label: "ไม่ถูกลงโทษทางวินัย", sortable: false, field: "punish", headerStyle: "font-size: 14px", @@ -109,7 +109,7 @@ const columns = ref([ { name: "retired", align: "center", - label: "พักราชการ", + label: "ไม่ถูกพักราชการ", sortable: false, field: "retired", headerStyle: "font-size: 14px", @@ -118,7 +118,7 @@ const columns = ref([ { name: "retired2", align: "center", - label: "ขาดราชการ", + label: "ไม่ขาดราชการ", sortable: false, field: "retired2", headerStyle: "font-size: 14px", @@ -127,7 +127,7 @@ const columns = ref([ { name: "leave", align: "center", - label: "วันลา", + label: "วันลาไม่เกิน", sortable: false, field: "leave", headerStyle: "font-size: 14px", From 274d36f20cd9fa8afb3200fc5fd8ffb058602f32 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Thu, 7 Mar 2024 12:15:38 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20component=20process=20=E0=B8=82=E0=B8=AD=E0=B8=87?= =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7?= =?UTF-8?q?=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../13_salary/components/SalaryLists/ProcessStep.vue | 9 +++++++++ src/modules/13_salary/views/salaryLists.vue | 6 ++++++ 2 files changed, 15 insertions(+) create mode 100644 src/modules/13_salary/components/SalaryLists/ProcessStep.vue diff --git a/src/modules/13_salary/components/SalaryLists/ProcessStep.vue b/src/modules/13_salary/components/SalaryLists/ProcessStep.vue new file mode 100644 index 000000000..ad84719df --- /dev/null +++ b/src/modules/13_salary/components/SalaryLists/ProcessStep.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue index 21ceff33a..50d45b56e 100644 --- a/src/modules/13_salary/views/salaryLists.vue +++ b/src/modules/13_salary/views/salaryLists.vue @@ -3,6 +3,7 @@ import { onMounted, ref, computed, nextTick } from "vue"; import { useQuasar } from "quasar"; import config from "@/app.config"; import http from "@/plugins/http"; +import ProcessStep from "@/modules/13_salary/components/SalaryLists/ProcessStep.vue"; /** importType*/ import type { @@ -386,6 +387,11 @@ onMounted(async () => { + + + + +