Refactoring code module 10_registry

src/modules/10_registry/02_Government/01_Government.vue

@@ -1,25 +1,29 @@
 <script setup lang="ts">
-import { useCounterMixin } from "@/stores/mixin";
-import { useQuasar, type QTableProps } from "quasar";
 import { ref, reactive, onMounted } from "vue";
-import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
-
-//history dialog
-import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
+import { useQuasar, type QTableProps } from "quasar";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { useCounterMixin } from "@/stores/mixin";
+import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
+
+import type {
+  ProfileAppointment,
+  FormDataGovernment,
+} from "@/modules/10_registry/interface/index/Main";
+//history dialog
+import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 
-const store = useRegistryInFormationStore();
-const rowsHistory = ref<any[]>([]);
 const $q = useQuasar();
 const mixin = useCounterMixin();
+const store = useRegistryInFormationStore();
 const { showLoader, hideLoader, messageError, date2Thai, dateToISO } = mixin;
 
+const rowsHistory = ref<ProfileAppointment[]>([]);
 const modalHistory = ref<boolean>(false);
 
 /** ตัวแปรข้อมูล */
-const formData = reactive<any>({
+const formData = reactive<FormDataGovernment>({
   org: "",
   positionField: "",
   position: "",
@@ -29,8 +33,8 @@ const formData = reactive<any>({
   posExecutive: "",
   positionArea: "",
   positionExecutiveField: "",
-  dateLeave: "",
-  dateRetireLaw: "",
+  dateLeave: null,
+  dateRetireLaw: null,
   govAge: {
     year: 0,
     month: 0,

src/modules/10_registry/02_Government/02_Discipline.vue

@@ -1,23 +1,25 @@
 <script setup lang="ts">
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar, type QTableProps } from "quasar";
-import { ref, reactive, onMounted } from "vue";
-
-//history dialog
-import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
+import { ref, onMounted } from "vue";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>("");
-const rows = ref<any[]>([]);
-const filter = ref<string>("");
-const rowsHistory = ref<any[]>([]);
+import type { DisciplineDetail } from "@/modules/10_registry/interface/index/Main";
+
+import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
+
 const $q = useQuasar();
-const mode = ref<any>($q.screen.gt.xs);
 const mixin = useCounterMixin();
 const { showLoader, hideLoader, messageError, date2Thai } = mixin;
 
+const rows = ref<DisciplineDetail[]>([]);
+const idByRow = ref<string>("");
+const filter = ref<string>("");
+const rowsHistory = ref<DisciplineDetail[]>([]);
+const mode = ref<boolean>($q.screen.gt.xs);
+
 const modalHistory = ref<boolean>(false);
 /** ตัวแปรข้อมูล */
 
@@ -127,84 +129,6 @@ const columns = ref<QTableProps["columns"]>([
   },
 ]);
 
-const visibleColumnsHistory = ref<string[]>([
-  "prefix",
-  "firstName",
-  "lastName",
-  "status",
-  "lastUpdateFullName",
-  "lastUpdatedAt",
-]);
-const columnsHistory = ref<QTableProps["columns"]>([
-  {
-    name: "prefix",
-    align: "left",
-    label: "คำนำหน้าชื่อ",
-    sortable: true,
-    field: "prefix",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "firstName",
-    align: "left",
-    label: "ชื่อ",
-    sortable: true,
-    field: "firstName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastName",
-    align: "left",
-    label: "นามสกุล",
-    sortable: true,
-    field: "lastName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "status",
-    align: "left",
-    label: "สถานะการเปลี่ยนชื่อ",
-    sortable: true,
-    field: "status",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdateFullName",
-    align: "left",
-    label: "ผู้ดำเนินการ",
-    sortable: true,
-    field: "lastUpdateFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "lastUpdatedAt",
-    align: "left",
-    label: "วันที่แก้ไข",
-    sortable: true,
-    field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-]);
-
 function onHistory(id: string) {
   modalHistory.value = true;
   idByRow.value = id;

src/modules/10_registry/02_Government/03_Leave.vue

@@ -1,23 +1,25 @@
 <script setup lang="ts">
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar, type QTableProps } from "quasar";
-import { ref, reactive, onMounted } from "vue";
-
-//history dialog
-import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
+import { ref, onMounted } from "vue";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>("");
-const rows = ref<any[]>([]);
-const filter = ref<string>("");
-const rowsHistory = ref<any[]>([]);
+import type { LeaveFormType } from "@/modules/10_registry/interface/index/Main";
+import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
+
 const $q = useQuasar();
-const mode = ref<any>($q.screen.gt.xs);
 const mixin = useCounterMixin();
 const { showLoader, hideLoader, messageError, date2Thai } = mixin;
 
+const idByRow = ref<string>("");
+const rows = ref<LeaveFormType[]>([]);
+const filter = ref<string>("");
+const rowsHistory = ref<any[]>([]);
+
+const mode = ref<boolean>($q.screen.gt.xs);
+
 const modalHistory = ref<boolean>(false);
 /** ตัวแปรข้อมูล */
 

src/modules/10_registry/02_Government/04_Duty.vue

@@ -3,16 +3,17 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar, type QTableProps } from "quasar";
 import { ref, reactive, onMounted } from "vue";
 
-//history dialog
-import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
-
 import http from "@/plugins/http";
 import config from "@/app.config";
 
+import type { DutyFormType } from "@/modules/10_registry/interface/index/Main";
+//history dialog
+import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
+
 const idByRow = ref<string>("");
-const rows = ref<any[]>([]);
+const rows = ref<DutyFormType[]>([]);
 const filter = ref<string>("");
-const rowsHistory = ref<any[]>([]);
+const rowsHistory = ref<DutyFormType[]>([]);
 const $q = useQuasar();
 const mode = ref<any>($q.screen.gt.xs);
 const mixin = useCounterMixin();