From bd33093d3efa8412284ce589b1865a255552efad Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Thu, 19 Sep 2024 16:43:10 +0700 Subject: [PATCH] no message --- src/components/Dialogs/AddPersonal.vue | 2 +- .../components/1_Complaint/EditPage.vue | 4 +- .../components/1_Complaint/Form.vue | 4 +- .../2_InvestigateFacts/EditPage.vue | 8 +- .../components/2_InvestigateFacts/Form.vue | 4 +- .../3_InvestigateDisciplinary/EditPage.vue | 8 +- .../3_InvestigateDisciplinary/Form.vue | 4 +- .../4_Result/DialogSendToCommand.vue | 2 +- .../components/4_Result/EditPage.vue | 8 +- .../components/4_Result/Form.vue | 4 +- .../6_BasicInformation/Channel/MainPage.vue | 2 +- .../6_BasicInformation/Director/AddPage.vue | 2 +- .../Director/DialogEdit.vue | 2 +- .../Director/DialogInvestigateTotal.vue | 2 +- .../6_BasicInformation/Director/EditPage.vue | 2 +- .../6_BasicInformation/Director/Form.vue | 2 +- .../6_BasicInformation/Director/MainPage.vue | 2 +- .../components/7_ListSuspend/DetailPage.vue | 2 +- .../components/7_ListSuspend/ListsPage.vue | 2 +- .../components/8_AppealComplain/EditPage.vue | 2 +- .../components/8_AppealComplain/Form.vue | 4 +- .../components/8_AppealComplain/MainPage.vue | 2 +- .../dialog/DialogEditStatus.vue | 2 +- .../interface/request/investigate.ts | 73 ------------------- .../11_discipline/interface/request/order.ts | 27 ------- .../store/AppealComplainStore.ts | 2 +- .../11_discipline/store/ChannelStore.ts | 2 +- .../11_discipline/store/ComplaintsStore.ts | 4 +- .../11_discipline/store/DirectorStore.ts | 2 +- .../store/InvestigateDisStore.ts | 2 +- .../store/InvestigateFactStore.ts | 4 +- src/modules/11_discipline/store/OrderStore.ts | 2 +- .../11_discipline/store/ResultStore.ts | 4 +- .../11_discipline/store/SuspendStore.ts | 2 +- src/modules/11_discipline/store/main.ts | 2 +- .../Detail/viewTab2/CardDirector.vue | 2 +- .../components/Director/DialogDetail.vue | 2 +- .../components/Director/EditPage.vue | 2 +- .../components/Director/Form.vue | 2 +- 39 files changed, 55 insertions(+), 155 deletions(-) delete mode 100644 src/modules/11_discipline/interface/request/investigate.ts delete mode 100644 src/modules/11_discipline/interface/request/order.ts diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue index d5581e8c7..a9768872e 100644 --- a/src/components/Dialogs/AddPersonal.vue +++ b/src/components/Dialogs/AddPersonal.vue @@ -6,7 +6,7 @@ import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import type { ResponsePreson } from "@/interface/response/listPerson"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; const mainStore = useDisciplineMainStore(); diff --git a/src/modules/11_discipline/components/1_Complaint/EditPage.vue b/src/modules/11_discipline/components/1_Complaint/EditPage.vue index 82774de8f..4f67ceb6d 100644 --- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue +++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue @@ -6,14 +6,14 @@ import { useQuasar } from "quasar"; import config from "@/app.config"; import http from "@/plugins/http"; import { useCounterMixin } from "@/stores/mixin"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import type { QTableProps } from "quasar"; import type { FormData, ArrayPerson, ArrayFileList, -} from "@/modules/11_discipline/interface/request/complaint"; +} from "@/modules/11_discipline/interface/request/Complaint"; import Form from "@/modules/11_discipline/components/1_Complaint/Form.vue"; import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue"; diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue index 6d1daf61b..79aecd900 100644 --- a/src/modules/11_discipline/components/1_Complaint/Form.vue +++ b/src/modules/11_discipline/components/1_Complaint/Form.vue @@ -7,14 +7,14 @@ import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import type { OptionData } from "@/modules/07_insignia/interface/index/Main"; import type { DataOption } from "@/modules/11_discipline/interface/index/Main"; import type { FormData, ArrayFileList, -} from "@/modules/11_discipline/interface/request/complaint"; +} from "@/modules/11_discipline/interface/request/Complaint"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue"; diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue index 81cb2c182..31ece10f8 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue @@ -7,15 +7,15 @@ import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; -import type { ArrayPersonAdd } from "../../interface/response/investigate"; -import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact"; +import type { ArrayPersonAdd } from "../../interface/response/Investigate"; +import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact"; import type { FormData as FormDataComplaint, ArrayPerson, ArrayFileList, -} from "@/modules/11_discipline/interface/request/complaint"; +} from "@/modules/11_discipline/interface/request/Complaint"; import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue"; import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue index e63c9e283..edba86a1f 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue @@ -9,9 +9,9 @@ import http from "@/plugins/http"; import { useCounterMixin } from "@/stores/mixin"; import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore"; import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; -import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact"; +import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact"; import type { OptionData } from "@/modules/07_insignia/interface/index/Main"; import CalandarDialog from "@/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue"; diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue index 1a30a584a..f8b1e7121 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue @@ -7,18 +7,18 @@ import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import type { PersonsArray, Persons, -} from "@/modules/11_discipline/interface/request/disciplinary"; +} from "@/modules/11_discipline/interface/request/Disciplinary"; import type { FormData as FormDataComplaint, ArrayPerson, ArrayFileList, -} from "@/modules/11_discipline/interface/request/complaint"; -import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact"; +} from "@/modules/11_discipline/interface/request/Complaint"; +import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/InvestigateFact"; import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue"; import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue index 3ca445feb..23c45e510 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue @@ -9,13 +9,13 @@ import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore"; import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import type { FormData, Director, PersonsArray, -} from "@/modules/11_discipline/interface/request/disciplinary"; +} from "@/modules/11_discipline/interface/request/Disciplinary"; import type { DataOption, FileLists, diff --git a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue index b11bbb095..87cdc69b9 100644 --- a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue +++ b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue @@ -9,7 +9,7 @@ import { useRoute } from "vue-router"; import type { ResponseData } from "@/modules/05_placement/interface/response/Transfer"; import type { OpType } from "@/modules/05_placement/interface/response/Main"; -import type { DataListRow } from "@/modules/11_discipline/interface/request/result"; +import type { DataListRow } from "@/modules/11_discipline/interface/request/Result"; import DialogHeader from "@/components/DialogHeader.vue"; diff --git a/src/modules/11_discipline/components/4_Result/EditPage.vue b/src/modules/11_discipline/components/4_Result/EditPage.vue index 89f2ac37e..a2db4cec3 100644 --- a/src/modules/11_discipline/components/4_Result/EditPage.vue +++ b/src/modules/11_discipline/components/4_Result/EditPage.vue @@ -7,15 +7,15 @@ import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; -import type { DataListRow } from "@/modules/11_discipline/interface/request/result"; +import type { DataListRow } from "@/modules/11_discipline/interface/request/Result"; import type { FormData as FormDataComplaint, ArrayPerson, ArrayFileList, -} from "@/modules/11_discipline/interface/request/complaint"; -import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact"; +} from "@/modules/11_discipline/interface/request/Complaint"; +import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/InvestigateFact"; import DialogSendToCommand from "@/modules/11_discipline/components/4_Result/DialogSendToCommand.vue"; import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue index e32968915..d59fef4d7 100644 --- a/src/modules/11_discipline/components/4_Result/Form.vue +++ b/src/modules/11_discipline/components/4_Result/Form.vue @@ -7,13 +7,13 @@ import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import type { FormData, FormRef, DataOption, -} from "@/modules/11_discipline/interface/request/result"; +} from "@/modules/11_discipline/interface/request/Result"; import DialogHistory from "@/modules/11_discipline/components/4_Result/DialogHistory.vue"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; diff --git a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue index 250500522..4b7afa786 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue @@ -9,7 +9,7 @@ import { useCounterMixin } from "@/stores/mixin"; import { useDisciplineChannelDataStore } from "@/modules/11_discipline/store/ChannelStore"; -import type { typeItem } from "@/modules/11_discipline/interface/response/channel"; +import type { typeItem } from "@/modules/11_discipline/interface/response/Channel"; import { checkPermission } from "@/utils/permissions"; import Header from "@/components/DialogHeader.vue"; diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/AddPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/AddPage.vue index 5229dcf99..1c42f36f0 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/AddPage.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/AddPage.vue @@ -7,7 +7,7 @@ import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; -import type { FormDataPost } from "@/modules/11_discipline/interface/request/director"; +import type { FormDataPost } from "@/modules/11_discipline/interface/request/Director"; const $q = useQuasar(); const mixin = useCounterMixin(); diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/DialogEdit.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/DialogEdit.vue index ee969c02a..032557b30 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/DialogEdit.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/DialogEdit.vue @@ -6,7 +6,7 @@ import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; -import type { FormData } from "@/modules/11_discipline/interface/request/director"; +import type { FormData } from "@/modules/11_discipline/interface/request/Director"; import Header from "@/components/DialogHeader.vue"; diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue index 9e378b373..e23c24aaa 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue @@ -6,7 +6,7 @@ import config from "@/app.config"; import http from "@/plugins/http"; import { useCounterMixin } from "@/stores/mixin"; -import type { DirectorRowsResponse } from "@/modules/11_discipline/interface/response/director"; +import type { DirectorRowsResponse } from "@/modules/11_discipline/interface/response/Director"; import DialogHeader from "@/components/DialogHeader.vue"; diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue index c7c619fb9..be89b9fa5 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/EditPage.vue @@ -8,7 +8,7 @@ import config from "@/app.config"; import router from "@/router"; import { useCounterMixin } from "@/stores/mixin"; -import type { FormData } from "@/modules/11_discipline/interface/request/director"; +import type { FormData } from "@/modules/11_discipline/interface/request/Director"; import Form from "@/modules/11_discipline/components/6_BasicInformation/Director/Form.vue"; diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue index ced0eb709..4a9577f85 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue @@ -13,7 +13,7 @@ import type { typeOp, ResponsePreson, tableType, -} from "@/modules/11_discipline/interface/request/director"; +} from "@/modules/11_discipline/interface/request/Director"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue index a43e7ef35..7159ebb5d 100644 --- a/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue +++ b/src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue @@ -8,7 +8,7 @@ import { checkPermission } from "@/utils/permissions"; import { useCounterMixin } from "@/stores/mixin"; import { useDisciplineDirectorDataStore } from "@/modules/11_discipline/store/DirectorStore"; -import type { DirectorRowsResponse } from "@/modules/11_discipline/interface/response/director"; +import type { DirectorRowsResponse } from "@/modules/11_discipline/interface/response/Director"; import DialogTotal from "@/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue"; import DialogEdit from "@/modules/11_discipline/components/6_BasicInformation/Director/DialogEdit.vue"; diff --git a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue index fb3e250da..e25931110 100644 --- a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue +++ b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue @@ -11,7 +11,7 @@ import { useDisciplineSuspendStore } from "@/modules/11_discipline/store/Suspend /**Import type */ import type { QForm } from "quasar"; -import type { dataDetail } from "@/modules/11_discipline/interface/response/suspend"; +import type { dataDetail } from "@/modules/11_discipline/interface/response/Suspend"; import type { DataProfile } from "@/modules/05_placement/interface/index/Main"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; diff --git a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue index ec3fd86b9..2362535cb 100644 --- a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue +++ b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue @@ -8,7 +8,7 @@ import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useDisciplineSuspendStore } from "@/modules/11_discipline/store/SuspendStore"; -import type { dataType } from "@/modules/11_discipline/interface/response/suspend"; +import type { dataType } from "@/modules/11_discipline/interface/response/Suspend"; import type { QTableProps } from "quasar"; import DialogSendToCommand from "@/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue"; diff --git a/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue b/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue index 416baf521..e6f8903a6 100644 --- a/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue +++ b/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue @@ -11,7 +11,7 @@ import type { EditDataList, HistoryStatusType, FileObType, -} from "@/modules/11_discipline/interface/response/appealComplain"; +} from "@/modules/11_discipline/interface/response/AppealComplain"; import Form from "@/modules/11_discipline/components/8_AppealComplain/Form.vue"; diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue index 499d2cb32..c0e349769 100644 --- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue +++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue @@ -8,12 +8,12 @@ import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; import { useAppealComplainStore } from "@/modules/11_discipline/store/AppealComplainStore"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import type { MyObjectAppealRef, HistoryStatusType, -} from "@/modules/11_discipline/interface/response/appealComplain"; +} from "@/modules/11_discipline/interface/response/AppealComplain"; import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue"; import DialogHistory from "@/modules/11_discipline/components/8_AppealComplain/dialog/DialogEditStatus.vue"; diff --git a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue index e40833407..4263eabba 100644 --- a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue +++ b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue @@ -10,7 +10,7 @@ import { useAppealComplainStore } from "@/modules/11_discipline/store/AppealComp import { checkPermission } from "@/utils/permissions"; import type { QTableProps } from "quasar"; -import type { RowList } from "@/modules/11_discipline/interface/response/appealComplain"; +import type { RowList } from "@/modules/11_discipline/interface/response/AppealComplain"; import type { DataOption } from "@/modules/11_discipline/interface/index/Main"; import DialogStatus from "@/modules/11_discipline/components/8_AppealComplain/dialog/DialogEditStatus.vue"; diff --git a/src/modules/11_discipline/components/8_AppealComplain/dialog/DialogEditStatus.vue b/src/modules/11_discipline/components/8_AppealComplain/dialog/DialogEditStatus.vue index 6d7e8eb37..ae2af4f9e 100644 --- a/src/modules/11_discipline/components/8_AppealComplain/dialog/DialogEditStatus.vue +++ b/src/modules/11_discipline/components/8_AppealComplain/dialog/DialogEditStatus.vue @@ -3,7 +3,7 @@ import { ref, watch, reactive } from "vue"; import { useAppealComplainStore } from "@/modules/11_discipline/store/AppealComplainStore"; -import type { HistoryStatusType } from "@/modules/11_discipline/interface/response/appealComplain"; +import type { HistoryStatusType } from "@/modules/11_discipline/interface/response/AppealComplain"; import type { QTableProps } from "quasar"; import { useCounterMixin } from "@/stores/mixin"; diff --git a/src/modules/11_discipline/interface/request/investigate.ts b/src/modules/11_discipline/interface/request/investigate.ts deleted file mode 100644 index dbfad8686..000000000 --- a/src/modules/11_discipline/interface/request/investigate.ts +++ /dev/null @@ -1,73 +0,0 @@ -interface FormData { - complaint: string; - complaintdetail: string; - detail: string; - fault: string; - other: string; - evidenceFiles: File | null; - fileComplaint: File | null; - extendStatus: boolean; - date: Date | null; - dateEnd: Date; - daysExtend: number | null; - investigation: string; - statusResult: string; - causeText: string; - complaintStatus: string; - reason: string; -} -interface MyObjectInvestigateRef { - complaint: object | null; - complaintdetail: object | null; - detail: object | null; - fault: object | null; - evidenceFiles: object | null; - fileComplaint: object | null; - date: object | null; - dateEnd: object | null; - investigation: object | null; - daysExtend: object | null; - statusResult: object | null; - causeText: object | null; - reason: object | null; - [key: string]: any; -} - -interface FormDataList { - id: string; - idComplaint: string; - investigationDetail: string; - complaint: string; - complaintdetail: string; - investigationDescription: string; - fault: string; - investigationDetailOther: string; - evidenceFiles: any | null; - fileComplaint: File | null; - investigationExtendStatus: boolean | null; - investigationDateStart: Date | null; - investigationDateEnd: Date | null; - investigationDaysExtend: number | null; - investigationStatusResult: string; - investigationCauseText: string; - complaintStatus: string; - result: string; - directors: object | null; - status: string; - disciplineInvestigateDocs: any; - disciplineInvestigateRelevantDocs: any; - documentFile: any | null; - respondentType: string; - organizationId: string; - persons: object | null; - disciplinaryExtendHistory: ExtendHistoryObject[]; -} - -interface ExtendHistoryObject { - name: string; - num: number; - daysExtend: number | null; - dateStart: Date; - dateEnd: Date; -} -export type { FormData, MyObjectInvestigateRef, FormDataList }; diff --git a/src/modules/11_discipline/interface/request/order.ts b/src/modules/11_discipline/interface/request/order.ts deleted file mode 100644 index 338a287c3..000000000 --- a/src/modules/11_discipline/interface/request/order.ts +++ /dev/null @@ -1,27 +0,0 @@ -interface FormData { - orderType: string; - orderBy: string; - listInvestigation: string; - authority: string; - orderNumber: string; - dateYear: number; - date: Date | null; - authorityPosition: string; - subject: string; - mistakeDetail: string; -} -interface MyObjectRef { - orderType: object | null; - orderBy: object | null; - listInvestigation: object | null; - authority: object | null; - orderNumber: object | null; - dateYear: object | null; - date: object | null; - authorityPosition: object | null; - subject: object | null; - mistakeDetail: object | null; - [key: string]: any; -} - -export type { FormData, MyObjectRef }; diff --git a/src/modules/11_discipline/store/AppealComplainStore.ts b/src/modules/11_discipline/store/AppealComplainStore.ts index 7d15a0edc..dd52135d3 100644 --- a/src/modules/11_discipline/store/AppealComplainStore.ts +++ b/src/modules/11_discipline/store/AppealComplainStore.ts @@ -7,7 +7,7 @@ import type { MainList, RowList, RowAddList, -} from "@/modules/11_discipline/interface/response/appealComplain"; +} from "@/modules/11_discipline/interface/response/AppealComplain"; export const useAppealComplainStore = defineStore("AppealComplainStore", () => { const rows = ref([]); diff --git a/src/modules/11_discipline/store/ChannelStore.ts b/src/modules/11_discipline/store/ChannelStore.ts index 2b65ed80f..abcd260d7 100644 --- a/src/modules/11_discipline/store/ChannelStore.ts +++ b/src/modules/11_discipline/store/ChannelStore.ts @@ -1,6 +1,6 @@ import { defineStore } from "pinia"; import { ref } from "vue"; -import type { ChannelRows } from "@/modules/11_discipline/interface/response/channel"; +import type { ChannelRows } from "@/modules/11_discipline/interface/response/Channel"; import type { QTableProps } from "quasar"; // store ระบบวินัย >> ข้อมูลพื้นฐาน >> กรรมการ diff --git a/src/modules/11_discipline/store/ComplaintsStore.ts b/src/modules/11_discipline/store/ComplaintsStore.ts index 4b198cfe2..861c7c8e7 100644 --- a/src/modules/11_discipline/store/ComplaintsStore.ts +++ b/src/modules/11_discipline/store/ComplaintsStore.ts @@ -2,14 +2,14 @@ import { defineStore } from "pinia"; import { ref } from "vue"; import { useCounterMixin } from "@/stores/mixin"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import type { DataOption } from "@/modules/11_discipline/interface/index/Main"; import type { DataList, DataListRow, ocListType, -} from "@/modules/11_discipline/interface/response/complaint"; +} from "@/modules/11_discipline/interface/response/Complaint"; import type { QTableProps } from "quasar"; diff --git a/src/modules/11_discipline/store/DirectorStore.ts b/src/modules/11_discipline/store/DirectorStore.ts index 446b251cf..82216e656 100644 --- a/src/modules/11_discipline/store/DirectorStore.ts +++ b/src/modules/11_discipline/store/DirectorStore.ts @@ -3,7 +3,7 @@ import { ref } from "vue"; import type { DirectorRows, DirectorRowsResponse, -} from "@/modules/11_discipline/interface/response/director"; +} from "@/modules/11_discipline/interface/response/Director"; import type { QTableProps } from "quasar"; // store ระบบวินัย >> ข้อมูลพื้นฐาน >> กรรมการ diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts index 5e7e54767..b1edc616c 100644 --- a/src/modules/11_discipline/store/InvestigateDisStore.ts +++ b/src/modules/11_discipline/store/InvestigateDisStore.ts @@ -4,7 +4,7 @@ import type { QTableProps } from "quasar"; import { useCounterMixin } from "@/stores/mixin"; -import type { Persons } from "@/modules/11_discipline/interface/request/disciplinary"; +import type { Persons } from "@/modules/11_discipline/interface/request/Disciplinary"; import type { investigateDisDataRowType, DataOption, diff --git a/src/modules/11_discipline/store/InvestigateFactStore.ts b/src/modules/11_discipline/store/InvestigateFactStore.ts index 067ece539..32df5648f 100644 --- a/src/modules/11_discipline/store/InvestigateFactStore.ts +++ b/src/modules/11_discipline/store/InvestigateFactStore.ts @@ -11,8 +11,8 @@ import type { import type { ListData, ocListType, -} from "@/modules/11_discipline/interface/response/investigate"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +} from "@/modules/11_discipline/interface/response/Investigate"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; const mainStore = useDisciplineMainStore(); const mixin = useCounterMixin(); diff --git a/src/modules/11_discipline/store/OrderStore.ts b/src/modules/11_discipline/store/OrderStore.ts index 88d47572f..4dfe0f00c 100644 --- a/src/modules/11_discipline/store/OrderStore.ts +++ b/src/modules/11_discipline/store/OrderStore.ts @@ -7,7 +7,7 @@ import type { QTableProps } from "quasar"; import type { DataList, DataListRes, -} from "@/modules/11_discipline/interface/response/order"; +} from "@/modules/11_discipline/interface/response/Order"; const mixin = useCounterMixin(); const { date2Thai } = mixin; diff --git a/src/modules/11_discipline/store/ResultStore.ts b/src/modules/11_discipline/store/ResultStore.ts index 334346995..cb8e0bc18 100644 --- a/src/modules/11_discipline/store/ResultStore.ts +++ b/src/modules/11_discipline/store/ResultStore.ts @@ -3,7 +3,7 @@ import { ref } from "vue"; import type { QTableProps } from "quasar"; import { useCounterMixin } from "@/stores/mixin"; -import { useDisciplineMainStore } from "@/modules/11_discipline/store/main"; +import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; import type { DataOption, @@ -12,7 +12,7 @@ import type { import type { DataResult, DataResultList, -} from "@/modules/11_discipline/interface/response/result"; +} from "@/modules/11_discipline/interface/response/Result"; const mixin = useCounterMixin(); const storeMain = useDisciplineMainStore(); diff --git a/src/modules/11_discipline/store/SuspendStore.ts b/src/modules/11_discipline/store/SuspendStore.ts index 87ab0c475..3ddba8acc 100644 --- a/src/modules/11_discipline/store/SuspendStore.ts +++ b/src/modules/11_discipline/store/SuspendStore.ts @@ -7,7 +7,7 @@ import type { listData, dataType, DataOption, -} from "@/modules/11_discipline/interface/response/suspend"; +} from "@/modules/11_discipline/interface/response/Suspend"; import type { QTableProps } from "quasar"; export const useDisciplineSuspendStore = defineStore( diff --git a/src/modules/11_discipline/store/main.ts b/src/modules/11_discipline/store/main.ts index 95e14ca23..7c7c39ff8 100644 --- a/src/modules/11_discipline/store/main.ts +++ b/src/modules/11_discipline/store/main.ts @@ -3,7 +3,7 @@ import { defineStore } from "pinia"; import type { QTableProps } from "quasar"; import type { DataOption } from "@/modules/11_discipline/interface/index/Main"; -import type { ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate"; +import type { ArrayPersonAdd } from "@/modules/11_discipline/interface/response/Investigate"; export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { /** option ผู้ถูกสอบสวน*/ diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue index ac3b14644..54cc61343 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/viewTab2/CardDirector.vue @@ -8,7 +8,7 @@ import { useRoute } from "vue-router"; /** importType*/ import type { QTableProps } from "quasar"; -import type { Director } from "@/modules/11_discipline/interface/request/disciplinary"; +import type { Director } from "@/modules/11_discipline/interface/request/Disciplinary"; /** importComponents*/ import DialogDirector from "@/modules/12_evaluatePersonal/components/Detail/viewTab2/DialogDirector.vue"; diff --git a/src/modules/12_evaluatePersonal/components/Director/DialogDetail.vue b/src/modules/12_evaluatePersonal/components/Director/DialogDetail.vue index a65bbec0e..21fa126e6 100644 --- a/src/modules/12_evaluatePersonal/components/Director/DialogDetail.vue +++ b/src/modules/12_evaluatePersonal/components/Director/DialogDetail.vue @@ -4,7 +4,7 @@ import { useQuasar } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; -import type { FormData } from "@/modules/11_discipline/interface/request/director"; +import type { FormData } from "@/modules/11_discipline/interface/request/Director"; /** * importComponents diff --git a/src/modules/12_evaluatePersonal/components/Director/EditPage.vue b/src/modules/12_evaluatePersonal/components/Director/EditPage.vue index 883bd26d3..61459c9e7 100644 --- a/src/modules/12_evaluatePersonal/components/Director/EditPage.vue +++ b/src/modules/12_evaluatePersonal/components/Director/EditPage.vue @@ -1,7 +1,7 @@