update

src/components/Dialogs/PopupPersonalNew.vue

@@ -155,7 +155,7 @@ async function fetchProfileGov(id: string) {
 }
 
 function redirecToRegistry() {
-  router.push(`/registry-new${empType.value}/${props.id}`);
+  router.push(`/registry-person${empType.value}/${props.id}`);
   modal.value = false;
 }
 
@@ -270,7 +270,9 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.citizenId ? imformation.citizenId:'-'"
+                        :model-value="
+                          imformation.citizenId ? imformation.citizenId : '-'
+                        "
                         label="เลขประจำตัวประชาชน"
                       ></q-input>
                     </div>
@@ -278,7 +280,9 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.prefix ? imformation.prefix:'-'"
+                        :model-value="
+                          imformation.prefix ? imformation.prefix : '-'
+                        "
                         label="คำนำหน้าชื่อ"
                       />
                     </div>
@@ -286,7 +290,9 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.firstName ? imformation.firstName:'-'"
+                        :model-value="
+                          imformation.firstName ? imformation.firstName : '-'
+                        "
                         label="ชื่่อ"
                       />
                     </div>
@@ -294,7 +300,9 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.lastName ? imformation.lastName:'-'"
+                        :model-value="
+                          imformation.lastName ? imformation.lastName : '-'
+                        "
                         label="นามสกุล"
                       />
                     </div>
@@ -302,7 +310,9 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.birthDate ? imformation.birthDate:'-'"
+                        :model-value="
+                          imformation.birthDate ? imformation.birthDate : '-'
+                        "
                         label="วัน/เดือน/ปีเกิด"
                       />
                     </div>
@@ -310,7 +320,9 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.gender ? imformation.gender:'-'"
+                        :model-value="
+                          imformation.gender ? imformation.gender : '-'
+                        "
                         label="เพศ"
                       />
                     </div>
@@ -318,7 +330,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.age ? imformation.age:'-'"
+                        :model-value="imformation.age ? imformation.age : '-'"
                         label="อายุ"
                       />
                     </div>
@@ -346,7 +358,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.posNo ? goverment.posNo:'-'"
+                        :model-value="goverment.posNo ? goverment.posNo : '-'"
                         label="ตำแหน่งเลขที่"
                       />
                     </div>
@@ -354,7 +366,9 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.position ? goverment.position:'-'"
+                        :model-value="
+                          goverment.position ? goverment.position : '-'
+                        "
                         label="ตำแหน่ง"
                       />
                     </div>
@@ -362,7 +376,11 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionPathSide ? goverment.positionPathSide:'-'"
+                        :model-value="
+                          goverment.positionPathSide
+                            ? goverment.positionPathSide
+                            : '-'
+                        "
                         label="ด้าน/สาขา"
                       />
                     </div>
@@ -370,7 +388,9 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionLine ? goverment.positionLine:'-'"
+                        :model-value="
+                          goverment.positionLine ? goverment.positionLine : '-'
+                        "
                         label="สายงาน"
                       />
                     </div>
@@ -378,7 +398,9 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionType ? goverment.positionType:'-'"
+                        :model-value="
+                          goverment.positionType ? goverment.positionType : '-'
+                        "
                         label="ประเภทตำแหน่ง"
                       />
                     </div>
@@ -386,7 +408,11 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionLevel ? goverment.positionLevel:'-'"
+                        :model-value="
+                          goverment.positionLevel
+                            ? goverment.positionLevel
+                            : '-'
+                        "
                         label="ระดับตำแหน่ง"
                       />
                     </div>
@@ -397,7 +423,11 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionExecutive ? goverment.positionExecutive:'-'"
+                        :model-value="
+                          goverment.positionExecutive
+                            ? goverment.positionExecutive
+                            : '-'
+                        "
                         label="ตำแหน่งทางการบริหาร"
                       />
                     </div>
@@ -408,7 +438,11 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionExecutiveSide ? goverment.positionExecutiveSide:'-'"
+                        :model-value="
+                          goverment.positionExecutiveSide
+                            ? goverment.positionExecutiveSide
+                            : '-'
+                        "
                         label="ด้านตำแหน่งทางการบริหาร"
                       />
                     </div>

src/modules/02_organization/components/DialogAddPosition.vue

@@ -11,12 +11,12 @@ import config from "@/app.config";
 import type {
   DataOption,
   FormPositionSelect,
-} from "@/modules/02_organizationalNew/interface/index/Main";
+} from "@/modules/02_organization/interface/index/Main";
 import type {
   OptionType,
   OptionLevel,
   OptionExecutive,
-} from "@/modules/02_organizationalNew/interface/response/organizational";
+} from "@/modules/02_organization/interface/response/organizational";
 
 /**
  * importComponents

src/modules/02_organization/components/DialogFormAgency.vue

@@ -8,11 +8,11 @@ import type {
   FormDataAgency,
   FormAgencyRef,
   DataOption,
-} from "@/modules/02_organizationalNew/interface/index/Main";
+} from "@/modules/02_organization/interface/index/Main";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 import { useCounterMixin } from "@/stores/mixin";
 
 const level = defineModel<number>("orgLevel", { required: true });

src/modules/02_organization/components/DialogFormDateTime.vue

@@ -3,8 +3,8 @@ import { ref, watch, computed } from "vue";
 import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import DialogHeader from "@/components/DialogHeader.vue";
-import type { FormDateTimeRef } from "@/modules/02_organizationalNew/interface/index/Main";
+import type { FormDateTimeRef } from "@/modules/02_organization/interface/index/Main";
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 import http from "@/plugins/http";
 import config from "@/app.config";
 

src/modules/02_organization/components/DialogFormPosition.vue

@@ -16,18 +16,18 @@ import type {
   FormPositionSelect,
   RowDetailPositions,
   ListMenu,
-} from "@/modules/02_organizationalNew/interface/index/Main";
+} from "@/modules/02_organization/interface/index/Main";
 import type {
   OptionType,
   OptionExecutive,
-} from "@/modules/02_organizationalNew/interface/response/organizational";
+} from "@/modules/02_organization/interface/response/organizational";
-import type { FilterMaster } from "@/modules/02_organizationalNew/interface/request/organizational";
+import type { FilterMaster } from "@/modules/02_organization/interface/request/organizational";
 
 /**
  * importComponents
  */
 import DialogHeader from "@/components/DialogHeader.vue";
