From 0fbc782ab0ad4283eddb568bfdcacca32bb326be Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 15 Dec 2023 13:06:40 +0700 Subject: [PATCH] fix --- .../components/Detail/viewstep/viewStep1.vue | 303 +----------------- src/modules/12_evaluate/store/Evaluate.ts | 278 +--------------- 2 files changed, 4 insertions(+), 577 deletions(-) diff --git a/src/modules/12_evaluate/components/Detail/viewstep/viewStep1.vue b/src/modules/12_evaluate/components/Detail/viewstep/viewStep1.vue index a98c754d2..9c84ddb58 100644 --- a/src/modules/12_evaluate/components/Detail/viewstep/viewStep1.vue +++ b/src/modules/12_evaluate/components/Detail/viewstep/viewStep1.vue @@ -1,304 +1,7 @@ - + - -@/modules/12_evaluate/store/evaluate \ No newline at end of file + diff --git a/src/modules/12_evaluate/store/Evaluate.ts b/src/modules/12_evaluate/store/Evaluate.ts index 602c63248..a5dfe0efc 100644 --- a/src/modules/12_evaluate/store/Evaluate.ts +++ b/src/modules/12_evaluate/store/Evaluate.ts @@ -1,7 +1,7 @@ import { defineStore } from "pinia"; import { ref } from "vue"; import type { QTableProps } from "quasar"; -import type { DataOption } from "@/modules/12_evaluate/interface/index/Main"; +import type { DataOption } from "@/modules/12_Evaluate/interface/index/Main"; import { useCounterMixin } from "@/stores/mixin"; const mixin = useCounterMixin(); @@ -139,287 +139,11 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => { }, ]); - const columnsLicense = ref([ - { - name: "", - align: "center", - label: "ชื่อใบอนุณาต", - sortable: false, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "หน่วยงานผู้ออกใบอนุญาต", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "เลขที่ใบอนุญาต", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "วันที่ออกใบอนุญาต", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "", - align: "left", - label: "วันที่หมดอายุ", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - ]); - - const columnPeriodhistory = ref([ - { - name: "", - align: "center", - label: "วัน เดือน ปี", - sortable: false, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "", - align: "left", - label: "สังกัด", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "ตำแหน่ง", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "ตำแหน่งเลขที่", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "", - align: "left", - label: "สายงาน", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "ด้าน/สาขา", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "ตำแหน่งประเภท", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "ระดับ", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "ตำแหน่งทางการบริหาร", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "ด้านทางการบริหาร", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - ]); - - const columnTrainingHistory = ref([ - { - name: "", - align: "center", - label: "ชื่อโครงการ/หลักสูตรการฝึกอบรม", - sortable: false, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "หัวข้อการฝึกอบรม/ดูงาน", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "วันเริ่มต้นการฝึกอบรม/ดูงาน", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "", - align: "left", - label: "วันสิ้นสุดการฝึกอบรม/ดูงาน", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "", - align: "left", - label: "ปีที่อบรม/ดูงาน", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "รวมระยะเวลาในการฝึกอบรม/ดูงาน", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "หน่วยงานที่รับผิดชอบจัดการฝึกอบรม/ดูงาน", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - ]); - - const columnProjectsProposed = ref([ - { - name: "", - align: "center", - label: "วันที่ได้รับ", - sortable: false, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "", - align: "left", - label: "ผู้มีอำนาจลงนาม", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "", - align: "left", - label: "รายละเอียด", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - - }, - { - name: "", - align: "left", - label: "เลขที่คำสั่ง", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "", - align: "left", - label: "เอกสารอ้างอิง", - sortable: true, - field: "", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - ]); - return { visibleColumns, columns, rows, convertStatus, fetchData, - columnsLicense, - columnPeriodhistory, - columnTrainingHistory, - columnProjectsProposed, }; });