diff --git a/src/modules/10_registry/02_Government/05_Actposition.vue b/src/modules/10_registry/02_Government/05_Actposition.vue new file mode 100644 index 0000000..175bbf5 --- /dev/null +++ b/src/modules/10_registry/02_Government/05_Actposition.vue @@ -0,0 +1,365 @@ + + + + + + รักษาการในตำแหน่ง + + + + + + + + + + + + + {{ col.label }} + + + + + + + + + + {{ props.rowIndex + 1 }} + + + {{ col.value ? col.value : "-" }} + + + + + ประวัติแก้ไขรักษาการในตำแหน่ง + + + + + + + + + + ประวัติแก้ไขรักษาการในตำแหน่ง + + + + {{ + col.label + }} + + + {{ + col.value ? col.value : "-" + }} + + + + + + + + + + + diff --git a/src/modules/10_registry/02_Government/06_Assistance.vue b/src/modules/10_registry/02_Government/06_Assistance.vue new file mode 100644 index 0000000..3881312 --- /dev/null +++ b/src/modules/10_registry/02_Government/06_Assistance.vue @@ -0,0 +1,356 @@ + + + + + + ช่วยราชการ + + + + + + + + + + + + + {{ col.label }} + + + + + + + + + + {{ props.rowIndex + 1 }} + + + {{ col.value ? col.value : "-" }} + + + + + ประวัติแก้ไขรายการช่วยราชการ + + + + + + + + + + ประวัติแก้ไขรายการช่วยราชการ + + + + {{ + col.label + }} + + + {{ + col.value ? col.value : "-" + }} + + + + + + + + + + + diff --git a/src/modules/10_registry/04_Achievement/05_Assessments.vue b/src/modules/10_registry/04_Achievement/05_Assessments.vue index 2e805f8..b58a118 100644 --- a/src/modules/10_registry/04_Achievement/05_Assessments.vue +++ b/src/modules/10_registry/04_Achievement/05_Assessments.vue @@ -7,7 +7,10 @@ import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useDataStore } from "@/stores/data"; -import type { AssessmentsFormType } from "@/modules/10_registry/interface/index/Main"; +import type { + AssessmentsFormType, + DataOption, +} from "@/modules/10_registry/interface/index/Main"; //history dialog import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue"; @@ -26,6 +29,11 @@ const mixin = useCounterMixin(); const { showLoader, hideLoader, messageError, date2Thai, onSearchDataTable } = mixin; +const periodOp = ref([ + { id: "OCT", name: "ตุลาคม" }, + { id: "APR", name: "เมษายน" }, +]); + const modalHistory = ref(false); /** ตัวแปรข้อมูล */ @@ -40,6 +48,32 @@ const columns = ref([ style: "font-size: 14px", format: (v) => date2Thai(v), }, + { + name: "year", + align: "left", + label: "ปีงบประมาณ", + sortable: true, + field: "year", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format: (v) => { + return `${v ? Number(v) + 543 : "-"}`; + }, + }, + { + name: "period", + align: "left", + label: "รอบการประเมิน", + sortable: true, + field: "period", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format: (v) => { + return ( + periodOp.value.find((item: DataOption) => item.id === v)?.name || "-" + ); + }, + }, { name: "point1Total", align: "left", @@ -152,6 +186,32 @@ const columnsHistory = ref([ style: "font-size: 14px", format: (v) => date2Thai(v), }, + { + name: "year", + align: "left", + label: "ปีงบประมาณ", + sortable: true, + field: "year", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format: (v) => { + return `${v ? Number(v) + 543 : "-"}`; + }, + }, + { + name: "period", + align: "left", + label: "รอบการประเมิน", + sortable: true, + field: "period", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format: (v) => { + return ( + periodOp.value.find((item: DataOption) => item.id === v)?.name || "-" + ); + }, + }, { name: "point1Total", align: "left", @@ -253,6 +313,8 @@ const columnsHistory = ref([ ]); const visibleColumnsHistory = ref([ "point1Total", + "year", + "period", "point1", "point2Total", "point2", @@ -266,6 +328,8 @@ const visibleColumnsHistory = ref([ const visibleColumns = ref([ "point1Total", + "year", + "period", "point1", "point2Total", "point2", diff --git a/src/modules/10_registry/tabs/02_government.vue b/src/modules/10_registry/tabs/02_government.vue index 899a541..610b7aa 100644 --- a/src/modules/10_registry/tabs/02_government.vue +++ b/src/modules/10_registry/tabs/02_government.vue @@ -6,6 +6,8 @@ import Government from "@/modules/10_registry/02_Government/01_Government.vue"; import Discipline from "@/modules/10_registry/02_Government/02_Discipline.vue"; import Leave from "@/modules/10_registry/02_Government/03_Leave.vue"; import Duty from "@/modules/10_registry/02_Government/04_Duty.vue"; +import Actposition from "@/modules/10_registry/02_Government/05_Actposition.vue"; +import Assistance from "@/modules/10_registry/02_Government/06_Assistance.vue"; const router = useRouter(); @@ -31,6 +33,8 @@ const router = useRouter(); + +