-import DialogAddPosition from "@/modules/02_organizationalNew/components/DialogAddPosition.vue";
+import DialogAddPosition from "@/modules/02_organization/components/DialogAddPosition.vue";
 
 /**
  * importStore

src/modules/02_organization/components/DialogHistory.vue

@@ -8,7 +8,7 @@ import config from "@/app.config";
  * importType
  */
 import type { QTableProps } from "quasar";
-import type { HistoryPostType } from "@/modules/02_organizationalNew/interface/index/Main";
+import type { HistoryPostType } from "@/modules/02_organization/interface/index/Main";
 
 /**
  * importComponrnts

src/modules/02_organization/components/DialogHistoryPos.vue

@@ -8,7 +8,7 @@ import config from "@/app.config";
  * import Type
  */
 import type { QTableProps } from "quasar";
-import type { HistoryPos } from "@/modules/02_organizationalNew/interface/response/organizational";
+import type { HistoryPos } from "@/modules/02_organization/interface/response/organizational";
 
 /**
  * import Components
@@ -19,7 +19,7 @@ import Header from "@/components/DialogHeader.vue";
  * import Store
  */
 import { useCounterMixin } from "@/stores/mixin";
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 
 /** Use*/
 const store = useOrganizational();

src/modules/02_organization/components/DialogMovePos.vue

@@ -11,13 +11,13 @@ import type { QTableProps } from "quasar";
 import type {
   OrgTree,
   PosMaster2,
-} from "@/modules/02_organizationalNew/interface/response/organizational";
+} from "@/modules/02_organization/interface/response/organizational";
-import type { NewPagination } from "@/modules/02_organizationalNew/interface/index/Main";
+import type { NewPagination } from "@/modules/02_organization/interface/index/Main";
 import type {
   MovePos,
   FilterMaster,
-} from "@/modules/02_organizationalNew/interface/request/organizational";
+} from "@/modules/02_organization/interface/request/organizational";
-import type { DataTree } from "@/modules/02_organizationalNew/interface/index/organizational";
+import type { DataTree } from "@/modules/02_organization/interface/index/organizational";
 
 /**
  * importComponents
@@ -28,7 +28,7 @@ import HeaderDialog from "@/components/DialogHeader.vue";
  * importStore
  */
 import { useCounterMixin } from "@/stores/mixin";
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 
 /**
  * use

src/modules/02_organization/components/DialogNewStructure.vue

@@ -12,7 +12,7 @@ import type {
   FormNewStructureRef,
   DataOption,
   HistoryType,
-} from "@/modules/02_organizationalNew/interface/index/Main";
+} from "@/modules/02_organization/interface/index/Main";
 
 /** importComponents*/
 import DialogHeader from "@/components/DialogHeader.vue";
@@ -21,7 +21,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
  * importStore
  */
 import { useCounterMixin } from "@/stores/mixin";
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 
 /**
  * use

src/modules/02_organization/components/DialogPositionDetail.vue

@@ -5,7 +5,7 @@ import { useQuasar } from "quasar";
 /**
  * import type
  */
-import type { FormDetailPosition } from "@/modules/02_organizationalNew/interface/index/organizational";
+import type { FormDetailPosition } from "@/modules/02_organization/interface/index/organizational";
 
 /**
  * importComponents
@@ -15,7 +15,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
 /**
  * importStore
  */
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 
 /**
  * use

src/modules/02_organization/components/DialogSelectPerson.vue

@@ -12,17 +12,17 @@ import type {
   Position,
   SeaechResult,
   FormPositionFilter,
-} from "@/modules/02_organizationalNew/interface/index/organizational";
+} from "@/modules/02_organization/interface/index/organizational";
 import type {
   DataOption,
   NewPagination,
-} from "@/modules/02_organizationalNew/interface/index/Main";
+} from "@/modules/02_organization/interface/index/Main";
 import type {
   OptionType,
   OptionLevel,
   SelectPerson,
   TypePos,
-} from "@/modules/02_organizationalNew/interface/response/organizational";
+} from "@/modules/02_organization/interface/response/organizational";
 
 /**
  * importCompoonents
@@ -33,7 +33,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
  * import*Store
  */
 import { useCounterMixin } from "@/stores/mixin";
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 
 /**
  * use

src/modules/02_organization/components/DialogSortAgency.vue

@@ -8,7 +8,7 @@ import config from "@/app.config";
  * importType
  */
 import type { QTableProps } from "quasar";
-import type { DataSortAgency } from "@/modules/02_organizationalNew/interface/index/organizational";
+import type { DataSortAgency } from "@/modules/02_organization/interface/index/organizational";
 
 /**
  * importComponents
@@ -19,7 +19,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
  * importStore
  */
 import { useCounterMixin } from "@/stores/mixin";
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 
 /**
  * use

src/modules/02_organization/components/DialogSortPosition.vue

@@ -8,7 +8,7 @@ import config from "@/app.config";
  * importType
  */
 import type { QTableProps } from "quasar";
-import type { DataSortPos } from "@/modules/02_organizationalNew/interface/index/organizational";
+import type { DataSortPos } from "@/modules/02_organization/interface/index/organizational";
 
 /**
  * importComponents
@@ -19,7 +19,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
  * importStore
  */
 import { useCounterMixin } from "@/stores/mixin";
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 
 /**
  * use

src/modules/02_organization/components/DialogStructureDetail.vue

@@ -7,7 +7,7 @@ import config from "@/app.config";
 import DialogHeader from "@/components/DialogHeader.vue";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();

src/modules/02_organization/components/DialogSuccession.vue

@@ -6,23 +6,23 @@ import config from "@/app.config";
 
 /** importType*/
 import type { QTableProps } from "quasar";
-import type { NewPagination } from "@/modules/02_organizationalNew/interface/index/Main";
+import type { NewPagination } from "@/modules/02_organization/interface/index/Main";
-import type { DataTree } from "@/modules/02_organizationalNew/interface/index/organizational";
+import type { DataTree } from "@/modules/02_organization/interface/index/organizational";
 import type {
   OrgTree,
   PosMaster,
-} from "@/modules/02_organizationalNew/interface/response/organizational";
+} from "@/modules/02_organization/interface/response/organizational";
 import type {
   FilterMaster,
   Inherit,
-} from "@/modules/02_organizationalNew/interface/request/organizational";
+} from "@/modules/02_organization/interface/request/organizational";
 
 /** importComponents*/
 import Header from "@/components/DialogHeader.vue";
 
 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 
 /** use*/
 const $q = useQuasar();

src/modules/02_organization/components/StructureMain.vue

