From 15d3ac574da1327ad62eaaa236cd2b77af8f03b7 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 1 Aug 2024 12:12:28 +0700 Subject: [PATCH] update --- src/components/Dialogs/PopupPersonalNew.vue | 66 ++++++++++++++----- .../components/DialogAddPosition.vue | 4 +- .../components/DialogFormAgency.vue | 4 +- .../components/DialogFormDateTime.vue | 4 +- .../components/DialogFormPosition.vue | 8 +-- .../components/DialogHistory.vue | 2 +- .../components/DialogHistoryPos.vue | 4 +- .../components/DialogMovePos.vue | 10 +-- .../components/DialogNewStructure.vue | 4 +- .../components/DialogPositionDetail.vue | 4 +- .../components/DialogSelectPerson.vue | 8 +-- .../components/DialogSortAgency.vue | 4 +- .../components/DialogSortPosition.vue | 4 +- .../components/DialogStructureDetail.vue | 2 +- .../components/DialogSuccession.vue | 10 +-- .../components/StructureMain.vue | 2 +- .../components/TreeMain.vue | 16 ++--- .../components/TreeTable.vue | 24 +++---- .../components/TreeView.vue | 10 +-- .../interface/index/Main.ts | 0 .../interface/index/organizational.ts | 0 .../interface/request/Main.ts | 0 .../interface/request/organizational.ts | 0 .../interface/response/Main.ts | 0 .../interface/response/organizational.ts | 0 src/modules/02_organization/router.ts | 14 ++++ .../store.ts | 0 .../store/organizational.ts | 6 +- .../views/ExampleSearchTree.vue | 10 +-- .../views/main.vue | 14 ++-- src/modules/02_organizationalNew/router.ts | 14 ---- src/modules/04_registryNew/router.ts | 49 -------------- .../components/DialogAddData.vue | 10 +-- .../components/DialogHistory.vue | 8 +-- .../components/TableView.vue | 14 ++-- .../Achievement/01_ProfessionalLicense.vue | 5 +- .../detail/Achievement/02_Train.vue | 5 +- .../detail/Achievement/03_Insignia.vue | 11 ++-- .../Achievement/04_DeclarationHonor.vue | 5 +- .../Achievement/05_ResultsPerformance.vue | 7 +- .../components/detail/Achievement/Main.vue | 30 +++++---- .../detail/Employee/01_DataEmployee.vue | 4 +- .../detail/Employee/02_Employment.vue | 6 +- .../components/detail/Employee/Main.vue | 4 +- .../detail/GovernmentInformation/01_Info.vue | 2 +- .../GovernmentInformation/02_Discipline.vue | 5 +- .../02_DisciplineHistory.vue | 2 +- .../detail/GovernmentInformation/03_Leave.vue | 5 +- .../GovernmentInformation/03_LeaveHistory.vue | 2 +- .../04_PerformSpecialWork.vue | 5 +- .../04_PerformSpecialWorkHistory.vue | 2 +- .../detail/GovernmentInformation/Main.vue | 8 +-- .../detail/Other/01_OtherInformation.vue | 5 +- .../Other/01_OtherInformationHistory.vue | 4 +- .../components/detail/Other/02_Document.vue | 6 +- .../components/detail/Other/Main.vue | 4 +- .../detail/PersonalInformation/01_Profile.vue | 6 +- .../02_NameChangeHistory.vue | 4 +- .../detail/PersonalInformation/03_Address.vue | 6 +- .../detail/PersonalInformation/04_Family.vue | 2 +- .../PersonalInformation/04_FamilyNew.vue | 6 +- .../PersonalInformation/05_Education.vue | 14 ++-- .../PersonalInformation/06_SpecialSkill.vue | 5 +- .../detail/PersonalInformation/Main.vue | 16 ++--- .../detail/Salary/01_PositionSalary.vue | 9 ++- .../Salary/01_PositionSalaryHistory.vue | 0 .../detail/Salary/02_NotReceiveSalary.vue | 6 +- .../Salary/02_NotReceiveSalaryHistory.vue | 2 +- .../components/detail/Salary/Main.vue | 4 +- .../components/detail/TabMain.vue | 14 ++-- .../components/requestEdit/DialogStatus.vue | 4 +- .../interface/index/Main.ts | 0 .../interface/index/discipline.ts | 0 .../interface/index/document.ts | 0 .../interface/index/family.ts | 0 .../interface/index/form.ts | 0 .../interface/index/government.ts | 0 .../interface/index/leave.ts | 0 .../interface/index/other.ts | 0 .../interface/index/performSpecialWork.ts | 0 .../interface/index/registry.ts | 0 .../interface/index/salary.ts | 0 .../interface/request/Address.ts | 0 .../interface/request/DeclarationHonor.ts | 0 .../interface/request/Education.ts | 0 .../interface/request/Employee.ts | 0 .../interface/request/Information.ts | 0 .../interface/request/Insignia.ts | 0 .../interface/request/Main.ts | 0 .../interface/request/ProfesLicense.ts | 0 .../interface/request/Profile.ts | 0 .../interface/request/ResultsPerformance.ts | 0 .../interface/request/Salary.ts | 0 .../interface/request/SpecialSkill.ts | 0 .../interface/request/Training.ts | 0 .../interface/response/Address.ts | 0 .../interface/response/DeclarationHonor.ts | 0 .../interface/response/Education.ts | 0 .../interface/response/Employee.ts | 0 .../interface/response/History.ts | 0 .../interface/response/Insignia.ts | 0 .../interface/response/Main.ts | 0 .../interface/response/ProfesLicense.ts | 0 .../interface/response/Profile.ts | 0 .../interface/response/ResultsPerformance.ts | 0 .../interface/response/SpecialSkill.ts | 0 .../interface/response/Training.ts | 0 src/modules/04_registryPerson/router.ts | 49 ++++++++++++++ .../store.ts | 4 +- .../stores/Address.ts | 6 +- .../stores/DetailMain.ts | 0 .../stores/RequestEdit.ts | 2 +- .../stores/ResultsPerformance.ts | 0 .../stores/insignia.ts | 2 +- .../stores/profile.ts | 6 +- .../stores/registry.ts | 0 .../stores/salary.ts | 2 +- .../views/detailView.vue | 6 +- .../views/list.vue | 10 +-- .../views/requestEdit.vue | 6 +- .../07_insignia/components/2_Manage/Tab1.vue | 2 +- .../07_insignia/components/2_Manage/Tab2.vue | 2 +- .../07_insignia/components/2_Manage/Tab3.vue | 2 +- .../08_registryEmployee/views/DetailView.vue | 2 +- .../13_salary/components/DialogInfoMain.vue | 4 +- .../components/DialogSortPosition.vue | 2 +- src/modules/16_positionEmployee/router.ts | 4 +- src/router/index.ts | 4 +- 128 files changed, 347 insertions(+), 322 deletions(-) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogAddPosition.vue (99%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogFormAgency.vue (99%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogFormDateTime.vue (96%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogFormPosition.vue (98%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogHistory.vue (98%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogHistoryPos.vue (96%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogMovePos.vue (96%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogNewStructure.vue (97%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogPositionDetail.vue (98%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogSelectPerson.vue (98%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogSortAgency.vue (95%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogSortPosition.vue (96%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogStructureDetail.vue (98%) rename src/modules/{02_organizationalNew => 02_organization}/components/DialogSuccession.vue (96%) rename src/modules/{02_organizationalNew => 02_organization}/components/StructureMain.vue (99%) rename src/modules/{02_organizationalNew => 02_organization}/components/TreeMain.vue (96%) rename src/modules/{02_organizationalNew => 02_organization}/components/TreeTable.vue (95%) rename src/modules/{02_organizationalNew => 02_organization}/components/TreeView.vue (96%) rename src/modules/{02_organizationalNew => 02_organization}/interface/index/Main.ts (100%) rename src/modules/{02_organizationalNew => 02_organization}/interface/index/organizational.ts (100%) rename src/modules/{02_organizationalNew => 02_organization}/interface/request/Main.ts (100%) rename src/modules/{02_organizationalNew => 02_organization}/interface/request/organizational.ts (100%) rename src/modules/{02_organizationalNew => 02_organization}/interface/response/Main.ts (100%) rename src/modules/{02_organizationalNew => 02_organization}/interface/response/organizational.ts (100%) create mode 100644 src/modules/02_organization/router.ts rename src/modules/{02_organizationalNew => 02_organization}/store.ts (100%) rename src/modules/{02_organizationalNew => 02_organization}/store/organizational.ts (95%) rename src/modules/{02_organizationalNew => 02_organization}/views/ExampleSearchTree.vue (92%) rename src/modules/{02_organizationalNew => 02_organization}/views/main.vue (94%) delete mode 100644 src/modules/02_organizationalNew/router.ts delete mode 100644 src/modules/04_registryNew/router.ts rename src/modules/{04_registryNew => 04_registryPerson}/components/DialogAddData.vue (96%) rename src/modules/{04_registryNew => 04_registryPerson}/components/DialogHistory.vue (98%) rename src/modules/{04_registryNew => 04_registryPerson}/components/TableView.vue (97%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Achievement/01_ProfessionalLicense.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Achievement/02_Train.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Achievement/03_Insignia.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Achievement/04_DeclarationHonor.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Achievement/05_ResultsPerformance.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Achievement/Main.vue (61%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Employee/01_DataEmployee.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Employee/02_Employment.vue (98%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Employee/Main.vue (83%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/GovernmentInformation/01_Info.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/GovernmentInformation/02_Discipline.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/GovernmentInformation/02_DisciplineHistory.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/GovernmentInformation/03_Leave.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/GovernmentInformation/03_LeaveHistory.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/GovernmentInformation/04_PerformSpecialWork.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/GovernmentInformation/Main.vue (73%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Other/01_OtherInformation.vue (98%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Other/01_OtherInformationHistory.vue (97%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Other/02_Document.vue (98%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Other/Main.vue (83%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/PersonalInformation/01_Profile.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/PersonalInformation/02_NameChangeHistory.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/PersonalInformation/03_Address.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/PersonalInformation/04_Family.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/PersonalInformation/04_FamilyNew.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/PersonalInformation/05_Education.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/PersonalInformation/06_SpecialSkill.vue (98%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/PersonalInformation/Main.vue (69%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Salary/01_PositionSalary.vue (98%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Salary/01_PositionSalaryHistory.vue (100%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Salary/02_NotReceiveSalary.vue (98%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Salary/02_NotReceiveSalaryHistory.vue (98%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/Salary/Main.vue (83%) rename src/modules/{04_registryNew => 04_registryPerson}/components/detail/TabMain.vue (82%) rename src/modules/{04_registryNew => 04_registryPerson}/components/requestEdit/DialogStatus.vue (96%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/Main.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/discipline.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/document.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/family.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/form.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/government.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/leave.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/other.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/performSpecialWork.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/registry.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/index/salary.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/Address.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/DeclarationHonor.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/Education.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/Employee.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/Information.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/Insignia.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/Main.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/ProfesLicense.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/Profile.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/ResultsPerformance.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/Salary.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/SpecialSkill.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/request/Training.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/Address.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/DeclarationHonor.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/Education.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/Employee.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/History.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/Insignia.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/Main.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/ProfesLicense.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/Profile.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/ResultsPerformance.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/SpecialSkill.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/interface/response/Training.ts (100%) create mode 100644 src/modules/04_registryPerson/router.ts rename src/modules/{04_registryNew => 04_registryPerson}/store.ts (92%) rename src/modules/{04_registryNew => 04_registryPerson}/stores/Address.ts (95%) rename src/modules/{04_registryNew => 04_registryPerson}/stores/DetailMain.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/stores/RequestEdit.ts (95%) rename src/modules/{04_registryNew => 04_registryPerson}/stores/ResultsPerformance.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/stores/insignia.ts (87%) rename src/modules/{04_registryNew => 04_registryPerson}/stores/profile.ts (97%) rename src/modules/{04_registryNew => 04_registryPerson}/stores/registry.ts (100%) rename src/modules/{04_registryNew => 04_registryPerson}/stores/salary.ts (99%) rename src/modules/{04_registryNew => 04_registryPerson}/views/detailView.vue (99%) rename src/modules/{04_registryNew => 04_registryPerson}/views/list.vue (97%) rename src/modules/{04_registryNew => 04_registryPerson}/views/requestEdit.vue (97%) diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue index 4df83404b..7032a48a7 100644 --- a/src/components/Dialogs/PopupPersonalNew.vue +++ b/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) { @@ -278,7 +280,9 @@ async function fetchProfile(id: string, avatarName: string) { @@ -286,7 +290,9 @@ async function fetchProfile(id: string, avatarName: string) { @@ -294,7 +300,9 @@ async function fetchProfile(id: string, avatarName: string) { @@ -302,7 +310,9 @@ async function fetchProfile(id: string, avatarName: string) { @@ -310,7 +320,9 @@ async function fetchProfile(id: string, avatarName: string) { @@ -318,7 +330,7 @@ async function fetchProfile(id: string, avatarName: string) { @@ -346,7 +358,7 @@ async function fetchProfile(id: string, avatarName: string) { @@ -354,7 +366,9 @@ async function fetchProfile(id: string, avatarName: string) { @@ -362,7 +376,11 @@ async function fetchProfile(id: string, avatarName: string) { @@ -370,7 +388,9 @@ async function fetchProfile(id: string, avatarName: string) { @@ -378,7 +398,9 @@ async function fetchProfile(id: string, avatarName: string) { @@ -386,7 +408,11 @@ async function fetchProfile(id: string, avatarName: string) { @@ -397,7 +423,11 @@ async function fetchProfile(id: string, avatarName: string) { @@ -408,7 +438,11 @@ async function fetchProfile(id: string, avatarName: string) { diff --git a/src/modules/02_organizationalNew/components/DialogAddPosition.vue b/src/modules/02_organization/components/DialogAddPosition.vue similarity index 99% rename from src/modules/02_organizationalNew/components/DialogAddPosition.vue rename to src/modules/02_organization/components/DialogAddPosition.vue index 197a0144f..9fa0e35da 100644 --- a/src/modules/02_organizationalNew/components/DialogAddPosition.vue +++ b/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 diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organization/components/DialogFormAgency.vue similarity index 99% rename from src/modules/02_organizationalNew/components/DialogFormAgency.vue rename to src/modules/02_organization/components/DialogFormAgency.vue index 3ca95bea3..e6142d868 100644 --- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue +++ b/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("orgLevel", { required: true }); diff --git a/src/modules/02_organizationalNew/components/DialogFormDateTime.vue b/src/modules/02_organization/components/DialogFormDateTime.vue similarity index 96% rename from src/modules/02_organizationalNew/components/DialogFormDateTime.vue rename to src/modules/02_organization/components/DialogFormDateTime.vue index 70ac8a855..0140a1431 100644 --- a/src/modules/02_organizationalNew/components/DialogFormDateTime.vue +++ b/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 { useOrganizational } from "@/modules/02_organizationalNew/store/organizational"; +import type { FormDateTimeRef } from "@/modules/02_organization/interface/index/Main"; +import { useOrganizational } from "@/modules/02_organization/store/organizational"; import http from "@/plugins/http"; import config from "@/app.config"; diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organization/components/DialogFormPosition.vue similarity index 98% rename from src/modules/02_organizationalNew/components/DialogFormPosition.vue rename to src/modules/02_organization/components/DialogFormPosition.vue index 865b51d4e..35f0bab0f 100644 --- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue +++ b/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"; -import type { FilterMaster } from "@/modules/02_organizationalNew/interface/request/organizational"; +} from "@/modules/02_organization/interface/response/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 diff --git a/src/modules/02_organizationalNew/components/DialogHistory.vue b/src/modules/02_organization/components/DialogHistory.vue similarity index 98% rename from src/modules/02_organizationalNew/components/DialogHistory.vue rename to src/modules/02_organization/components/DialogHistory.vue index ccee85592..07fb6820d 100644 --- a/src/modules/02_organizationalNew/components/DialogHistory.vue +++ b/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 diff --git a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue similarity index 96% rename from src/modules/02_organizationalNew/components/DialogHistoryPos.vue rename to src/modules/02_organization/components/DialogHistoryPos.vue index 14860363b..a0eb53d31 100644 --- a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue +++ b/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(); diff --git a/src/modules/02_organizationalNew/components/DialogMovePos.vue b/src/modules/02_organization/components/DialogMovePos.vue similarity index 96% rename from src/modules/02_organizationalNew/components/DialogMovePos.vue rename to src/modules/02_organization/components/DialogMovePos.vue index 03879bfec..54bc6a38c 100644 --- a/src/modules/02_organizationalNew/components/DialogMovePos.vue +++ b/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"; -import type { NewPagination } from "@/modules/02_organizationalNew/interface/index/Main"; +} from "@/modules/02_organization/interface/response/organizational"; +import type { NewPagination } from "@/modules/02_organization/interface/index/Main"; import type { MovePos, FilterMaster, -} from "@/modules/02_organizationalNew/interface/request/organizational"; -import type { DataTree } from "@/modules/02_organizationalNew/interface/index/organizational"; +} from "@/modules/02_organization/interface/request/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 diff --git a/src/modules/02_organizationalNew/components/DialogNewStructure.vue b/src/modules/02_organization/components/DialogNewStructure.vue similarity index 97% rename from src/modules/02_organizationalNew/components/DialogNewStructure.vue rename to src/modules/02_organization/components/DialogNewStructure.vue index 4a42f44bf..482307276 100644 --- a/src/modules/02_organizationalNew/components/DialogNewStructure.vue +++ b/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 diff --git a/src/modules/02_organizationalNew/components/DialogPositionDetail.vue b/src/modules/02_organization/components/DialogPositionDetail.vue similarity index 98% rename from src/modules/02_organizationalNew/components/DialogPositionDetail.vue rename to src/modules/02_organization/components/DialogPositionDetail.vue index d73b003d1..96d4a63ca 100644 --- a/src/modules/02_organizationalNew/components/DialogPositionDetail.vue +++ b/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 diff --git a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue b/src/modules/02_organization/components/DialogSelectPerson.vue similarity index 98% rename from src/modules/02_organizationalNew/components/DialogSelectPerson.vue rename to src/modules/02_organization/components/DialogSelectPerson.vue index a5f4c8a66..4bbf7aa58 100644 --- a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue +++ b/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 diff --git a/src/modules/02_organizationalNew/components/DialogSortAgency.vue b/src/modules/02_organization/components/DialogSortAgency.vue similarity index 95% rename from src/modules/02_organizationalNew/components/DialogSortAgency.vue rename to src/modules/02_organization/components/DialogSortAgency.vue index c1cb6e042..ebb7377a1 100644 --- a/src/modules/02_organizationalNew/components/DialogSortAgency.vue +++ b/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 diff --git a/src/modules/02_organizationalNew/components/DialogSortPosition.vue b/src/modules/02_organization/components/DialogSortPosition.vue similarity index 96% rename from src/modules/02_organizationalNew/components/DialogSortPosition.vue rename to src/modules/02_organization/components/DialogSortPosition.vue index fe2a3ca12..1e328db74 100644 --- a/src/modules/02_organizationalNew/components/DialogSortPosition.vue +++ b/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 diff --git a/src/modules/02_organizationalNew/components/DialogStructureDetail.vue b/src/modules/02_organization/components/DialogStructureDetail.vue similarity index 98% rename from src/modules/02_organizationalNew/components/DialogStructureDetail.vue rename to src/modules/02_organization/components/DialogStructureDetail.vue index 0cad0351c..5168ed11b 100644 --- a/src/modules/02_organizationalNew/components/DialogStructureDetail.vue +++ b/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(); diff --git a/src/modules/02_organizationalNew/components/DialogSuccession.vue b/src/modules/02_organization/components/DialogSuccession.vue similarity index 96% rename from src/modules/02_organizationalNew/components/DialogSuccession.vue rename to src/modules/02_organization/components/DialogSuccession.vue index 288de4717..4655af4d8 100644 --- a/src/modules/02_organizationalNew/components/DialogSuccession.vue +++ b/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 { DataTree } from "@/modules/02_organizationalNew/interface/index/organizational"; +import type { NewPagination } from "@/modules/02_organization/interface/index/Main"; +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(); diff --git a/src/modules/02_organizationalNew/components/StructureMain.vue b/src/modules/02_organization/components/StructureMain.vue similarity index 99% rename from src/modules/02_organizationalNew/components/StructureMain.vue rename to src/modules/02_organization/components/StructureMain.vue index 34ca9ca57..d221ef2d5 100644 --- a/src/modules/02_organizationalNew/components/StructureMain.vue +++ b/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(); diff --git a/src/modules/02_organizationalNew/components/TreeMain.vue b/src/modules/02_organization/components/TreeMain.vue similarity index 96% rename from src/modules/02_organizationalNew/components/TreeMain.vue rename to src/modules/02_organization/components/TreeMain.vue index 6e45a3e90..37bf77c1c 100644 --- a/src/modules/02_organizationalNew/components/TreeMain.vue +++ b/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 { OrgTree } from "@/modules/02_organizationalNew/interface/response/organizational"; -import type { DataTree } from "@/modules/02_organizationalNew/interface/index/organizational"; +import type { ListMenu } from "@/modules/02_organization/interface/index/Main"; +import type { OrgTree } from "@/modules/02_organization/interface/response/organizational"; +import type { DataTree } from "@/modules/02_organization/interface/index/organizational"; /** importComponents*/ -import DialogAgency from "@/modules/02_organizationalNew/components/DialogFormAgency.vue"; -import DialogStructureDetail from "@/modules/02_organizationalNew/components/DialogStructureDetail.vue"; -import DialogSortAgency from "@/modules/02_organizationalNew/components/DialogSortAgency.vue"; -import DialogHistory from "@/modules/02_organizationalNew/components/DialogHistory.vue"; +import DialogAgency from "@/modules/02_organization/components/DialogFormAgency.vue"; +import DialogStructureDetail from "@/modules/02_organization/components/DialogStructureDetail.vue"; +import DialogSortAgency from "@/modules/02_organization/components/DialogSortAgency.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*/ diff --git a/src/modules/02_organizationalNew/components/TreeTable.vue b/src/modules/02_organization/components/TreeTable.vue similarity index 95% rename from src/modules/02_organizationalNew/components/TreeTable.vue rename to src/modules/02_organization/components/TreeTable.vue index 7c8797c2d..b7bec8fe6 100644 --- a/src/modules/02_organizationalNew/components/TreeTable.vue +++ b/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"; -import type { FilterMaster } from "@/modules/02_organizationalNew/interface/request/organizational"; +} from "@/modules/02_organization/interface/index/Main"; +import type { FilterMaster } from "@/modules/02_organization/interface/request/organizational"; import type { PosMaster2, OrgTree, -} from "@/modules/02_organizationalNew/interface/response/organizational"; -import type { DataPosition } from "@/modules/02_organizationalNew/interface/index/organizational"; +} from "@/modules/02_organization/interface/response/organizational"; +import type { DataPosition } from "@/modules/02_organization/interface/index/organizational"; /** importComponents*/ -import DialogFormPosotion from "@/modules/02_organizationalNew/components/DialogFormPosition.vue"; -import DialogPositionDetail from "@/modules/02_organizationalNew/components/DialogPositionDetail.vue"; -import DialogSort from "@/modules/02_organizationalNew/components/DialogSortPosition.vue"; -import DialogMovePos from "@/modules/02_organizationalNew/components/DialogMovePos.vue"; -import DialogHistoryPos from "@/modules/02_organizationalNew/components/DialogHistoryPos.vue"; -import DialogSelectPerson from "@/modules/02_organizationalNew/components/DialogSelectPerson.vue"; -import DialogSuccession from "@/modules/02_organizationalNew/components/DialogSuccession.vue"; +import DialogFormPosotion from "@/modules/02_organization/components/DialogFormPosition.vue"; +import DialogPositionDetail from "@/modules/02_organization/components/DialogPositionDetail.vue"; +import DialogSort from "@/modules/02_organization/components/DialogSortPosition.vue"; +import DialogMovePos from "@/modules/02_organization/components/DialogMovePos.vue"; +import DialogHistoryPos from "@/modules/02_organization/components/DialogHistoryPos.vue"; +import DialogSelectPerson from "@/modules/02_organization/components/DialogSelectPerson.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(); diff --git a/src/modules/02_organizationalNew/components/TreeView.vue b/src/modules/02_organization/components/TreeView.vue similarity index 96% rename from src/modules/02_organizationalNew/components/TreeView.vue rename to src/modules/02_organization/components/TreeView.vue index e0ac771d3..8403f3631 100644 --- a/src/modules/02_organizationalNew/components/TreeView.vue +++ b/src/modules/02_organization/components/TreeView.vue @@ -10,15 +10,15 @@ import type { PosMaster, Position, PosMaster2, -} from "@/modules/02_organizationalNew/interface/response/organizational"; -import type { FilterMaster } from "@/modules/02_organizationalNew/interface/request/organizational"; +} from "@/modules/02_organization/interface/response/organizational"; +import type { FilterMaster } from "@/modules/02_organization/interface/request/organizational"; /** importComponents*/ -import TreeMain from "@/modules/02_organizationalNew/components/TreeMain.vue"; -import TreeTable from "@/modules/02_organizationalNew/components/TreeTable.vue"; +import TreeMain from "@/modules/02_organization/components/TreeMain.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*/ diff --git a/src/modules/02_organizationalNew/interface/index/Main.ts b/src/modules/02_organization/interface/index/Main.ts similarity index 100% rename from src/modules/02_organizationalNew/interface/index/Main.ts rename to src/modules/02_organization/interface/index/Main.ts diff --git a/src/modules/02_organizationalNew/interface/index/organizational.ts b/src/modules/02_organization/interface/index/organizational.ts similarity index 100% rename from src/modules/02_organizationalNew/interface/index/organizational.ts rename to src/modules/02_organization/interface/index/organizational.ts diff --git a/src/modules/02_organizationalNew/interface/request/Main.ts b/src/modules/02_organization/interface/request/Main.ts similarity index 100% rename from src/modules/02_organizationalNew/interface/request/Main.ts rename to src/modules/02_organization/interface/request/Main.ts diff --git a/src/modules/02_organizationalNew/interface/request/organizational.ts b/src/modules/02_organization/interface/request/organizational.ts similarity index 100% rename from src/modules/02_organizationalNew/interface/request/organizational.ts rename to src/modules/02_organization/interface/request/organizational.ts diff --git a/src/modules/02_organizationalNew/interface/response/Main.ts b/src/modules/02_organization/interface/response/Main.ts similarity index 100% rename from src/modules/02_organizationalNew/interface/response/Main.ts rename to src/modules/02_organization/interface/response/Main.ts diff --git a/src/modules/02_organizationalNew/interface/response/organizational.ts b/src/modules/02_organization/interface/response/organizational.ts similarity index 100% rename from src/modules/02_organizationalNew/interface/response/organizational.ts rename to src/modules/02_organization/interface/response/organizational.ts diff --git a/src/modules/02_organization/router.ts b/src/modules/02_organization/router.ts new file mode 100644 index 000000000..aeb0b22e4 --- /dev/null +++ b/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", + }, + }, +]; diff --git a/src/modules/02_organizationalNew/store.ts b/src/modules/02_organization/store.ts similarity index 100% rename from src/modules/02_organizationalNew/store.ts rename to src/modules/02_organization/store.ts diff --git a/src/modules/02_organizationalNew/store/organizational.ts b/src/modules/02_organization/store/organizational.ts similarity index 95% rename from src/modules/02_organizationalNew/store/organizational.ts rename to src/modules/02_organization/store/organizational.ts index bef3684f9..aafd96375 100644 --- a/src/modules/02_organizationalNew/store/organizational.ts +++ b/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("current"); @@ -77,8 +77,8 @@ export const useOrganizational = defineStore("organizationalStore", () => { posMasterNo: e.orgShortname + (e.posMasterNoPrefix ? e.posMasterNoPrefix : "") + - (e.posMasterNo?e.posMasterNo:"") + - (e.posMasterNoSuffix?e.posMasterNoSuffix:""), + (e.posMasterNo ? e.posMasterNo : "") + + (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, diff --git a/src/modules/02_organizationalNew/views/ExampleSearchTree.vue b/src/modules/02_organization/views/ExampleSearchTree.vue similarity index 92% rename from src/modules/02_organizationalNew/views/ExampleSearchTree.vue rename to src/modules/02_organization/views/ExampleSearchTree.vue index 49bebd881..e5a3f04a9 100644 --- a/src/modules/02_organizationalNew/views/ExampleSearchTree.vue +++ b/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 { OrgTree } from "@/modules/02_organizationalNew/interface/response/organizational"; +import type { ListMenu } from "@/modules/02_organization/interface/index/Main"; +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(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"; } } diff --git a/src/modules/02_organizationalNew/views/main.vue b/src/modules/02_organization/views/main.vue similarity index 94% rename from src/modules/02_organizationalNew/views/main.vue rename to src/modules/02_organization/views/main.vue index 967ac8447..f580aad73 100644 --- a/src/modules/02_organizationalNew/views/main.vue +++ b/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 { OrgRevision } from "@/modules/02_organizationalNew/interface/response/organizational"; +import type { DataOption } from "@/modules/02_organization/interface/index/Main"; +import type { OrgRevision } from "@/modules/02_organization/interface/response/organizational"; /** * importComponents */ -import TreeView from "@/modules/02_organizationalNew/components/TreeView.vue"; -import StructureView from "@/modules/02_organizationalNew/components/StructureMain.vue"; -import DialogFormNewStructure from "@/modules/02_organizationalNew/components/DialogNewStructure.vue"; -import DialogDateTime from "@/modules/02_organizationalNew/components/DialogFormDateTime.vue"; +import TreeView from "@/modules/02_organization/components/TreeView.vue"; +import StructureView from "@/modules/02_organization/components/StructureMain.vue"; +import DialogFormNewStructure from "@/modules/02_organization/components/DialogNewStructure.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"; /** diff --git a/src/modules/02_organizationalNew/router.ts b/src/modules/02_organizationalNew/router.ts deleted file mode 100644 index 32b16995e..000000000 --- a/src/modules/02_organizationalNew/router.ts +++ /dev/null @@ -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", - }, - }, -]; diff --git a/src/modules/04_registryNew/router.ts b/src/modules/04_registryNew/router.ts deleted file mode 100644 index c2d58c115..000000000 --- a/src/modules/04_registryNew/router.ts +++ /dev/null @@ -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", - }, - }, -]; diff --git a/src/modules/04_registryNew/components/DialogAddData.vue b/src/modules/04_registryPerson/components/DialogAddData.vue similarity index 96% rename from src/modules/04_registryNew/components/DialogAddData.vue rename to src/modules/04_registryPerson/components/DialogAddData.vue index 837224e5a..841476f61 100644 --- a/src/modules/04_registryNew/components/DialogAddData.vue +++ b/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 { DataType } from "@/modules/04_registryNew/interface/response/Main"; +import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main"; +import type { DataType } from "@/modules/04_registryPerson/interface/response/Main"; import type { FormAddPerson, MyObjectRef, -} from "@/modules/04_registryNew/interface/request/Main"; -import { useProfileDataStore } from "@/modules/04_registryNew/stores/profile"; +} from "@/modules/04_registryPerson/interface/request/Main"; +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(); diff --git a/src/modules/04_registryNew/components/DialogHistory.vue b/src/modules/04_registryPerson/components/DialogHistory.vue similarity index 98% rename from src/modules/04_registryNew/components/DialogHistory.vue rename to src/modules/04_registryPerson/components/DialogHistory.vue index 7ad3d49fa..82cdf0d33 100644 --- a/src/modules/04_registryNew/components/DialogHistory.vue +++ b/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" - ? "registry-new" - : "registry-new-employee"; + employeeClass.value === "officer" ? "registry-person" : "registry-employee"; router.push(`${url}/${id}`); } diff --git a/src/modules/04_registryNew/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue similarity index 97% rename from src/modules/04_registryNew/components/TableView.vue rename to src/modules/04_registryPerson/components/TableView.vue index 049207ef2..ee134695c 100644 --- a/src/modules/04_registryNew/components/TableView.vue +++ b/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 DialogHistory from "@/modules/04_registryNew/components/DialogHistory.vue"; +import DialogAddData from "@/modules/04_registryPerson/components/DialogAddData.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( diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue similarity index 99% rename from src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue rename to src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue index 8898dde42..3285537c5 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue +++ b/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 { ResponseObject } from "@/modules/04_registryNew/interface/response/ProfesLicense"; +import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/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 : "-" }} - @@ -1120,7 +1119,7 @@ onMounted(async () => { tittle="ประวัติแก้ไขเครื่องราชอิสริยาภรณ์" :close="() => (modalHistory = false)" /> - +
diff --git a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue similarity index 99% rename from src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue rename to src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue index 4d05de6e1..2027c7417 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue +++ b/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 { ResponseObject } from "@/modules/04_registryNew/interface/response/DeclarationHonor"; +import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/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 : "-" }}
- diff --git a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue similarity index 99% rename from src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue rename to src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue index bf4c5e419..991b93b6a 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue +++ b/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 { ResponseObject } from "@/modules/04_registryNew/interface/response/ResultsPerformance"; +import type { RequestItemsObject } from "@/modules/04_registryPerson/interface/request/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 : "-" }} - diff --git a/src/modules/04_registryNew/components/detail/Achievement/Main.vue b/src/modules/04_registryPerson/components/detail/Achievement/Main.vue similarity index 61% rename from src/modules/04_registryNew/components/detail/Achievement/Main.vue rename to src/modules/04_registryPerson/components/detail/Achievement/Main.vue index 60a6b5d97..728f985d7 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/Main.vue +++ b/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 Train from "@/modules/04_registryNew/components/detail/Achievement/02_Train.vue"; -import Insignia from "@/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue"; -import DeclarationHonor from "@/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue"; -import ResultsPerformance from "@/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue"; +import ProfessionalLicense from "@/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue"; +import Train from "@/modules/04_registryPerson/components/detail/Achievement/02_Train.vue"; +import Insignia from "@/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue"; +import DeclarationHonor from "@/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue"; +import ResultsPerformance from "@/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue"; const tab = ref("1"); @@ -14,20 +14,22 @@ const tab = ref("1");
-
ข้อมูลผลงานและเครื่องราชฯ
+
+ ข้อมูลผลงานและเครื่องราชฯ +
diff --git a/src/modules/04_registryNew/components/detail/Employee/01_DataEmployee.vue b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue similarity index 99% rename from src/modules/04_registryNew/components/detail/Employee/01_DataEmployee.vue rename to src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue index 9d9b4e307..98a7850a0 100644 --- a/src/modules/04_registryNew/components/detail/Employee/01_DataEmployee.vue +++ b/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"; diff --git a/src/modules/04_registryNew/components/detail/Employee/02_Employment.vue b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue similarity index 98% rename from src/modules/04_registryNew/components/detail/Employee/02_Employment.vue rename to src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue index 3b7f04398..21e72995b 100644 --- a/src/modules/04_registryNew/components/detail/Employee/02_Employment.vue +++ b/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"; -import type { FormEmployment } from "@/modules/04_registryNew/interface/request/Employee"; +} from "@/modules/04_registryPerson/interface/response/Employee"; +import type { FormEmployment } from "@/modules/04_registryPerson/interface/request/Employee"; import DialogHeader from "@/components/DialogHeader.vue"; @@ -294,7 +294,6 @@ onMounted(() => { {{ col.label }} - diff --git a/src/modules/04_registryNew/components/detail/Employee/Main.vue b/src/modules/04_registryPerson/components/detail/Employee/Main.vue similarity index 83% rename from src/modules/04_registryNew/components/detail/Employee/Main.vue rename to src/modules/04_registryPerson/components/detail/Employee/Main.vue index ae78c760c..0165fa1a7 100644 --- a/src/modules/04_registryNew/components/detail/Employee/Main.vue +++ b/src/modules/04_registryPerson/components/detail/Employee/Main.vue @@ -1,8 +1,8 @@ diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue similarity index 99% rename from src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue rename to src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue index 0267c85b6..7676e1103 100644 --- a/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue +++ b/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"; diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue similarity index 99% rename from src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue rename to src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue index 06f6b64da..88f8fca3e 100644 --- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue +++ b/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 : "-" }} - diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue similarity index 100% rename from src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue rename to src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue similarity index 98% rename from src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue rename to src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue index 3c4af79f2..635b0d9cd 100644 --- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue +++ b/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 { RequestNoPaidObject } from "@/modules/04_registryNew/interface/request/Salary"; +import type { RowList } from "@/modules/04_registryPerson/interface/index/salary"; +import type { RequestNoPaidObject } from "@/modules/04_registryPerson/interface/request/Salary"; const $q = useQuasar(); const route = useRoute(); diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue similarity index 98% rename from src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue rename to src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue index 19521abaf..a0020e4b3 100644 --- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue +++ b/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"; diff --git a/src/modules/04_registryNew/components/detail/Salary/Main.vue b/src/modules/04_registryPerson/components/detail/Salary/Main.vue similarity index 83% rename from src/modules/04_registryNew/components/detail/Salary/Main.vue rename to src/modules/04_registryPerson/components/detail/Salary/Main.vue index a709e8fb4..41294cc2c 100644 --- a/src/modules/04_registryNew/components/detail/Salary/Main.vue +++ b/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 NotReceiveSalary from "@/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue"; +import PositionSalary from "@/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue"; +import NotReceiveSalary from "@/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue"; const tab = ref("1"); diff --git a/src/modules/04_registryNew/components/detail/TabMain.vue b/src/modules/04_registryPerson/components/detail/TabMain.vue similarity index 82% rename from src/modules/04_registryNew/components/detail/TabMain.vue rename to src/modules/04_registryPerson/components/detail/TabMain.vue index 874b76953..83f75c08a 100644 --- a/src/modules/04_registryNew/components/detail/TabMain.vue +++ b/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 GovernmentInformationMain from "@/modules/04_registryNew/components/detail/GovernmentInformation/Main.vue"; -import salaryMain from "@/modules/04_registryNew/components/detail/Salary/Main.vue"; -import AchievementMain from "@/modules/04_registryNew/components/detail/Achievement/Main.vue"; -import OtherMaim from "@/modules/04_registryNew/components/detail/Other/Main.vue"; -import EmployeeMain from "@/modules/04_registryNew/components/detail/Employee/Main.vue"; +import PersonalInformationMain from "@/modules/04_registryPerson/components/detail/PersonalInformation/Main.vue"; +import GovernmentInformationMain from "@/modules/04_registryPerson/components/detail/GovernmentInformation/Main.vue"; +import salaryMain from "@/modules/04_registryPerson/components/detail/Salary/Main.vue"; +import AchievementMain from "@/modules/04_registryPerson/components/detail/Achievement/Main.vue"; +import OtherMaim from "@/modules/04_registryPerson/components/detail/Other/Main.vue"; +import EmployeeMain from "@/modules/04_registryPerson/components/detail/Employee/Main.vue"; const route = useRoute(); diff --git a/src/modules/04_registryNew/components/requestEdit/DialogStatus.vue b/src/modules/04_registryPerson/components/requestEdit/DialogStatus.vue similarity index 96% rename from src/modules/04_registryNew/components/requestEdit/DialogStatus.vue rename to src/modules/04_registryPerson/components/requestEdit/DialogStatus.vue index 734c9477f..fe8ab72af 100644 --- a/src/modules/04_registryNew/components/requestEdit/DialogStatus.vue +++ b/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"; /** diff --git a/src/modules/04_registryNew/interface/index/Main.ts b/src/modules/04_registryPerson/interface/index/Main.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/Main.ts rename to src/modules/04_registryPerson/interface/index/Main.ts diff --git a/src/modules/04_registryNew/interface/index/discipline.ts b/src/modules/04_registryPerson/interface/index/discipline.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/discipline.ts rename to src/modules/04_registryPerson/interface/index/discipline.ts diff --git a/src/modules/04_registryNew/interface/index/document.ts b/src/modules/04_registryPerson/interface/index/document.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/document.ts rename to src/modules/04_registryPerson/interface/index/document.ts diff --git a/src/modules/04_registryNew/interface/index/family.ts b/src/modules/04_registryPerson/interface/index/family.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/family.ts rename to src/modules/04_registryPerson/interface/index/family.ts diff --git a/src/modules/04_registryNew/interface/index/form.ts b/src/modules/04_registryPerson/interface/index/form.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/form.ts rename to src/modules/04_registryPerson/interface/index/form.ts diff --git a/src/modules/04_registryNew/interface/index/government.ts b/src/modules/04_registryPerson/interface/index/government.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/government.ts rename to src/modules/04_registryPerson/interface/index/government.ts diff --git a/src/modules/04_registryNew/interface/index/leave.ts b/src/modules/04_registryPerson/interface/index/leave.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/leave.ts rename to src/modules/04_registryPerson/interface/index/leave.ts diff --git a/src/modules/04_registryNew/interface/index/other.ts b/src/modules/04_registryPerson/interface/index/other.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/other.ts rename to src/modules/04_registryPerson/interface/index/other.ts diff --git a/src/modules/04_registryNew/interface/index/performSpecialWork.ts b/src/modules/04_registryPerson/interface/index/performSpecialWork.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/performSpecialWork.ts rename to src/modules/04_registryPerson/interface/index/performSpecialWork.ts diff --git a/src/modules/04_registryNew/interface/index/registry.ts b/src/modules/04_registryPerson/interface/index/registry.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/registry.ts rename to src/modules/04_registryPerson/interface/index/registry.ts diff --git a/src/modules/04_registryNew/interface/index/salary.ts b/src/modules/04_registryPerson/interface/index/salary.ts similarity index 100% rename from src/modules/04_registryNew/interface/index/salary.ts rename to src/modules/04_registryPerson/interface/index/salary.ts diff --git a/src/modules/04_registryNew/interface/request/Address.ts b/src/modules/04_registryPerson/interface/request/Address.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/Address.ts rename to src/modules/04_registryPerson/interface/request/Address.ts diff --git a/src/modules/04_registryNew/interface/request/DeclarationHonor.ts b/src/modules/04_registryPerson/interface/request/DeclarationHonor.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/DeclarationHonor.ts rename to src/modules/04_registryPerson/interface/request/DeclarationHonor.ts diff --git a/src/modules/04_registryNew/interface/request/Education.ts b/src/modules/04_registryPerson/interface/request/Education.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/Education.ts rename to src/modules/04_registryPerson/interface/request/Education.ts diff --git a/src/modules/04_registryNew/interface/request/Employee.ts b/src/modules/04_registryPerson/interface/request/Employee.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/Employee.ts rename to src/modules/04_registryPerson/interface/request/Employee.ts diff --git a/src/modules/04_registryNew/interface/request/Information.ts b/src/modules/04_registryPerson/interface/request/Information.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/Information.ts rename to src/modules/04_registryPerson/interface/request/Information.ts diff --git a/src/modules/04_registryNew/interface/request/Insignia.ts b/src/modules/04_registryPerson/interface/request/Insignia.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/Insignia.ts rename to src/modules/04_registryPerson/interface/request/Insignia.ts diff --git a/src/modules/04_registryNew/interface/request/Main.ts b/src/modules/04_registryPerson/interface/request/Main.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/Main.ts rename to src/modules/04_registryPerson/interface/request/Main.ts diff --git a/src/modules/04_registryNew/interface/request/ProfesLicense.ts b/src/modules/04_registryPerson/interface/request/ProfesLicense.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/ProfesLicense.ts rename to src/modules/04_registryPerson/interface/request/ProfesLicense.ts diff --git a/src/modules/04_registryNew/interface/request/Profile.ts b/src/modules/04_registryPerson/interface/request/Profile.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/Profile.ts rename to src/modules/04_registryPerson/interface/request/Profile.ts diff --git a/src/modules/04_registryNew/interface/request/ResultsPerformance.ts b/src/modules/04_registryPerson/interface/request/ResultsPerformance.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/ResultsPerformance.ts rename to src/modules/04_registryPerson/interface/request/ResultsPerformance.ts diff --git a/src/modules/04_registryNew/interface/request/Salary.ts b/src/modules/04_registryPerson/interface/request/Salary.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/Salary.ts rename to src/modules/04_registryPerson/interface/request/Salary.ts diff --git a/src/modules/04_registryNew/interface/request/SpecialSkill.ts b/src/modules/04_registryPerson/interface/request/SpecialSkill.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/SpecialSkill.ts rename to src/modules/04_registryPerson/interface/request/SpecialSkill.ts diff --git a/src/modules/04_registryNew/interface/request/Training.ts b/src/modules/04_registryPerson/interface/request/Training.ts similarity index 100% rename from src/modules/04_registryNew/interface/request/Training.ts rename to src/modules/04_registryPerson/interface/request/Training.ts diff --git a/src/modules/04_registryNew/interface/response/Address.ts b/src/modules/04_registryPerson/interface/response/Address.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/Address.ts rename to src/modules/04_registryPerson/interface/response/Address.ts diff --git a/src/modules/04_registryNew/interface/response/DeclarationHonor.ts b/src/modules/04_registryPerson/interface/response/DeclarationHonor.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/DeclarationHonor.ts rename to src/modules/04_registryPerson/interface/response/DeclarationHonor.ts diff --git a/src/modules/04_registryNew/interface/response/Education.ts b/src/modules/04_registryPerson/interface/response/Education.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/Education.ts rename to src/modules/04_registryPerson/interface/response/Education.ts diff --git a/src/modules/04_registryNew/interface/response/Employee.ts b/src/modules/04_registryPerson/interface/response/Employee.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/Employee.ts rename to src/modules/04_registryPerson/interface/response/Employee.ts diff --git a/src/modules/04_registryNew/interface/response/History.ts b/src/modules/04_registryPerson/interface/response/History.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/History.ts rename to src/modules/04_registryPerson/interface/response/History.ts diff --git a/src/modules/04_registryNew/interface/response/Insignia.ts b/src/modules/04_registryPerson/interface/response/Insignia.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/Insignia.ts rename to src/modules/04_registryPerson/interface/response/Insignia.ts diff --git a/src/modules/04_registryNew/interface/response/Main.ts b/src/modules/04_registryPerson/interface/response/Main.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/Main.ts rename to src/modules/04_registryPerson/interface/response/Main.ts diff --git a/src/modules/04_registryNew/interface/response/ProfesLicense.ts b/src/modules/04_registryPerson/interface/response/ProfesLicense.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/ProfesLicense.ts rename to src/modules/04_registryPerson/interface/response/ProfesLicense.ts diff --git a/src/modules/04_registryNew/interface/response/Profile.ts b/src/modules/04_registryPerson/interface/response/Profile.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/Profile.ts rename to src/modules/04_registryPerson/interface/response/Profile.ts diff --git a/src/modules/04_registryNew/interface/response/ResultsPerformance.ts b/src/modules/04_registryPerson/interface/response/ResultsPerformance.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/ResultsPerformance.ts rename to src/modules/04_registryPerson/interface/response/ResultsPerformance.ts diff --git a/src/modules/04_registryNew/interface/response/SpecialSkill.ts b/src/modules/04_registryPerson/interface/response/SpecialSkill.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/SpecialSkill.ts rename to src/modules/04_registryPerson/interface/response/SpecialSkill.ts diff --git a/src/modules/04_registryNew/interface/response/Training.ts b/src/modules/04_registryPerson/interface/response/Training.ts similarity index 100% rename from src/modules/04_registryNew/interface/response/Training.ts rename to src/modules/04_registryPerson/interface/response/Training.ts diff --git a/src/modules/04_registryPerson/router.ts b/src/modules/04_registryPerson/router.ts new file mode 100644 index 000000000..59fb03cd8 --- /dev/null +++ b/src/modules/04_registryPerson/router.ts @@ -0,0 +1,49 @@ +const listPage = () => import("@/modules/04_registryPerson/views/list.vue"); +const detailPage = () => + import("@/modules/04_registryPerson/views/detailView.vue"); + +const requestEdit = () => + import("@/modules/04_registryPerson/views/requestEdit.vue"); + +export default [ + { + path: "/registry-person", + name: "registryNew", + component: listPage, + meta: { + Auth: true, + Key: "SYS_REGISTRY", + Role: "STAFF", + }, + }, + { + path: "/registry-person/:id", + name: "registryNewByid", + component: detailPage, + meta: { + Auth: true, + Key: "SYS_REGISTRY", + Role: "STAFF", + }, + }, + { + path: "/registry-employee/:id", + name: "registryNewEmployeeByid", + component: detailPage, + meta: { + Auth: true, + Key: "SYS_REGISTRY_EMP", + Role: "STAFF", + }, + }, + { + path: "/registry-person/request-edit", + name: "registryNewRequestEdit", + component: requestEdit, + meta: { + Auth: true, + Key: "SYS_REGISTRY", + Role: "STAFF", + }, + }, +]; diff --git a/src/modules/04_registryNew/store.ts b/src/modules/04_registryPerson/store.ts similarity index 92% rename from src/modules/04_registryNew/store.ts rename to src/modules/04_registryPerson/store.ts index 8acdab20f..602875b43 100644 --- a/src/modules/04_registryNew/store.ts +++ b/src/modules/04_registryPerson/store.ts @@ -1,11 +1,11 @@ import { defineStore } from "pinia"; import { ref } from "vue"; -import type { DataOption } from "@/modules/04_registryNew/interface/index/Main"; +import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main"; import type { DataType, DataLevel, -} from "@/modules/04_registryNew/interface/response/Main"; +} from "@/modules/04_registryPerson/interface/response/Main"; export const useRegistryNewDataStore = defineStore("registryNew", () => { const searchTypeOption = ref([ diff --git a/src/modules/04_registryNew/stores/Address.ts b/src/modules/04_registryPerson/stores/Address.ts similarity index 95% rename from src/modules/04_registryNew/stores/Address.ts rename to src/modules/04_registryPerson/stores/Address.ts index 6c8a834bb..dba7263ba 100644 --- a/src/modules/04_registryNew/stores/Address.ts +++ b/src/modules/04_registryPerson/stores/Address.ts @@ -5,13 +5,13 @@ import { useQuasar } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; -import type { RequestObject } from "@/modules/04_registryNew/interface/request/Address"; -import type { ResponseObject } from "@/modules/04_registryNew/interface/response/Address"; +import type { RequestObject } from "@/modules/04_registryPerson/interface/request/Address"; +import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/Address"; import type { DataOption, AddressOps, zipCodeOption, -} from "@/modules/04_registryNew/interface/index/Main"; +} from "@/modules/04_registryPerson/interface/index/Main"; export const useAddressDataStore = defineStore("addess", () => { const $q = useQuasar(); diff --git a/src/modules/04_registryNew/stores/DetailMain.ts b/src/modules/04_registryPerson/stores/DetailMain.ts similarity index 100% rename from src/modules/04_registryNew/stores/DetailMain.ts rename to src/modules/04_registryPerson/stores/DetailMain.ts diff --git a/src/modules/04_registryNew/stores/RequestEdit.ts b/src/modules/04_registryPerson/stores/RequestEdit.ts similarity index 95% rename from src/modules/04_registryNew/stores/RequestEdit.ts rename to src/modules/04_registryPerson/stores/RequestEdit.ts index be6996118..118b17db3 100644 --- a/src/modules/04_registryNew/stores/RequestEdit.ts +++ b/src/modules/04_registryPerson/stores/RequestEdit.ts @@ -1,6 +1,6 @@ import { defineStore } from "pinia"; import { ref } from "vue"; -import type { DataOption } from "@/modules/04_registryNew/interface/index/Main"; +import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main"; export const useRequestEditStore = defineStore("requestEditStore", () => { const optionTopic = ref([ diff --git a/src/modules/04_registryNew/stores/ResultsPerformance.ts b/src/modules/04_registryPerson/stores/ResultsPerformance.ts similarity index 100% rename from src/modules/04_registryNew/stores/ResultsPerformance.ts rename to src/modules/04_registryPerson/stores/ResultsPerformance.ts diff --git a/src/modules/04_registryNew/stores/insignia.ts b/src/modules/04_registryPerson/stores/insignia.ts similarity index 87% rename from src/modules/04_registryNew/stores/insignia.ts rename to src/modules/04_registryPerson/stores/insignia.ts index 341599bc0..df8375f17 100644 --- a/src/modules/04_registryNew/stores/insignia.ts +++ b/src/modules/04_registryPerson/stores/insignia.ts @@ -1,6 +1,6 @@ import { ref, computed } from "vue"; import { defineStore } from "pinia"; -import type { DataOptionInsignia } from "@/modules/04_registryNew/interface/index/Main"; +import type { DataOptionInsignia } from "@/modules/04_registryPerson/interface/index/Main"; import type { ResponseObject as Insignia } from "@/modules/07_insignia/interface/response/Main"; export const useInsigniaDataStore = defineStore("insigniaDataStore", () => { diff --git a/src/modules/04_registryNew/stores/profile.ts b/src/modules/04_registryPerson/stores/profile.ts similarity index 97% rename from src/modules/04_registryNew/stores/profile.ts rename to src/modules/04_registryPerson/stores/profile.ts index 331da684b..1de06731e 100644 --- a/src/modules/04_registryNew/stores/profile.ts +++ b/src/modules/04_registryPerson/stores/profile.ts @@ -5,11 +5,11 @@ import { useQuasar } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; -import type { RequestObject } from "@/modules/04_registryNew/interface/request/Profile"; +import type { RequestObject } from "@/modules/04_registryPerson/interface/request/Profile"; import type { DataOption, InformationOps, -} from "@/modules/04_registryNew/interface/index/Main"; +} from "@/modules/04_registryPerson/interface/index/Main"; export const useProfileDataStore = defineStore("profile", () => { const $q = useQuasar(); @@ -98,7 +98,7 @@ export const useProfileDataStore = defineStore("profile", () => { const days = ageDate.getUTCDate() - 1; const retire = new Date(birthDate); retire.setFullYear(retire.getFullYear() + 60); - retireDate.value = retire + retireDate.value = retire; if (years > 60) { return "อายุเกิน 60 ปี"; diff --git a/src/modules/04_registryNew/stores/registry.ts b/src/modules/04_registryPerson/stores/registry.ts similarity index 100% rename from src/modules/04_registryNew/stores/registry.ts rename to src/modules/04_registryPerson/stores/registry.ts diff --git a/src/modules/04_registryNew/stores/salary.ts b/src/modules/04_registryPerson/stores/salary.ts similarity index 99% rename from src/modules/04_registryNew/stores/salary.ts rename to src/modules/04_registryPerson/stores/salary.ts index 2220e6692..b449d15c7 100644 --- a/src/modules/04_registryNew/stores/salary.ts +++ b/src/modules/04_registryPerson/stores/salary.ts @@ -1,7 +1,7 @@ import { defineStore } from "pinia"; import { ref } from "vue"; -import type { DataOption2 } from "@/modules/04_registryNew/interface/index/Main"; +import type { DataOption2 } from "@/modules/04_registryPerson/interface/index/Main"; export const useSalaryDataStore = defineStore("salatyDataStore", () => { const optionTemplatePos = ref([ diff --git a/src/modules/04_registryNew/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue similarity index 99% rename from src/modules/04_registryNew/views/detailView.vue rename to src/modules/04_registryPerson/views/detailView.vue index 652113a19..15e467a26 100644 --- a/src/modules/04_registryNew/views/detailView.vue +++ b/src/modules/04_registryPerson/views/detailView.vue @@ -6,12 +6,12 @@ import { useCounterMixin } from "@/stores/mixin"; import http from "@/plugins/http"; import config from "@/app.config"; import { useQuasar } from "quasar"; -import type { DataOption } from "@/modules/04_registryNew/interface/index/Main"; +import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main"; import avatar from "@/assets/avatar_user.jpg"; -import TabMain from "@/modules/04_registryNew/components/detail/TabMain.vue"; +import TabMain from "@/modules/04_registryPerson/components/detail/TabMain.vue"; -import type { ResponseObject } from "@/modules/04_registryNew/interface/response/Profile"; +import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/Profile"; import DialogHeader from "@/components/DialogHeader.vue"; /** ถึงเเก่กรรม */ const dialogPassaway = ref(false); diff --git a/src/modules/04_registryNew/views/list.vue b/src/modules/04_registryPerson/views/list.vue similarity index 97% rename from src/modules/04_registryNew/views/list.vue rename to src/modules/04_registryPerson/views/list.vue index 8c307c663..d9e1ac890 100644 --- a/src/modules/04_registryNew/views/list.vue +++ b/src/modules/04_registryPerson/views/list.vue @@ -5,19 +5,19 @@ import http from "@/plugins/http"; import config from "@/app.config"; /** importType*/ -import type { DataOption } from "@/modules/04_registryNew/interface/index/Main"; +import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main"; import type { DataPerson, DataType, -} from "@/modules/04_registryNew/interface/response/Main"; -import type { FormFilter } from "@/modules/04_registryNew/interface/request/Main"; +} from "@/modules/04_registryPerson/interface/response/Main"; +import type { FormFilter } from "@/modules/04_registryPerson/interface/request/Main"; /** importComponents*/ -import TableView from "@/modules/04_registryNew/components/TableView.vue"; +import TableView from "@/modules/04_registryPerson/components/TableView.vue"; import avatar from "@/assets/avatar_user.jpg"; /** importStore*/ -import { useRegistryNewDataStore } from "@/modules/04_registryNew/store"; +import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store"; import { useCounterMixin } from "@/stores/mixin"; const $q = useQuasar(); diff --git a/src/modules/04_registryNew/views/requestEdit.vue b/src/modules/04_registryPerson/views/requestEdit.vue similarity index 97% rename from src/modules/04_registryNew/views/requestEdit.vue rename to src/modules/04_registryPerson/views/requestEdit.vue index 29e15c326..6406f2b90 100644 --- a/src/modules/04_registryNew/views/requestEdit.vue +++ b/src/modules/04_registryPerson/views/requestEdit.vue @@ -12,17 +12,17 @@ import type { QTableProps } from "quasar"; import type { DataOption, Pagination, -} from "@/modules/04_registryNew/interface/index/Main"; +} from "@/modules/04_registryPerson/interface/index/Main"; /** * importComponents */ -import DialogStatus from "@/modules/04_registryNew/components/requestEdit/DialogStatus.vue"; +import DialogStatus from "@/modules/04_registryPerson/components/requestEdit/DialogStatus.vue"; /** * importStore */ -import { useRequestEditStore } from "@/modules/04_registryNew/stores/RequestEdit"; +import { useRequestEditStore } from "@/modules/04_registryPerson/stores/RequestEdit"; import { useCounterMixin } from "@/stores/mixin"; /** diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue index 3a954ceff..0765a8087 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab1.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue @@ -697,7 +697,7 @@ async function fecthInsignia() { * @param id profileId */ function nextPage(id: string) { - router.push(`/registry-new/${id}`); + router.push(`/registry-person/${id}`); } /** ค้นหาข้อมุล table*/ diff --git a/src/modules/07_insignia/components/2_Manage/Tab2.vue b/src/modules/07_insignia/components/2_Manage/Tab2.vue index 86e72cc38..ae74eb772 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab2.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab2.vue @@ -172,7 +172,7 @@ function changtypeOc() { * @param id profileId */ function nextPage(id: string) { - router.push(`/registry-new/${id}`); + router.push(`/registry-person/${id}`); } /** filter table*/ diff --git a/src/modules/07_insignia/components/2_Manage/Tab3.vue b/src/modules/07_insignia/components/2_Manage/Tab3.vue index d43629baf..56614688f 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab3.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab3.vue @@ -172,7 +172,7 @@ async function changtypeOc() { * @param id profileId */ function nextPage(id: string) { - router.push(`/registry-new/${id}`); + router.push(`/registry-person/${id}`); } /** ข้อมูล Table*/ diff --git a/src/modules/08_registryEmployee/views/DetailView.vue b/src/modules/08_registryEmployee/views/DetailView.vue index f677ffc94..4e9e7a1a6 100644 --- a/src/modules/08_registryEmployee/views/DetailView.vue +++ b/src/modules/08_registryEmployee/views/DetailView.vue @@ -1,5 +1,5 @@