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() { 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/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", 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 () => { + + + + +