@@ -8,7 +8,7 @@ import config from "@/app.config";
 import { StructChart } from "structure-chart";
 import "structure-chart/structure-chart.css";
 import { useCounterMixin } from "@/stores/mixin";
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 
 const mixin = useCounterMixin();
 const store = useOrganizational();

src/modules/02_organization/components/TreeMain.vue

@@ -5,18 +5,18 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 /** importType*/
-import type { ListMenu } from "@/modules/02_organizationalNew/interface/index/Main";
+import type { ListMenu } from "@/modules/02_organization/interface/index/Main";
-import type { OrgTree } from "@/modules/02_organizationalNew/interface/response/organizational";
+import type { OrgTree } from "@/modules/02_organization/interface/response/organizational";
-import type { DataTree } from "@/modules/02_organizationalNew/interface/index/organizational";
+import type { DataTree } from "@/modules/02_organization/interface/index/organizational";
 
 /** importComponents*/
-import DialogAgency from "@/modules/02_organizationalNew/components/DialogFormAgency.vue";
+import DialogAgency from "@/modules/02_organization/components/DialogFormAgency.vue";
-import DialogStructureDetail from "@/modules/02_organizationalNew/components/DialogStructureDetail.vue";
+import DialogStructureDetail from "@/modules/02_organization/components/DialogStructureDetail.vue";
-import DialogSortAgency from "@/modules/02_organizationalNew/components/DialogSortAgency.vue";
+import DialogSortAgency from "@/modules/02_organization/components/DialogSortAgency.vue";
-import DialogHistory from "@/modules/02_organizationalNew/components/DialogHistory.vue";
+import DialogHistory from "@/modules/02_organization/components/DialogHistory.vue";
 
 /** importStore*/
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 import { useCounterMixin } from "@/stores/mixin";
 
 /** use*/

src/modules/02_organization/components/TreeTable.vue

@@ -10,25 +10,25 @@ import type { QTableProps } from "quasar";
 import type {
   ListMenu,
   NewPagination,
-} from "@/modules/02_organizationalNew/interface/index/Main";
+} from "@/modules/02_organization/interface/index/Main";
-import type { FilterMaster } from "@/modules/02_organizationalNew/interface/request/organizational";
+import type { FilterMaster } from "@/modules/02_organization/interface/request/organizational";
 import type {
   PosMaster2,
   OrgTree,
-} from "@/modules/02_organizationalNew/interface/response/organizational";
+} from "@/modules/02_organization/interface/response/organizational";
-import type { DataPosition } from "@/modules/02_organizationalNew/interface/index/organizational";
+import type { DataPosition } from "@/modules/02_organization/interface/index/organizational";
 
 /** importComponents*/
-import DialogFormPosotion from "@/modules/02_organizationalNew/components/DialogFormPosition.vue";
+import DialogFormPosotion from "@/modules/02_organization/components/DialogFormPosition.vue";
-import DialogPositionDetail from "@/modules/02_organizationalNew/components/DialogPositionDetail.vue";
+import DialogPositionDetail from "@/modules/02_organization/components/DialogPositionDetail.vue";
-import DialogSort from "@/modules/02_organizationalNew/components/DialogSortPosition.vue";
+import DialogSort from "@/modules/02_organization/components/DialogSortPosition.vue";
-import DialogMovePos from "@/modules/02_organizationalNew/components/DialogMovePos.vue";
+import DialogMovePos from "@/modules/02_organization/components/DialogMovePos.vue";
-import DialogHistoryPos from "@/modules/02_organizationalNew/components/DialogHistoryPos.vue";
+import DialogHistoryPos from "@/modules/02_organization/components/DialogHistoryPos.vue";
-import DialogSelectPerson from "@/modules/02_organizationalNew/components/DialogSelectPerson.vue";
+import DialogSelectPerson from "@/modules/02_organization/components/DialogSelectPerson.vue";
-import DialogSuccession from "@/modules/02_organizationalNew/components/DialogSuccession.vue";
+import DialogSuccession from "@/modules/02_organization/components/DialogSuccession.vue";
 
 /** importStore*/
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 import { useCounterMixin } from "@/stores/mixin";
 
 const $q = useQuasar();

src/modules/02_organization/components/TreeView.vue

@@ -10,15 +10,15 @@ import type {
   PosMaster,
   Position,
   PosMaster2,
-} from "@/modules/02_organizationalNew/interface/response/organizational";
+} from "@/modules/02_organization/interface/response/organizational";
-import type { FilterMaster } from "@/modules/02_organizationalNew/interface/request/organizational";
+import type { FilterMaster } from "@/modules/02_organization/interface/request/organizational";
 
 /** importComponents*/
-import TreeMain from "@/modules/02_organizationalNew/components/TreeMain.vue";
+import TreeMain from "@/modules/02_organization/components/TreeMain.vue";
-import TreeTable from "@/modules/02_organizationalNew/components/TreeTable.vue";
+import TreeTable from "@/modules/02_organization/components/TreeTable.vue";
 
 /** importStore*/
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 import { useCounterMixin } from "@/stores/mixin";
 
 /** use*/

src/modules/02_organization/router.ts

@@ -0,0 +1,14 @@
+const mainPage = () => import("@/modules/02_organization/views/main.vue");
+
+export default [
+  {
+    path: "/organization",
+    name: "organizationalNew",
+    component: mainPage,
+    meta: {
+      Auth: true,
+      Key: "SYS_ORG",
+      Role: "STAFF",
+    },
+  },
+];

src/modules/02_organization/store/organizational.ts

