diff --git a/src/modules/12_evaluatePersonal/store/Evaluate.ts b/src/modules/12_evaluatePersonal/store/Evaluate.ts index f94e7d0f9..1560fa238 100644 --- a/src/modules/12_evaluatePersonal/store/Evaluate.ts +++ b/src/modules/12_evaluatePersonal/store/Evaluate.ts @@ -43,6 +43,7 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => { // เสร็จสิ้น -> DONE const visibleColumns = ref([ + "no", "citizanId", "fullName", "position", @@ -67,6 +68,26 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => { } const columns = ref([ + { + name: "no", + align: "center", + label: "ลำดับ", + sortable: false, + field: "no", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, + { + name: "level", + align: "left", + label: "ระดับที่ยื่นขอ", + sortable: true, + field: "level", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + sort: (a: string, b: string) => + a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + }, { name: "citizanId", align: "center", @@ -96,17 +117,6 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => { sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, - { - name: "level", - align: "left", - label: "ระดับ", - sortable: true, - field: "level", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, { name: "positionNumber", align: "left", diff --git a/src/modules/12_evaluatePersonal/views/MainPage.vue b/src/modules/12_evaluatePersonal/views/MainPage.vue index 830d51936..8f3f9d2ec 100644 --- a/src/modules/12_evaluatePersonal/views/MainPage.vue +++ b/src/modules/12_evaluatePersonal/views/MainPage.vue @@ -43,15 +43,6 @@ onMounted(async () => { agency: "กลุ่มงานกฎหมาย", status: "WAIT_CHECK_DOC_V1", }, - { - citizanId: "172223000401", - fullName: "นางธัญพร ปัทมเดชา", - position: "หัวหน้าสำนักงาน", - level: "ปฏิบัติการ", - positionNumber: "สก.ก412", - agency: "กลุ่มงานกฎหมาย", - status: "WAIT_CHECK_DOC_V1", - }, { citizanId: "122222000401", fullName: "นายสิริศักดิ์ พรมบุตร", @@ -176,10 +167,10 @@ onMounted(async () => { - ตรวจสอบคุณสมบัติ + รายละเอียดคำขอ