@@ -6,7 +6,7 @@ import type {
   DataActive,
   SumPosition,
   PosMaster,
-} from "@/modules/02_organizationalNew/interface/response/organizational";
+} from "@/modules/02_organization/interface/response/organizational";
 
 export const useOrganizational = defineStore("organizationalStore", () => {
   const typeOrganizational = ref<string>("current");
@@ -77,8 +77,8 @@ export const useOrganizational = defineStore("organizationalStore", () => {
       posMasterNo:
         e.orgShortname +
         (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") +
-        (e.posMasterNo?e.posMasterNo:"") +
+        (e.posMasterNo ? e.posMasterNo : "") +
-        (e.posMasterNoSuffix?e.posMasterNoSuffix:""),
+        (e.posMasterNoSuffix ? e.posMasterNoSuffix : ""),
       positionName: e.isSit ? e.profilePosition : e.positionName,
       posTypeName: e.isSit ? e.profilePostype : e.posTypeName,
       posLevelName: e.isSit ? e.profilePoslevel : e.posLevelName,

src/modules/02_organization/views/ExampleSearchTree.vue

@@ -4,11 +4,11 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type { ListMenu } from "@/modules/02_organizationalNew/interface/index/Main";
+import type { ListMenu } from "@/modules/02_organization/interface/index/Main";
-import type { OrgTree } from "@/modules/02_organizationalNew/interface/response/organizational";
+import type { OrgTree } from "@/modules/02_organization/interface/response/organizational";
 
 /** importStore*/
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 import { useCounterMixin } from "@/stores/mixin";
 
 const store = useOrganizational();
@@ -45,7 +45,7 @@ const breakLoop = ref<boolean>(false);
 const dataObject = ref([]);
 async function onSort(orgRootId: string) {
   if (orgRootId) {
-    idVal.value = 'children => '+orgRootId;
+    idVal.value = "children => " + orgRootId;
     breakLoop.value = false;
 
     const targetNodeId = orgRootId;
@@ -56,7 +56,7 @@ async function onSort(orgRootId: string) {
       if (breakLoop.value) break;
     }
   } else {
-    idVal.value = 'root';
+    idVal.value = "root";
   }
 }
 

src/modules/02_organization/views/main.vue

@@ -7,21 +7,21 @@ import config from "@/app.config";
 /**
  * importType
  */
-import type { DataOption } from "@/modules/02_organizationalNew/interface/index/Main";
+import type { DataOption } from "@/modules/02_organization/interface/index/Main";
-import type { OrgRevision } from "@/modules/02_organizationalNew/interface/response/organizational";
+import type { OrgRevision } from "@/modules/02_organization/interface/response/organizational";
 
 /**
  * importComponents
  */
-import TreeView from "@/modules/02_organizationalNew/components/TreeView.vue";
+import TreeView from "@/modules/02_organization/components/TreeView.vue";
-import StructureView from "@/modules/02_organizationalNew/components/StructureMain.vue";
+import StructureView from "@/modules/02_organization/components/StructureMain.vue";
-import DialogFormNewStructure from "@/modules/02_organizationalNew/components/DialogNewStructure.vue";
+import DialogFormNewStructure from "@/modules/02_organization/components/DialogNewStructure.vue";
-import DialogDateTime from "@/modules/02_organizationalNew/components/DialogFormDateTime.vue";
+import DialogDateTime from "@/modules/02_organization/components/DialogFormDateTime.vue";
 
 /**
  * importStore
  */
-import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+import { useOrganizational } from "@/modules/02_organization/store/organizational";
 import { useCounterMixin } from "@/stores/mixin";
 
 /**

src/modules/02_organizationalNew/router.ts

@@ -1,14 +0,0 @@
-const mainPage = () => import("@/modules/02_organizationalNew/views/main.vue");
-
-export default [
-  {
-    path: "/organization-new",
-    name: "organizationalNew",
-    component: mainPage,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "organization",
-    },
-  },
-];

src/modules/04_registryNew/router.ts

@@ -1,49 +0,0 @@
-const listPage = () => import("@/modules/04_registryNew/views/list.vue");
-const detailPage = () =>
-  import("@/modules/04_registryNew/views/detailView.vue");
-
-const requestEdit = () =>
-  import("@/modules/04_registryNew/views/requestEdit.vue");
-
-export default [
-  {
-    path: "/registry-new",
-    name: "registryNew",
-    component: listPage,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "registry",
-    },
-  },
-  {
-    path: "/registry-new/:id",
-    name: "registryNewByid",
-    component: detailPage,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "registry",
-    },
-  },
-  {
-    path: "/registry-new-employee/:id",
-    name: "registryNewEmployeeByid",
-    component: detailPage,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "registry",
-    },
-  },
-  {
-    path: "/registry-new/request-edit",
-    name: "registryNewRequestEdit",
-    component: requestEdit,
-    meta: {
-      Auth: true,
-      Key: [7],
-      Role: "registry",
-    },
-  },
-];

src/modules/04_registryPerson/components/DialogAddData.vue

@@ -4,17 +4,17 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type { DataOption } from "@/modules/04_registryNew/interface/index/Main";
+import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main";
-import type { DataType } from "@/modules/04_registryNew/interface/response/Main";
+import type { DataType } from "@/modules/04_registryPerson/interface/response/Main";
 import type {
   FormAddPerson,
   MyObjectRef,
-} from "@/modules/04_registryNew/interface/request/Main";
+} from "@/modules/04_registryPerson/interface/request/Main";
-import { useProfileDataStore } from "@/modules/04_registryNew/stores/profile";
+import { useProfileDataStore } from "@/modules/04_registryPerson/stores/profile";
 import DialogHeader from "@/components/DialogHeader.vue";
 
 /** importStore*/
-import { useRegistryNewDataStore } from "@/modules/04_registryNew/store";
+import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 import { useCounterMixin } from "@/stores/mixin";
 
 const profileStore = useProfileDataStore();

src/modules/04_registryPerson/components/DialogHistory.vue

@@ -10,11 +10,11 @@ import config from "@/app.config";
  */
 import type { QTableProps } from "quasar";
 import type { QForm } from "quasar";
-import type { DataOption } from "@/modules/04_registryNew/interface/index/Main";
+import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main";
 import type {
   HistoryPos,
   Position,
-} from "@/modules/04_registryNew/interface/response/History";
+} from "@/modules/04_registryPerson/interface/response/History";
 
 /**
  * import components
@@ -253,9 +253,7 @@ function filterFn(val: string, update: Function) {
  */
 function clickRedirect(id: string) {
   const url =
-    employeeClass.value === "officer"
+    employeeClass.value === "officer" ? "registry-person" : "registry-employee";
-      ? "registry-new"
-      : "registry-new-employee";
   router.push(`${url}/${id}`);
 }
 

src/modules/04_registryPerson/components/TableView.vue

@@ -4,14 +4,14 @@ import { useRouter } from "vue-router";
 
 /** importType*/
 import type { QTableProps } from "quasar";
-import type { FormFilter } from "@/modules/04_registryNew/interface/request/Main";
+import type { FormFilter } from "@/modules/04_registryPerson/interface/request/Main";
 
 /** importComponent*/
-import DialogAddData from "@/modules/04_registryNew/components/DialogAddData.vue";
+import DialogAddData from "@/modules/04_registryPerson/components/DialogAddData.vue";
-import DialogHistory from "@/modules/04_registryNew/components/DialogHistory.vue";
+import DialogHistory from "@/modules/04_registryPerson/components/DialogHistory.vue";
 
 /** importStore*/
-import { useRegistryNewDataStore } from "@/modules/04_registryNew/store";
+import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 
 const store = useRegistryNewDataStore();
 const router = useRouter();
@@ -172,9 +172,9 @@ function onClickHistory() {
 
 function onClickViewDetail(id: string) {
   if (empType.value === "officer") {
-    router.push(`/registry-new/${id}`);
+    router.push(`/registry-person/${id}`);
   } else {
-    router.push(`/registry-new-employee/${id}`);
+    router.push(`/registry-employee/${id}`);
   }
 }
 
@@ -182,7 +182,7 @@ function onClickViewDetail(id: string) {
  * function redirect ไปหน้ารายการคำร้องขอแก้ไขข้อมูล
  */
 function redirectToPagePetition() {
-  router.push(`/registry-new/request-edit`);
+  router.push(`/registry-person/request-edit`);
 }
 
 watch(

src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue

@@ -5,8 +5,8 @@ import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { QForm, useQuasar } from "quasar";
 import { useRoute } from "vue-router";
-import type { RequestItemsObject } from "@/modules/04_registryNew/interface/request/ProfesLicense";
+import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/ProfesLicense";
-import type { ResponseObject } from "@/modules/04_registryNew/interface/response/ProfesLicense";
+import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/ProfesLicense";
 import http from "@/plugins/http";
 import config from "@/app.config";
 const mixin = useCounterMixin();
@@ -491,7 +491,6 @@ onMounted(async () => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>

src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue

@@ -4,8 +4,8 @@ import dialogHeader from "@/components/DialogHeader.vue";
 import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useRoute } from "vue-router";
-import type { RequestItemsObject } from "@/modules/04_registryNew/interface/request/Training";
+import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/Training";
-import type { ResponseObject } from "@/modules/04_registryNew/interface/response/Training";
+import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/Training";
 import { QForm, useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -636,7 +636,6 @@ onMounted(async () => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>

src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue

@@ -7,15 +7,15 @@ import config from "@/app.config";
 import type { QTableProps, QForm } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useInsigniaDataStore } from "@/modules/04_registryNew/stores/insignia";
+import { useInsigniaDataStore } from "@/modules/04_registryPerson/stores/insignia";
 import DialogHeader from "@/components/DialogHeader.vue";
 import type {
   DataOption,
   DataOptionInsignia,
   InsigniaOps,
-} from "@/modules/04_registryNew/interface/index/Main";
+} from "@/modules/04_registryPerson/interface/index/Main";
-import type { RequestItemsObject } from "@/modules/04_registryNew/interface/request/Insignia";
+import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/Insignia";
-import type { ResponseObject } from "@/modules/04_registryNew/interface/response/Insignia";
+import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/Insignia";
 
 const $q = useQuasar();
 const route = useRoute();
@@ -749,7 +749,6 @@ onMounted(async () => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
 
@@ -1120,7 +1119,7 @@ onMounted(async () => {
         tittle="ประวัติแก้ไขเครื่องราชอิสริยาภรณ์"
         :close="() => (modalHistory = false)"
       />
-      <q-separator  />
+      <q-separator />
 
       <q-card-section style="max-height: 60vh" class="scroll">
         <div class="row q-gutter-sm q-mb-sm">

src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue

@@ -8,8 +8,8 @@ import type { QTableProps, QForm } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
 import DialogHeader from "@/components/DialogHeader.vue";
-import type { RequestItemsObject } from "@/modules/04_registryNew/interface/request/DeclarationHonor";
+import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/DeclarationHonor";
-import type { ResponseObject } from "@/modules/04_registryNew/interface/response/DeclarationHonor";
+import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/DeclarationHonor";
 
 const $q = useQuasar();
 const route = useRoute();
@@ -479,7 +479,6 @@ onMounted(async () => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
 

src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue

@@ -7,11 +7,11 @@ import config from "@/app.config";
 import type { QTableProps, QForm } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useResultsPerformDataStore } from "@/modules/04_registryNew/stores/ResultsPerformance";
+import { useResultsPerformDataStore } from "@/modules/04_registryPerson/stores/ResultsPerformance";
 import DialogHeader from "@/components/DialogHeader.vue";
 
-import type { RequestItemsObject } from "@/modules/04_registryNew/interface/request/ResultsPerformance";
+import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/ResultsPerformance";
-import type { ResponseObject } from "@/modules/04_registryNew/interface/response/ResultsPerformance";
+import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/ResultsPerformance";
 
 const $q = useQuasar();
 const route = useRoute();
@@ -551,7 +551,6 @@ onMounted(async () => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
 

src/modules/04_registryPerson/components/detail/Achievement/Main.vue

@@ -2,11 +2,11 @@
 import { ref } from "vue";
 
 /** importComponents*/
-import ProfessionalLicense from "@/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue";
+import ProfessionalLicense from "@/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue";
-import Train from "@/modules/04_registryNew/components/detail/Achievement/02_Train.vue";
+import Train from "@/modules/04_registryPerson/components/detail/Achievement/02_Train.vue";
-import Insignia from "@/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue";
+import Insignia from "@/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue";
-import DeclarationHonor from "@/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue";
+import DeclarationHonor from "@/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue";
-import ResultsPerformance from "@/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue";
+import ResultsPerformance from "@/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue";
 
 const tab = ref<string>("1");
 </script>
@@ -14,20 +14,22 @@ const tab = ref<string>("1");
   <div class="row items-center q-my-md">
     <div class="text-dark row items-center q-px-md">
       <q-icon name="mdi-account" class="q-mr-md" size="22px" />
-      <div class="text-subtitle1 text-weight-bold">ข้อมูลผลงานและเครื่องราชฯ</div>
+      <div class="text-subtitle1 text-weight-bold">
+        ข้อมูลผลงานและเครื่องราชฯ
+      </div>
     </div>
   </div>
 
   <q-separator />
   <q-tabs
-      v-model="tab"
+    v-model="tab"
-      active-color="blue-8"
+    active-color="blue-8"
-      align="left"
+    align="left"
-      bordered
+    bordered
-      narrow-indicator
+    narrow-indicator
-      indicator-color="transparent"
+    indicator-color="transparent"
-      dense
+    dense
-      class="text-grey q-pl-sm"
+    class="text-grey q-pl-sm"
   >
     <q-tab name="1" label="ใบอนุญาตประกอบวิชาชีพ" />
     <q-tab name="2" label="การฝึกอบรม/ดูงาน" />

src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue

@@ -5,11 +5,11 @@ import { useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type { FormEmployee } from "@/modules/04_registryNew/interface/request/Employee";
+import type { FormEmployee } from "@/modules/04_registryPerson/interface/request/Employee";
 import type {
   EmployeeHistory,
   ResEmployee,
-} from "@/modules/04_registryNew/interface/response/Employee";
+} from "@/modules/04_registryPerson/interface/response/Employee";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 

src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue

@@ -9,8 +9,8 @@ import type { QTableProps } from "quasar";
 import type {
   Employment,
   EmploymentHistory,
-} from "@/modules/04_registryNew/interface/response/Employee";
+} from "@/modules/04_registryPerson/interface/response/Employee";
-import type { FormEmployment } from "@/modules/04_registryNew/interface/request/Employee";
+import type { FormEmployment } from "@/modules/04_registryPerson/interface/request/Employee";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 
@@ -294,7 +294,6 @@ onMounted(() => {
           <q-th v-for="col in props.cols" :key="col.name" :props="props">
             <span class="text-weight-medium">{{ col.label }}</span>
           </q-th>
-
         </q-tr>
       </template>
       <template v-slot:body="props">
@@ -340,7 +339,6 @@ onMounted(() => {
               {{ col.value ? col.value : "-" }}
             </div>
           </q-td>
-
         </q-tr>
       </template>
     </d-table>

src/modules/04_registryPerson/components/detail/Employee/Main.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { ref } from "vue";
 
-import DataEmployee from "@/modules/04_registryNew/components/detail/Employee/01_DataEmployee.vue";
+import DataEmployee from "@/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue";
-import Employment from "@/modules/04_registryNew/components/detail/Employee/02_Employment.vue";
+import Employment from "@/modules/04_registryPerson/components/detail/Employee/02_Employment.vue";
 
 const tab = ref<string>("1");
 </script>

src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue

@@ -4,7 +4,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import type {
   RequestItemsHistoryObject,
   FormMain,
-} from "@/modules/04_registryNew/interface/index/government";
+} from "@/modules/04_registryPerson/interface/index/government";
 import DialogHeader from "@/components/DialogHeader.vue";
 import { useQuasar } from "quasar";
 import type { QTableProps } from "quasar";

src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue

@@ -6,13 +6,13 @@ import type {
   FormFilter,
   DataOption,
   DisciplineOps,
-} from "@/modules/04_registryNew/interface/index/discipline";
+} from "@/modules/04_registryPerson/interface/index/discipline";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 import DialogHeader from "@/components/DialogHeader.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import DialogHistory from "@/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue";
+import DialogHistory from "@/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue";
 import { useRoute } from "vue-router";
 
 const route = useRoute();
@@ -496,7 +496,6 @@ onMounted(async () => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>

src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue

@@ -11,7 +11,7 @@ import config from "@/app.config";
 import type {
   RequestItemsObject,
   FormFilter,
-} from "@/modules/04_registryNew/interface/index/discipline";
+} from "@/modules/04_registryPerson/interface/index/discipline";
 
 const modal = defineModel<boolean>("modal", { required: true });
 const id = defineModel<string>("id", { required: true });

src/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue

@@ -12,9 +12,9 @@ import type {
   DataOption,
   ResponseTotalObject,
   MyObjectRef,
-} from "@/modules/04_registryNew/interface/index/leave";
+} from "@/modules/04_registryPerson/interface/index/leave";
 
-import DialogHistory from "@/modules/04_registryNew/components/detail/GovernmentInformation/03_LeaveHistory.vue";
+import DialogHistory from "@/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -602,7 +602,6 @@ onMounted(() => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>

src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue

@@ -11,7 +11,7 @@ import config from "@/app.config";
 import type {
   DetailData,
   FormFilter,
-} from "@/modules/04_registryNew/interface/index/leave";
+} from "@/modules/04_registryPerson/interface/index/leave";
 
 const modal = defineModel<boolean>("modal", { required: true });
 const id = defineModel<string>("id", { required: true });

src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue

@@ -4,7 +4,7 @@ import { useQuasar, type QTableProps } from "quasar";
 import type {
   FormFilter,
   RequestItemsObject,
-} from "@/modules/04_registryNew/interface/index/performSpecialWork";
+} from "@/modules/04_registryPerson/interface/index/performSpecialWork";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -12,7 +12,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 
 import DialogHeader from "@/components/DialogHeader.vue";
-import DialogHistory from "@/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue";
+import DialogHistory from "@/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue";
 import { useRoute } from "vue-router";
 
 const route = useRoute();
@@ -453,7 +453,6 @@ onMounted(async () => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>

src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue

@@ -10,7 +10,7 @@ import config from "@/app.config";
 import type {
   FormFilter,
   ResponseObject,
-} from "@/modules/04_registryNew/interface/index/performSpecialWork";
+} from "@/modules/04_registryPerson/interface/index/performSpecialWork";
 import { useRoute } from "vue-router";
 
 const modal = defineModel<boolean>("modal", { required: true });

src/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue

@@ -2,10 +2,10 @@
 import { ref } from "vue";
 
 /** importComponents*/
-import Info from "@/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue";
+import Info from "@/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue";
-import Discipline from "@/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue";
+import Discipline from "@/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue";
-import Leave from "@/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue";
+import Leave from "@/modules/04_registryPerson/components/detail/GovernmentInformation/03_Leave.vue";
-import PerformSpecialWork from "@/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue";
+import PerformSpecialWork from "@/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWork.vue";
 
 const tab = ref<string>("1");
 </script>

src/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue

@@ -5,14 +5,14 @@ import type {
   RowList,
   FormFilter,
   MyObjectRef,
-} from "@/modules/04_registryNew/interface/index/other";
+} from "@/modules/04_registryPerson/interface/index/other";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import DialogHeader from "@/components/DialogHeader.vue";
 import { useRoute } from "vue-router";
-import DialogHistory from "@/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue";
+import DialogHistory from "@/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue";
 const route = useRoute();
 const $q = useQuasar();
 const mixin = useCounterMixin();
@@ -344,7 +344,6 @@ onMounted(() => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>

src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue

@@ -5,7 +5,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar, type QTableProps } from "quasar";
 import { useRoute } from "vue-router";
 
-import type { RowList } from "@/modules/04_registryNew/interface/index/other";
+import type { RowList } from "@/modules/04_registryPerson/interface/index/other";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -13,7 +13,7 @@ import config from "@/app.config";
 import type {
   RequestItemsObject,
   FormFilter,
-} from "@/modules/04_registryNew/interface/index/discipline";
+} from "@/modules/04_registryPerson/interface/index/discipline";
 
 const modal = defineModel<boolean>("modal", { required: true });
 const id = defineModel<string>("id", { required: true });

src/modules/04_registryPerson/components/detail/Other/02_Document.vue

@@ -6,7 +6,7 @@ import config from "@/app.config";
 import axios from "axios";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
-import type { ArrayFileList } from "@/modules/04_registryNew/interface/index/document";
+import type { ArrayFileList } from "@/modules/04_registryPerson/interface/index/document";
 const $q = useQuasar();
 const route = useRoute();
 const mixin = useCounterMixin();
@@ -26,7 +26,7 @@ const profileId = ref<string>(
 );
 
 async function getData() {
-  showLoader()
+  showLoader();
   await http
     .get(
       config.API.file("ระบบทะเบียนประวัติ", "เอกสารหลักฐาน", profileId.value)
@@ -38,7 +38,7 @@ async function getData() {
       messageError($q, e);
     })
     .finally(() => {
-      hideLoader()
+      hideLoader();
     });
 }
 

src/modules/04_registryPerson/components/detail/Other/Main.vue

@@ -2,8 +2,8 @@
 import { ref } from "vue";
 
 /** importComponents*/
-import OtherInformation from "@/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue";
+import OtherInformation from "@/modules/04_registryPerson/components/detail/Other/01_OtherInformation.vue";
-import Documentipline from "@/modules/04_registryNew/components/detail/Other/02_Document.vue";
+import Documentipline from "@/modules/04_registryPerson/components/detail/Other/02_Document.vue";
 
 const tab = ref<string>("1");
 </script>

src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue

@@ -7,10 +7,10 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useProfileDataStore } from "@/modules/04_registryNew/stores/profile";
+import { useProfileDataStore } from "@/modules/04_registryPerson/stores/profile";
 import DialogHeader from "@/components/DialogHeader.vue";
-import type { RequestObject } from "@/modules/04_registryNew/interface/request/Profile";
+import type { RequestObject } from "@/modules/04_registryPerson/interface/request/Profile";
-import type { ResponseObject } from "@/modules/04_registryNew/interface/response/Profile";
+import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/Profile";
 
 const $q = useQuasar();
 const route = useRoute();

src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue

@@ -9,9 +9,9 @@ import config from "@/app.config";
 import dialogHeader from "@/components/DialogHeader.vue";
 import { useCounterMixin } from "@/stores/mixin";
 import type { ResponseObject } from "@/components/information/interface/response/OldName";
-import type { Pagination } from "@/modules/04_registryNew/interface/index/Main";
+import type { Pagination } from "@/modules/04_registryPerson/interface/index/Main";
 import type { RequestItemsObject } from "@/components/information/interface/request/OldName";
-import { useProfileDataStore } from "@/modules/04_registryNew/stores/profile";
+import { useProfileDataStore } from "@/modules/04_registryPerson/stores/profile";
 
 const $q = useQuasar();
 const route = useRoute();

src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue

@@ -8,10 +8,10 @@ import config from "@/app.config";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 import { useCounterMixin } from "@/stores/mixin";
-import { useAddressDataStore } from "@/modules/04_registryNew/stores/Address";
+import { useAddressDataStore } from "@/modules/04_registryPerson/stores/Address";
 
-import type { ResponseObject } from "@/modules/04_registryNew/interface/response/Address";
+import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/Address";
-import type { RequestObject } from "@/modules/04_registryNew/interface/request/Address";
+import type { RequestObject } from "@/modules/04_registryPerson/interface/request/Address";
 
 const $q = useQuasar();
 const store = useAddressDataStore();

src/modules/04_registryPerson/components/detail/PersonalInformation/04_Family.vue

@@ -6,7 +6,7 @@ import { QForm, useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRoute } from "vue-router";
-import { useProfileDataStore } from "@/modules/04_registryNew/stores/profile";
+import { useProfileDataStore } from "@/modules/04_registryPerson/stores/profile";
 const mixin = useCounterMixin();
 const $q = useQuasar();
 const {

src/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue

@@ -6,15 +6,15 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 import type { QTableProps } from "quasar";
-import type { DataOption } from "@/modules/04_registryNew/interface/index/Main";
+import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main";
 import type {
   FormPerson,
   FormChildren,
-} from "@/modules/04_registryNew/interface/index/family";
+} from "@/modules/04_registryPerson/interface/index/family";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 
-import { useProfileDataStore } from "@/modules/04_registryNew/stores/profile";
+import { useProfileDataStore } from "@/modules/04_registryPerson/stores/profile";
 import { useCounterMixin } from "@/stores/mixin";
 
 const $q = useQuasar();

src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue

@@ -4,8 +4,8 @@ import dialogHeader from "@/components/DialogHeader.vue";
 import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useRoute } from "vue-router";
-import type { RequestItemsObject } from "@/modules/04_registryNew/interface/request/Education";
+import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/Education";
-import type { ResponseObject } from "@/modules/04_registryNew/interface/response/Education";
+import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/Education";
 import { QForm, useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -567,8 +567,13 @@ function editForm(row: any) {
   educationData.durationYear = row.durationYear;
   educationData.note = row.note;
   educationData.startYear =
-    row.isDate == "true" ? row.startDate.slice(0, 4) : new Date(row.startDate).getFullYear();
+    row.isDate == "true"
-  educationData.endYear = row.isDate == "true" ? row.endDate.slice(0, 4) : new Date(row.endDate).getFullYear();;
+      ? row.startDate.slice(0, 4)
+      : new Date(row.startDate).getFullYear();
+  educationData.endYear =
+    row.isDate == "true"
+      ? row.endDate.slice(0, 4)
+      : new Date(row.endDate).getFullYear();
   dialog.value = true;
 }
 
@@ -850,7 +855,6 @@ onMounted(async () => {
             {{ col.value === "" || col.value === null ? "-" : col.value }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>

src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue

@@ -3,8 +3,8 @@ import { ref, reactive, onMounted } from "vue";
 import { QForm, useQuasar } from "quasar";
 import dialogHeader from "@/components/DialogHeader.vue";
 import { useCounterMixin } from "@/stores/mixin";
-import type { RequestItemsObject } from "@/modules/04_registryNew/interface/request/SpecialSkill";
+import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/SpecialSkill";
-import type { ResponseObject } from "@/modules/04_registryNew/interface/response/SpecialSkill";
+import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/SpecialSkill";
 import type { QTableProps } from "quasar";
 import { useRoute } from "vue-router";
 import http from "@/plugins/http";
@@ -444,7 +444,6 @@ onMounted(async () => {
         <q-td v-for="col in props.cols" :key="col.id">
           <div>{{ col.value ? col.value : "-" }}</div>
         </q-td>
-
       </q-tr>
     </template>
     <template v-slot:item="props" v-else>

src/modules/04_registryPerson/components/detail/PersonalInformation/Main.vue

@@ -2,14 +2,14 @@
 import { ref } from "vue";
 
 /** importComponents*/
-import Profile from "@/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue";
+import Profile from "@/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue";
-import NameChangeHistory from "@/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue";
+import NameChangeHistory from "@/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue";
-import Address from "@/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue";
+import Address from "@/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue";
-import Family from "@/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue";
+import Family from "@/modules/04_registryPerson/components/detail/PersonalInformation/04_Family.vue";
-import Education from "@/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue";
+import Education from "@/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue";
-import SpecialSkill from "@/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue";
+import SpecialSkill from "@/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue";
 
-import FamilyNew from "@/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue";
+import FamilyNew from "@/modules/04_registryPerson/components/detail/PersonalInformation/04_FamilyNew.vue";
 
 const tab = ref<string>("1");
 const props = defineProps({
@@ -47,7 +47,7 @@ const props = defineProps({
 
     <q-tab-panels v-model="tab" animated>
       <q-tab-panel name="1">
-        <Profile :fetchDataPersonal="props.fetchDataPersonal"/>
+        <Profile :fetchDataPersonal="props.fetchDataPersonal" />
       </q-tab-panel>
       <q-tab-panel name="2">
         <NameChangeHistory :fetchDataPersonal="props.fetchDataPersonal" />

src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue

@@ -9,15 +9,15 @@ import type { QTableProps } from "quasar";
 import type {
   DataOption2,
   DataOption,
-} from "@/modules/04_registryNew/interface/index/Main";
+} from "@/modules/04_registryPerson/interface/index/Main";
 
-import type { FormSalaryNew } from "@/modules/04_registryNew/interface/request/Salary";
+import type { FormSalaryNew } from "@/modules/04_registryPerson/interface/request/Salary";
 
 import DialogHeader from "@/components/DialogHeader.vue";
-import DialogHistory from "@/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue";
+import DialogHistory from "@/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useSalaryDataStore } from "@/modules/04_registryNew/stores/salary";
+import { useSalaryDataStore } from "@/modules/04_registryPerson/stores/salary";
 
 const $q = useQuasar();
 const route = useRoute();
@@ -668,7 +668,6 @@ onMounted(() => {
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
-
       </q-tr>
     </template>
   </d-table>

src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue

@@ -7,11 +7,11 @@ import config from "@/app.config";
 
 import { useCounterMixin } from "@/stores/mixin";
 import DialogHeader from "@/components/DialogHeader.vue";
-import DialogHisotory from "@/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue";
+import DialogHisotory from "@/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue";
 
 import type { QTableProps } from "quasar";
-import type { RowList } from "@/modules/04_registryNew/interface/index/salary";
+import type { RowList } from "@/modules/04_registryPerson/interface/index/salary";
-import type { RequestNoPaidObject } from "@/modules/04_registryNew/interface/request/Salary";
+import type { RequestNoPaidObject } from "@/modules/04_registryPerson/interface/request/Salary";
 
 const $q = useQuasar();
 const route = useRoute();

src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue

@@ -7,7 +7,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 import type { QTableProps } from "quasar";
-import type { RowList } from "@/modules/04_registryNew/interface/index/salary";
+import type { RowList } from "@/modules/04_registryPerson/interface/index/salary";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 

src/modules/04_registryPerson/components/detail/Salary/Main.vue

@@ -2,8 +2,8 @@
 import { ref } from "vue";
 
 /** importComponents*/
-import PositionSalary from "@/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue";
+import PositionSalary from "@/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue";
-import NotReceiveSalary from "@/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue";
+import NotReceiveSalary from "@/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue";
 
 const tab = ref<string>("1");
 </script>

src/modules/04_registryPerson/components/detail/TabMain.vue

@@ -2,14 +2,14 @@
 import { ref } from "vue";
 import { useRoute } from "vue-router";
 
-import { useRegistryDetailNewDataStore } from "@/modules/04_registryNew/stores/DetailMain";
+import { useRegistryDetailNewDataStore } from "@/modules/04_registryPerson/stores/DetailMain";
 
-import PersonalInformationMain from "@/modules/04_registryNew/components/detail/PersonalInformation/Main.vue";
+import PersonalInformationMain from "@/modules/04_registryPerson/components/detail/PersonalInformation/Main.vue";
-import GovernmentInformationMain from "@/modules/04_registryNew/components/detail/GovernmentInformation/Main.vue";
+import GovernmentInformationMain from "@/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue";
-import salaryMain from "@/modules/04_registryNew/components/detail/Salary/Main.vue";
+import salaryMain from "@/modules/04_registryPerson/components/detail/Salary/Main.vue";
-import AchievementMain from "@/modules/04_registryNew/components/detail/Achievement/Main.vue";
+import AchievementMain from "@/modules/04_registryPerson/components/detail/Achievement/Main.vue";
-import OtherMaim from "@/modules/04_registryNew/components/detail/Other/Main.vue";
+import OtherMaim from "@/modules/04_registryPerson/components/detail/Other/Main.vue";
-import EmployeeMain from "@/modules/04_registryNew/components/detail/Employee/Main.vue";
+import EmployeeMain from "@/modules/04_registryPerson/components/detail/Employee/Main.vue";
 
 const route = useRoute();
 

src/modules/04_registryPerson/components/requestEdit/DialogStatus.vue

@@ -4,7 +4,7 @@ import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import type { DataOption } from "@/modules/04_registryNew/interface/index/Main";
+import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main";
 
 /**
  * importComponents
@@ -14,7 +14,7 @@ import DialogHeader from "@/components/DialogHeader.vue";
 /**
  * importStore
  */
-import { useRequestEditStore } from "@/modules/04_registryNew/stores/RequestEdit";
+import { useRequestEditStore } from "@/modules/04_registryPerson/stores/RequestEdit";
 import { useCounterMixin } from "@/stores/mixin";
 
 /**